coreinit: Fix race condition in __FSAIoctlResponseCallback

Exzap · Exzap · commit 783d88a89220 · 2025-05-17T21:35:42.000+02:00
diff --git a/src/Cafe/OS/libs/coreinit/coreinit_FS.cpp b/src/Cafe/OS/libs/coreinit/coreinit_FS.cpp
@@ -742,7 +742,8 @@ namespace coreinit
 		}
 
 		__FSCmdSubmitResult(cmd, fsStatus);
-		__FSUpdateQueue(&cmd->fsClientBody->fsCmdQueue);
+		// dont read from cmd after this point, since the game could already have modified it
+		__FSUpdateQueue(&client->fsCmdQueue);
 		osLib_returnFromFunction(hCPU, 0);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,8 @@ namespace coreinit`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`__FSCmdSubmitResult(cmd, fsStatus);`
`745`		`- __FSUpdateQueue(&cmd->fsClientBody->fsCmdQueue);`
	`745`	`+ // dont read from cmd after this point, since the game could already have modified it`
	`746`	`+ __FSUpdateQueue(&client->fsCmdQueue);`
`746`	`747`	`osLib_returnFromFunction(hCPU, 0);`
`747`	`748`	`}`
`748`	`749`