ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some bugs found through Clang Static Analyzer: 

- task_content.c, load_content_from_compressed_archive: fix use after free
 - platform_win32/uwp: fix frontend_..._get_powerstate never returning FRONTEND_POWERSTATE_NONE
 - platform_win32/uwp: fix whitespace
 - cheevos.c: fix potential use after free in a loop, just to be save
This commit is contained in:
LazyBumHorse 2019-07-04 21:08:01 +02:00
parent 3cbb495bd2
commit f5497a4249
5 changed files with 91 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cheevos-new/cheevos.c
View File

@ -1771,7 +1771,10 @@ found:
coro->json, coro->k)) coro->json, coro->k))
CHEEVOS_ERR(RCHEEVOS_TAG "error writing badge %s\n", coro->badge_fullpath); CHEEVOS_ERR(RCHEEVOS_TAG "error writing badge %s\n", coro->badge_fullpath);
else else
{
CHEEVOS_FREE(coro->json); CHEEVOS_FREE(coro->json);
coro->json = NULL;
}
} }
} }
} }

69
frontend/drivers/platform_uwp.c
View File

@ -211,30 +211,31 @@ enum frontend_powerstate frontend_uwp_get_powerstate(
int *seconds, int *percent) int *seconds, int *percent)
{ {
SYSTEM_POWER_STATUS status; SYSTEM_POWER_STATUS status;
enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE; enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE;
if (!GetSystemPowerStatus(&status)) if (!GetSystemPowerStatus(&status))
return ret; return ret;
if (status.BatteryFlag == 0xFF) if (status.BatteryFlag == 0xFF)
ret = FRONTEND_POWERSTATE_NONE; ret = FRONTEND_POWERSTATE_NONE;
if (status.BatteryFlag & (1 << 7)) else if (status.BatteryFlag & (1 << 7))
ret = FRONTEND_POWERSTATE_NO_SOURCE; ret = FRONTEND_POWERSTATE_NO_SOURCE;
else if (status.BatteryFlag & (1 << 3)) else if (status.BatteryFlag & (1 << 3))
ret = FRONTEND_POWERSTATE_CHARGING; ret = FRONTEND_POWERSTATE_CHARGING;
else if (status.ACLineStatus == 1) else if (status.ACLineStatus == 1)
ret = FRONTEND_POWERSTATE_CHARGED; ret = FRONTEND_POWERSTATE_CHARGED;
else else
ret = FRONTEND_POWERSTATE_ON_POWER_SOURCE; ret = FRONTEND_POWERSTATE_ON_POWER_SOURCE;
*percent = (int)status.BatteryLifePercent; *percent = (int)status.BatteryLifePercent;
*seconds = (int)status.BatteryLifeTime; *seconds = (int)status.BatteryLifeTime;
#ifdef _WIN32 #ifdef _WIN32
if (*percent == 255) if (*percent == 255)
*percent = 0; *percent = 0;
#endif #endif
return ret;
return ret;
} }
enum frontend_architecture frontend_uwp_get_architecture(void) enum frontend_architecture frontend_uwp_get_architecture(void)
@ -394,15 +395,15 @@ static uint64_t frontend_uwp_get_mem_total(void)
/* OSes below 2000 don't have the Ex version, /* OSes below 2000 don't have the Ex version,
* and non-Ex cannot work with >4GB RAM */ * and non-Ex cannot work with >4GB RAM */
#if _WIN32_WINNT >= 0x0500 #if _WIN32_WINNT >= 0x0500
MEMORYSTATUSEX mem_info; MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX); mem_info.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&mem_info); GlobalMemoryStatusEx(&mem_info);
return mem_info.ullTotalPhys; return mem_info.ullTotalPhys;
#else #else
MEMORYSTATUS mem_info; MEMORYSTATUS mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUS); mem_info.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mem_info); GlobalMemoryStatus(&mem_info);
return mem_info.dwTotalPhys; return mem_info.dwTotalPhys;
#endif #endif
} }
@ -411,15 +412,15 @@ static uint64_t frontend_uwp_get_mem_used(void)
/* OSes below 2000 don't have the Ex version, /* OSes below 2000 don't have the Ex version,
* and non-Ex cannot work with >4GB RAM */ * and non-Ex cannot work with >4GB RAM */
#if _WIN32_WINNT >= 0x0500 #if _WIN32_WINNT >= 0x0500
MEMORYSTATUSEX mem_info; MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX); mem_info.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&mem_info); GlobalMemoryStatusEx(&mem_info);
return ((frontend_uwp_get_mem_total() - mem_info.ullAvailPhys)); return ((frontend_uwp_get_mem_total() - mem_info.ullAvailPhys));
#else #else
MEMORYSTATUS mem_info; MEMORYSTATUS mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUS); mem_info.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mem_info); GlobalMemoryStatus(&mem_info);
return ((frontend_uwp_get_mem_total() - mem_info.dwAvailPhys)); return ((frontend_uwp_get_mem_total() - mem_info.dwAvailPhys));
#endif #endif
} }

97
frontend/drivers/platform_win32.c
View File

@ -111,7 +111,7 @@ static bool gfx_init_dwm(void)
(VOID (WINAPI*)(HWND, BOOL))dylib_proc(shell32lib, "DragAcceptFiles"); (VOID (WINAPI*)(HWND, BOOL))dylib_proc(shell32lib, "DragAcceptFiles");
mmcss = mmcss =
(HRESULT(WINAPI*)(BOOL))dylib_proc(dwmlib, "DwmEnableMMCSS"); (HRESULT(WINAPI*)(BOOL))dylib_proc(dwmlib, "DwmEnableMMCSS");
#else #else
DragAcceptFiles_func = DragAcceptFiles; DragAcceptFiles_func = DragAcceptFiles;
#if 0 #if 0
@ -121,8 +121,8 @@ static bool gfx_init_dwm(void)
if (mmcss) if (mmcss)
{ {
RARCH_LOG("Setting multimedia scheduling for DWM.\n"); RARCH_LOG("Setting multimedia scheduling for DWM.\n");
mmcss(TRUE); mmcss(TRUE);
} }
inited = true; inited = true;
@ -317,53 +317,54 @@ static void frontend_win32_get_os(char *s, size_t len, int *major, int *minor)
static void frontend_win32_init(void *data) static void frontend_win32_init(void *data)
{ {
typedef BOOL (WINAPI *isProcessDPIAwareProc)(); typedef BOOL (WINAPI *isProcessDPIAwareProc)();
typedef BOOL (WINAPI *setProcessDPIAwareProc)(); typedef BOOL (WINAPI *setProcessDPIAwareProc)();
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
HMODULE handle = HMODULE handle =
GetModuleHandle("User32.dll"); GetModuleHandle("User32.dll");
isProcessDPIAwareProc isDPIAwareProc = isProcessDPIAwareProc isDPIAwareProc =
(isProcessDPIAwareProc)dylib_proc(handle, "IsProcessDPIAware"); (isProcessDPIAwareProc)dylib_proc(handle, "IsProcessDPIAware");
setProcessDPIAwareProc setDPIAwareProc = setProcessDPIAwareProc setDPIAwareProc =
(setProcessDPIAwareProc)dylib_proc(handle, "SetProcessDPIAware"); (setProcessDPIAwareProc)dylib_proc(handle, "SetProcessDPIAware");
#else #else
isProcessDPIAwareProc isDPIAwareProc = IsProcessDPIAware; isProcessDPIAwareProc isDPIAwareProc = IsProcessDPIAware;
setProcessDPIAwareProc setDPIAwareProc = SetProcessDPIAware; setProcessDPIAwareProc setDPIAwareProc = SetProcessDPIAware;
#endif #endif
if (isDPIAwareProc) if (isDPIAwareProc)
if (!isDPIAwareProc()) if (!isDPIAwareProc())
if (setDPIAwareProc) if (setDPIAwareProc)
setDPIAwareProc(); setDPIAwareProc();
} }
enum frontend_powerstate frontend_win32_get_powerstate(int *seconds, int *percent) enum frontend_powerstate frontend_win32_get_powerstate(int *seconds, int *percent)
{ {
SYSTEM_POWER_STATUS status; SYSTEM_POWER_STATUS status;
enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE; enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE;
if (!GetSystemPowerStatus(&status)) if (!GetSystemPowerStatus(&status))
return ret; return ret;
if (status.BatteryFlag == 0xFF) if (status.BatteryFlag == 0xFF)
ret = FRONTEND_POWERSTATE_NONE; ret = FRONTEND_POWERSTATE_NONE;
if (status.BatteryFlag & (1 << 7)) else if (status.BatteryFlag & (1 << 7))
ret = FRONTEND_POWERSTATE_NO_SOURCE; ret = FRONTEND_POWERSTATE_NO_SOURCE;
else if (status.BatteryFlag & (1 << 3)) else if (status.BatteryFlag & (1 << 3))
ret = FRONTEND_POWERSTATE_CHARGING; ret = FRONTEND_POWERSTATE_CHARGING;
else if (status.ACLineStatus == 1) else if (status.ACLineStatus == 1)
ret = FRONTEND_POWERSTATE_CHARGED; ret = FRONTEND_POWERSTATE_CHARGED;
else else
ret = FRONTEND_POWERSTATE_ON_POWER_SOURCE; ret = FRONTEND_POWERSTATE_ON_POWER_SOURCE;
*percent = (int)status.BatteryLifePercent; *percent = (int)status.BatteryLifePercent;
*seconds = (int)status.BatteryLifeTime; *seconds = (int)status.BatteryLifeTime;
#ifdef _WIN32 #ifdef _WIN32
if (*percent == 255) if (*percent == 255)
*percent = 0; *percent = 0;
#endif #endif
return ret;
return ret;
} }
enum frontend_architecture frontend_win32_get_architecture(void) enum frontend_architecture frontend_win32_get_architecture(void)
@ -489,15 +490,15 @@ static uint64_t frontend_win32_get_mem_total(void)
/* OSes below 2000 don't have the Ex version, /* OSes below 2000 don't have the Ex version,
* and non-Ex cannot work with >4GB RAM */ * and non-Ex cannot work with >4GB RAM */
#if _WIN32_WINNT >= 0x0500 #if _WIN32_WINNT >= 0x0500
MEMORYSTATUSEX mem_info; MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX); mem_info.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&mem_info); GlobalMemoryStatusEx(&mem_info);
return mem_info.ullTotalPhys; return mem_info.ullTotalPhys;
#else #else
MEMORYSTATUS mem_info; MEMORYSTATUS mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUS); mem_info.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mem_info); GlobalMemoryStatus(&mem_info);
return mem_info.dwTotalPhys; return mem_info.dwTotalPhys;
#endif #endif
} }
@ -506,15 +507,15 @@ static uint64_t frontend_win32_get_mem_used(void)
/* OSes below 2000 don't have the Ex version, /* OSes below 2000 don't have the Ex version,
* and non-Ex cannot work with >4GB RAM */ * and non-Ex cannot work with >4GB RAM */
#if _WIN32_WINNT >= 0x0500 #if _WIN32_WINNT >= 0x0500
MEMORYSTATUSEX mem_info; MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX); mem_info.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&mem_info); GlobalMemoryStatusEx(&mem_info);
return ((frontend_win32_get_mem_total() - mem_info.ullAvailPhys)); return ((frontend_win32_get_mem_total() - mem_info.ullAvailPhys));
#else #else
MEMORYSTATUS mem_info; MEMORYSTATUS mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUS); mem_info.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mem_info); GlobalMemoryStatus(&mem_info);
return ((frontend_win32_get_mem_total() - mem_info.dwAvailPhys)); return ((frontend_win32_get_mem_total() - mem_info.dwAvailPhys));
#endif #endif
} }

2
gfx/drivers/gdi_gfx.c
View File

@ -557,8 +557,6 @@ static uintptr_t gdi_load_texture(void *video_data, void *data,
void *tmpdata = NULL; void *tmpdata = NULL;
gdi_texture_t *texture = NULL; gdi_texture_t *texture = NULL;
struct texture_image *image = (struct texture_image*)data; struct texture_image *image = (struct texture_image*)data;
int size = image->width *
image->height * sizeof(uint32_t);
if (!image || image->width > 2048 || image->height > 2048) if (!image || image->width > 2048 || image->height > 2048)
return 0; return 0;

5
tasks/task_content.c
View File

@ -453,12 +453,15 @@ static bool load_content_from_compressed_archive(
info[i].path = info[i].path =
additional_path_allocs->elems[additional_path_allocs->size - 1].data; additional_path_allocs->elems[additional_path_allocs->size - 1].data;
free(new_path);
if (!string_list_append(content_ctx->temporary_content, if (!string_list_append(content_ctx->temporary_content,
new_path, attributes)) new_path, attributes))
{
free(new_path);
return false; return false;
}
free(new_path);
return true; return true;
} }