Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix debugger crash when attaching to a PID: Guard against dereferencing an empty debugger command and use stdio for local PID attachments unless socket transport is explicitly requested.

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-08-01 23:32:48 -03:00
parent 6d70183da6
commit fe8417bdc7
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tools/ecode/plugins/debugger/debuggerplugin.cpp
View File

@@ -2185,11 +2185,14 @@ void DebuggerPlugin::run( const std::string& debugger, ProtocolSettings&& protoc
DapRunConfig&& runConfig, int randPort, bool forceUseProgram,
bool usesPorts, bool unstableFrameId ) {
std::optional<Command> cmdOpt = debuggerBinaryExists( debugger, runConfig );
auto mode = protocolSettings.launchArgs.value( "mode", "" );
if ( mode.empty() )
mode = "local";
const bool needsProcess =
protocolSettings.launchRequestType == REQUEST_TYPE_LAUNCH ||
( protocolSettings.launchRequestType == REQUEST_TYPE_ATTACH && mode == "local" );
if ( !cmdOpt && ( protocolSettings.launchRequestType == REQUEST_TYPE_LAUNCH ||
( protocolSettings.launchRequestType == REQUEST_TYPE_ATTACH &&
protocolSettings.launchArgs.value( "mode", "" ) == "local" &&
protocolSettings.launchArgs.contains( "program" ) ) ) ) {
if ( !cmdOpt && needsProcess ) {
auto msg =
String::format( i18n( "debugger_binary_not_found",
"Debugger binary not found. Binary \"%s\" must be installed." )
@@ -2200,7 +2203,7 @@ void DebuggerPlugin::run( const std::string& debugger, ProtocolSettings&& protoc
return;
}
Command cmd = std::move( *cmdOpt );
Command cmd = cmdOpt ? std::move( *cmdOpt ) : Command{};
bool isRemote = false;
bool runsDapServer = false;
@@ -2233,14 +2236,10 @@ void DebuggerPlugin::run( const std::string& debugger, ProtocolSettings&& protoc
mDebugger = std::make_unique<DebuggerClientDap>( protocolSettings, std::move( bus ) );
}
} else if ( protocolSettings.launchRequestType == REQUEST_TYPE_ATTACH ) {
auto mode = protocolSettings.launchArgs.value( "mode", "" );
if ( mode.empty() )
mode = "local";
bool useSocket = !con.host.empty() && con.port != 0;
if ( ( protocolSettings.launchArgs.contains( "host" ) ||
protocolSettings.launchArgs.contains( "port" ) ) &&
!useSocket ) {
const bool socketRequested = protocolSettings.launchArgs.contains( "host" ) ||
protocolSettings.launchArgs.contains( "port" );
bool useSocket = runsDapServer || ( socketRequested && con.isValid() );
if ( socketRequested && !useSocket ) {
getManager()->getPluginContext()->getNotificationCenter()->addNotification(
i18n( "host_port_required", "No host or port has been specified." ) );
return;