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

Merge pull request #348 from lioncash/master

Browse Source 
Fix a potential memory leak in menu/rmenu_xui.cpp in function rgui_init().
This commit is contained in:
Squarepusher 2013-10-17 11:19:57 -07:00
commit b19803961c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/menu/rmenu_xui.cpp
View File

@ -1256,6 +1256,11 @@ static void* rgui_init (void)
HRESULT hr; HRESULT hr;
rgui_handle_t *rgui = (rgui_handle_t*)calloc(1, sizeof(*rgui)); rgui_handle_t *rgui = (rgui_handle_t*)calloc(1, sizeof(*rgui));
if (rgui == NULL)
{
RARCH_ERR("Could not allocate RGUI handle.\n");
return NULL;
}
xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data;
@ -1281,6 +1286,7 @@ static void* rgui_init (void)
if (hr != S_OK) if (hr != S_OK)
{ {
RARCH_ERR("Failed initializing XUI application.\n"); RARCH_ERR("Failed initializing XUI application.\n");
free(rgui);
return NULL; return NULL;
} }
@ -1294,6 +1300,7 @@ static void* rgui_init (void)
if (hr != S_OK) if (hr != S_OK)
{ {
RARCH_ERR("Failed to register default typeface.\n"); RARCH_ERR("Failed to register default typeface.\n");
free(rgui);
return NULL; return NULL;
} }
@ -1301,6 +1308,7 @@ static void* rgui_init (void)
if (hr != S_OK) if (hr != S_OK)
{ {
RARCH_ERR("Failed to load skin.\n"); RARCH_ERR("Failed to load skin.\n");
free(rgui);
return NULL; return NULL;
} }
@ -1308,6 +1316,7 @@ static void* rgui_init (void)
if (hr != S_OK) if (hr != S_OK)
{ {
RARCH_ERR("Failed to create scene 'rarch_main.xur'.\n"); RARCH_ERR("Failed to create scene 'rarch_main.xur'.\n");
free(rgui);
return NULL; return NULL;
} }
@ -1316,6 +1325,7 @@ static void* rgui_init (void)
if (hr != S_OK) if (hr != S_OK)
{ {
RARCH_ERR("XuiSceneNavigateFirst failed.\n"); RARCH_ERR("XuiSceneNavigateFirst failed.\n");
free(rgui);
return NULL; return NULL;
} }