feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix Segmentation Fault on Windows

Browse Source 
This amends 035b8aa5f7. shutdown() is
called from GdbEngine and from OutputColloector's Dtor. Thus there is a
change we access m_socket, after it is nullified.

Change-Id: I7d26ded70d0b148d83eb551edaf9b82850db197e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Björn Schäpers
2022-02-14 21:25:12 +01:00
committed by Björn Schäpers
parent 1652be1310
commit 48ce753a05
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/outputcollector.cpp
View File

@@ -156,7 +156,8 @@ void OutputCollector::newConnectionAvailable()
void OutputCollector::bytesAvailable() void OutputCollector::bytesAvailable()
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
emit byteDelivery(m_socket->readAll()); if (m_socket)
emit byteDelivery(m_socket->readAll());
#else #else
size_t nbytes = 0; size_t nbytes = 0;
if (::ioctl(m_serverFd, FIONREAD, (char *) &nbytes) < 0) if (::ioctl(m_serverFd, FIONREAD, (char *) &nbytes) < 0)