JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-05-23 05:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdb: Fix the crash that occurs when GDB is connected early (ryubing/ryujinx!159)

Browse Source 
See merge request ryubing/ryujinx!159
This commit is contained in:
Coxxs
2025-10-11 19:06:14 -05:00
committed by LotP
parent 1865be47cf
commit ceec9617ef
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Ryujinx.HLE/Debugger/Debugger.cs
View File

@@ -859,7 +859,13 @@ namespace Ryujinx.HLE.Debugger
{ {
if (threadId == 0 || threadId == null) if (threadId == 0 || threadId == null)
{ {
threadId = GetThreads().First().ThreadUid; var threads = GetThreads();
if (threads.Length == 0)
{
ReplyError();
return;
}
threadId = threads.First().ThreadUid;
} }
if (DebugProcess.GetThread(threadId.Value) == null) if (DebugProcess.GetThread(threadId.Value) == null)
@@ -1037,7 +1043,7 @@ namespace Ryujinx.HLE.Debugger
string response = command.Trim().ToLowerInvariant() switch string response = command.Trim().ToLowerInvariant() switch
{ {
"help" => "backtrace\nbt\nregisters\nreg\nget info\nminidump", "help" => "backtrace\nbt\nregisters\nreg\nget info\nminidump\n",
"get info" => GetProcessInfo(), "get info" => GetProcessInfo(),
"backtrace" => GetStackTrace(), "backtrace" => GetStackTrace(),
"bt" => GetStackTrace(), "bt" => GetStackTrace(),
@@ -1192,11 +1198,11 @@ namespace Ryujinx.HLE.Debugger
// If the user connects before the application is running, wait for the application to start. // If the user connects before the application is running, wait for the application to start.
int retries = 10; int retries = 10;
while (DebugProcess == null && retries-- > 0) while ((DebugProcess == null || GetThreads().Length == 0) && retries-- > 0)
{ {
Thread.Sleep(200); Thread.Sleep(200);
} }
if (DebugProcess == null) if (DebugProcess == null || GetThreads().Length == 0)
{ {
Logger.Warning?.Print(LogClass.GdbStub, "Application is not running, cannot accept GDB client connection"); Logger.Warning?.Print(LogClass.GdbStub, "Application is not running, cannot accept GDB client connection");
ClientSocket.Close(); ClientSocket.Close();