From dc4a114d36ce14bda002d237f7798a60429e2dc7 Mon Sep 17 00:00:00 2001 From: FIX94 Date: Thu, 5 May 2016 16:47:44 +0200 Subject: [PATCH] (GX) fixed program crash when no argv structure is present on start --- frontend/drivers/platform_gx.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c index 82ee8cdf2c..5b71fb10bd 100644 --- a/frontend/drivers/platform_gx.c +++ b/frontend/drivers/platform_gx.c @@ -174,6 +174,23 @@ static void frontend_gx_get_environment_settings( #endif #endif + /* This situation can happen on some loaders so we really need some + fake args or else retroarch will just crash on parsing NULL pointers */ + if(*argc == 0 || argv == NULL) + { + struct rarch_main_wrap *args = (struct rarch_main_wrap*)params_data; + if (args) + { + args->touched = true; + args->no_content = false; + args->verbose = false; + args->config_path = NULL; + args->sram_path = NULL; + args->state_path = NULL; + args->content_path = NULL; + args->libretro_path = NULL; + } + } #ifdef HW_DOL chdir("carda:/retroarch"); #endif