1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QProcess/Unix: do not activate read notifiers until process has started

Browse Source 
Otherwise, the user may receive the readyRead() signal just before
started().

Change-Id: I8d6fd18fdfcef0580a3e609100198b03b18b1175
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Alex Trotsenko 2021-01-06 17:12:17 +02:00
parent 6a6d12ea4b
commit db5c901594
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/io/qprocess_unix.cpp
View File

@ -239,8 +239,8 @@ bool QProcessPrivate::openChannel(Channel &channel)
QObject::connect(channel.notifier, SIGNAL(activated(QSocketDescriptor)), QObject::connect(channel.notifier, SIGNAL(activated(QSocketDescriptor)),
q, SLOT(_q_canWrite())); q, SLOT(_q_canWrite()));
} else { } else {
channel.notifier = new QSocketNotifier(channel.pipe[0], channel.notifier = new QSocketNotifier(QSocketNotifier::Read, q);
QSocketNotifier::Read, q); channel.notifier->setSocket(channel.pipe[0]);
const char *receiver; const char *receiver;
if (&channel == &stdoutChannel) if (&channel == &stdoutChannel)
receiver = SLOT(_q_canReadStandardOutput()); receiver = SLOT(_q_canReadStandardOutput());
@ -602,6 +602,10 @@ bool QProcessPrivate::processStarted(QString *errorMessage)
stateNotifier->setSocket(forkfd); stateNotifier->setSocket(forkfd);
stateNotifier->setEnabled(true); stateNotifier->setEnabled(true);
} }
if (stdoutChannel.notifier)
stdoutChannel.notifier->setEnabled(true);
if (stderrChannel.notifier)
stderrChannel.notifier->setEnabled(true);
return true; return true;
} }