lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-28 12:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Refs #87: Static Analysis] Do error checking on fetching resources

Browse Source
This commit is contained in:
baldurk
2014-10-05 16:30:20 +01:00
parent cb7fd103eb
commit 71abc2079c
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/win32/win32_stringio.cpp
+17 -5
View File
@@ -45,12 +45,24 @@ string GetEmbeddedResourceWin32(int resource)
GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS|GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (const char *)&dllLocator, &mod);
HRSRC res = FindResource(mod, MAKEINTRESOURCE(resource), MAKEINTRESOURCE(TYPE_EMBED));
int err = GetLastError();
HGLOBAL data = LoadResource(mod, res);
DWORD resSize = SizeofResource(mod, res);
const char* resData = (const char*)LockResource(data);
if(res == NULL)
{
RDCFATAL("Couldn't find embedded win32 resource");
}
return string(resData, resData+resSize);
HGLOBAL data = LoadResource(mod, res);
if(data != NULL)
{
DWORD resSize = SizeofResource(mod, res);
const char* resData = (const char*)LockResource(data);
if(resData)
return string(resData, resData+resSize);
}
return "";
}
namespace Keyboard