forked from qt-creator/qt-creator
f25300cadf
It may apparently happen that when calling QProcess::start() we may receive a synchronous signal QProcess::errorOccurred() from the process we are trying to start. In this case the handler of the error signal might have removed the process from m_processes hash, which invalidated the "Process *& process" reference inside LauncherSocketHandler::handleStartPacket(). So, using process reference after calling start() may be dangerous. Refactor ProcessStartHandler so that it stores the pointer to the process it handles. The pointer to the handler should still be valid after calling start(), since the process itself is being deleted with a delay. Make ProcessStartHandler a member of ProcessHelper. In this way it's being reused in QProcessImpl and ProcessLauncher. Fixes: QTCREATORBUG-26726 Change-Id: I8e3f39953035d76c83bbbb13bd78e3042ba2a14e Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
88 lines
2.9 KiB
C++
88 lines
2.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2021 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include <QIODevice>
|
|
#include <QProcess>
|
|
|
|
namespace Utils {
|
|
|
|
enum class ProcessMode {
|
|
Reader, // This opens in ReadOnly mode if no write data or in ReadWrite mode otherwise,
|
|
// closes the write channel afterwards
|
|
Writer // This opens in ReadWrite mode and doesn't close the write channel
|
|
};
|
|
|
|
class ProcessStartHandler {
|
|
public:
|
|
ProcessStartHandler(QProcess *process) : m_process(process) {}
|
|
|
|
void setProcessMode(ProcessMode mode) { m_processMode = mode; }
|
|
void setWriteData(const QByteArray &writeData) { m_writeData = writeData; }
|
|
QIODevice::OpenMode openMode() const;
|
|
void handleProcessStart();
|
|
void handleProcessStarted();
|
|
void setBelowNormalPriority();
|
|
void setNativeArguments(const QString &arguments);
|
|
|
|
private:
|
|
ProcessMode m_processMode = ProcessMode::Reader;
|
|
QByteArray m_writeData;
|
|
QProcess *m_process;
|
|
};
|
|
|
|
class ProcessHelper : public QProcess
|
|
{
|
|
public:
|
|
ProcessHelper(QObject *parent) : QProcess(parent), m_processStartHandler(this)
|
|
{
|
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && defined(Q_OS_UNIX)
|
|
setChildProcessModifier([this] { setupChildProcess_impl(); });
|
|
#endif
|
|
}
|
|
|
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
void setupChildProcess() override { setupChildProcess_impl(); }
|
|
#endif
|
|
|
|
ProcessStartHandler *processStartHandler() { return &m_processStartHandler; }
|
|
|
|
using QProcess::setErrorString;
|
|
|
|
void setLowPriority() { m_lowPriority = true; }
|
|
void setUnixTerminalDisabled() { m_unixTerminalDisabled = true; }
|
|
|
|
private:
|
|
void setupChildProcess_impl();
|
|
bool m_lowPriority = false;
|
|
bool m_unixTerminalDisabled = false;
|
|
ProcessStartHandler m_processStartHandler;
|
|
};
|
|
|
|
} // namespace Utils
|
|
|
|
Q_DECLARE_METATYPE(Utils::ProcessMode);
|