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

VITA: proper handling of boot params

Browse Source
This commit is contained in:
cyee 2020-11-11 18:13:20 -08:00 committed by Francisco José García García
parent 3a0c5cc666
commit bcc7dde90d
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
frontend/drivers/platform_psp.c
View File

@ -323,7 +323,6 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
#endif #endif
char argp[512] = {0}; char argp[512] = {0};
SceSize args = 0; SceSize args = 0;
int ret;
#if !defined(VITA) #if !defined(VITA)
strlcpy(argp, eboot_path, sizeof(argp)); strlcpy(argp, eboot_path, sizeof(argp));
@ -348,23 +347,49 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
{ {
char *param1 = strstr(boot_params, "&param="); char *param1 = strstr(boot_params, "&param=");
char *param2 = strstr(boot_params, "&param2="); char *param2 = strstr(boot_params, "&param2=");
/* copy path to core_name for normal boot */
strlcpy(core_name, path, sizeof(core_name));
if (param1 != NULL && param2 != NULL) if (param1 != NULL && param2 != NULL)
{ {
if (param2 > param1 && (param2 - (param1+7) < sizeof(core_name)) && strlen(param2+8) < sizeof(argp))
{
/* handle case where param2 follows param1 */
param1 += 7; param1 += 7;
memcpy(core_name, param1, param2 - param1); memcpy(core_name, param1, param2 - param1);
core_name[param2-param1] = 0; core_name[param2-param1] = 0;
sprintf(argp, param2 + 8); sprintf(argp, param2 + 8);
ret = sceAppMgrLoadExec(core_name, (char * const*)((const char*[]){argp, 0}), NULL); args = strlen(argp);
RARCH_LOG("Attempt to load executable: [%d].\n", ret);
goto exit;
} }
else if (param1 > param2 && (param1 - (param2+8) < sizeof(argp)) && strlen(param1+7) < sizeof(core_name))
{
/* handle case where param1 follows param2 */
param2 += 8;
memcpy(argp, param2, param1 - param2);
argp[param1-param2] = 0;
sprintf(core_name, param1 + 7);
args = strlen(argp);
}
else
{
RARCH_LOG("Boot params are too long. Continue normal boot.");
}
}
else
{
RARCH_LOG("Required boot params missing. Continue nornal boot."); RARCH_LOG("Required boot params missing. Continue nornal boot.");
} }
#endif
ret = sceAppMgrLoadExec(path, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL); int ret = sceAppMgrLoadExec(core_name, args == 0 ? NULL : (char * const*)((const char*[]){argp, 0}), NULL);
RARCH_LOG("Attempt to load executable: [%d].\n", ret); RARCH_LOG("Attempt to load executable: [%d].\n", ret);
exit: }
return; 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);
}
#else #else
exitspawn_kernel(path, args, argp); exitspawn_kernel(path, args, argp);
#endif #endif