revert fsldr change, fix null deref in pm

2019-03-29 22:40:54 +01:00
parent e688ec9257
commit ef034a87d4
6 changed files with 61 additions and 35 deletions
--- a/sysmodules/pm/source/launch.c
+++ b/sysmodules/pm/source/launch.c
@@ -205,8 +205,11 @@ static Result loadWithDependencies(Handle *outDebug, ProcessData **outProcessDat
 static Result launchTitleImpl(Handle *debug, ProcessData **outProcessData, const FS_ProgramInfo *programInfo,
    const FS_ProgramInfo *programInfoUpdate, u32 launchFlags, ExHeader_Info *exheaderInfo)
 {
-    if (isTitleLaunchPrevented(programInfo->programId)) {
+    if (debug != NULL) {
        *debug = 0;
+    }
+
+    if (isTitleLaunchPrevented(programInfo->programId)) {
        return 0;
    }