fix assertion in QProcess/Win

Do not call bytesAvailableInChannel if the source pipe end is
invalid. This is the case when redirecting channels on Windows.
The assertions in bytesAvailableInChannel were triggered whenever
an output process or output file was set and waitForBytesWritten
was called.

Task-number: QTBUG-45548
Change-Id: I225dfea2c5e27e122f75008a3a06d425554e00fe
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index cef961ecbd..eb88ded2c9 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -704,13 +704,15 @@ bool QProcessPrivate::waitForBytesWritten(int msecs)
             return true;
 
         // If we wouldn't write anything, check if we can read stdout.
-        if (bytesAvailableInChannel(&stdoutChannel) != 0) {
+        if (stdoutChannel.pipe[0] != INVALID_Q_PIPE
+                && bytesAvailableInChannel(&stdoutChannel) != 0) {
             tryReadFromChannel(&stdoutChannel);
             timer.resetIncrements();
         }
 
         // Check if we can read stderr.
-        if (bytesAvailableInChannel(&stderrChannel) != 0) {
+        if (stderrChannel.pipe[0] != INVALID_Q_PIPE
+                && bytesAvailableInChannel(&stderrChannel) != 0) {
             tryReadFromChannel(&stderrChannel);
             timer.resetIncrements();
         }