whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix endless loop in QProcess/Win drainOutputPipes 

Commit 568f82fba3 was incomplete.
If drainOutputPipes detected some readyRead it wouldn't end the loop.

Task-number: QTBUG-32354

Change-Id: I4e594f1e148abe9ef36c047a55eee1b22fd5064b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
bb10
Joerg Bornemann 2013-07-18 11:22:17 +02:00 committed by The Qt Project
parent 81addcc1ed
commit 5d6dbc6637
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qprocess_win.cpp
View File

@ -630,8 +630,9 @@ bool QProcessPrivate::drainOutputPipes()
if (!stdoutReader && !stderrReader)
return false;
bool readyReadEmitted = false;
bool someReadyReadEmitted = false;
forever {
bool readyReadEmitted = false;
bool readOperationActive = false;
if (stdoutReader) {
readyReadEmitted |= stdoutReader->waitForReadyRead(0);
@ -641,12 +642,13 @@ bool QProcessPrivate::drainOutputPipes()
readyReadEmitted |= stderrReader->waitForReadyRead(0);
readOperationActive |= stderrReader->isReadOperationActive();
}
someReadyReadEmitted |= readyReadEmitted;
if (!readOperationActive || !readyReadEmitted)
break;
Sleep(100);
}
return readyReadEmitted;
return someReadyReadEmitted;
}
bool QProcessPrivate::waitForReadyRead(int msecs)