mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-20 10:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11536 from cy33hc/master

Browse Source 
VITA: fix crash when boot params is missing
This commit is contained in:
Autechre 2020-11-08 19:56:08 +01:00 committed by GitHub
commit 3693db2451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
frontend/drivers/platform_psp.c
View File

@ -324,6 +324,7 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
#endif
char argp[512] = {0};
SceSize args = 0;
int ret;
#if !defined(VITA)
strlcpy(argp, eboot_path, sizeof(argp));
@ -346,21 +347,25 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
sceAppMgrGetAppParam(boot_params);
if (strstr(boot_params,"psgm:play"))
{
int ret;
char *param1 = strstr(boot_params, "&param=")+7;
char *param1 = strstr(boot_params, "&param=");
char *param2 = strstr(boot_params, "&param2=");
memcpy(core_name, param1, param2 - param1);
core_name[param2-param1] = 0;
sprintf(argp, param2 + 8);
ret = sceAppMgrLoadExec(core_name, (char * const*)((const char*[]){argp, 0}), NULL);
RARCH_LOG("Attempt to load executable: [%d].\n", ret);
if (param1 != NULL && param2 != NULL)
{
param1 += 7;
memcpy(core_name, param1, param2 - param1);
core_name[param2-param1] = 0;
sprintf(argp, param2 + 8);
ret = sceAppMgrLoadExec(core_name, (char * const*)((const char*[]){argp, 0}), NULL);
RARCH_LOG("Attempt to load executable: [%d].\n", ret);
goto exit;
}
RARCH_LOG("Required boot params missing. Continue nornal boot.");
}
else
#endif
{
int ret = sceAppMgrLoadExec(path, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL);
RARCH_LOG("Attempt to load executable: [%d].\n", ret);
}
ret = sceAppMgrLoadExec(path, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL);
RARCH_LOG("Attempt to load executable: [%d].\n", ret);
exit:
return;
#else
exitspawn_kernel(path, args, argp);
#endif