1 files changed, 16 insertions, 0 deletions

diff --git a/shell/ash.c b/shell/ash.c
index fd2a66270..a5b7dbc74 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6542,6 +6542,12 @@ save_fd_on_redirect(int fd, int avoid_fd, struct redirtab *sq)
         if (fd == preverrout_fd)
                 preverrout_fd = new_fd;
 
+#if ENABLE_PLATFORM_MINGW32 && !defined(_UCRT)
+        // Workaround for problems with stderr in MSVCRT
+        if (fd == fileno(stderr))
+                setvbuf(stderr, NULL, _IONBF, 0);
+#endif
+
         return 0; /* "we did not close fd" */
 }
 
@@ -6629,6 +6635,16 @@ redirect(union node *redir, int flags)
                         if (!closed) {
                                 /* ^^^ optimization: saving may already
                                  * have closed it. If not... */
+#if ENABLE_PLATFORM_MINGW32 && !defined(_UCRT) && !defined(_WIN64)
+                                // Workaround for problems with streams in 32-bit MSVCRT
+                                if (fd == fileno(stdin))
+                                        fclose(stdin);
+                                else if (fd == fileno(stdout))
+                                        fclose(stdout);
+                                else if (fd == fileno(stderr))
+                                        fclose(stderr);
+                                else
+#endif
                                 close(fd);
                         }
                 } else {