dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more error handling and endianity fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5311 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-10-03 18:27:37 +00:00
parent ef5e8a1f70
commit 9915194e85
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/icon.cpp
View file

@ -55,7 +55,7 @@ IconGroup load_icon_res(CResourceEditor* re, WORD id)
header = (IconGroupHeader*) group; header = (IconGroupHeader*) group;
for (WORD i = 0; i < header->wCount; i++) for (WORD i = 0; i < FIX_ENDIAN_INT16(header->wCount); i++)
{ {
Icon icon; Icon icon;
icon.index = i; icon.index = i;
@ -95,22 +95,34 @@ IconGroup load_icon_file(const char* filename)
icon.data = NULL; icon.data = NULL;
if (!fread(&icon.meta, sizeof(IconGroupEntry), 1, file)) if (!fread(&icon.meta, sizeof(IconGroupEntry), 1, file))
{
free_loaded_icon(result);
throw runtime_error("unable to read entry from file"); throw runtime_error("unable to read entry from file");
}
DWORD size = FIX_ENDIAN_INT32(icon.meta.dwRawSize); DWORD size = FIX_ENDIAN_INT32(icon.meta.dwRawSize);
if (size > 1048576) // magic numbers are great if (size > 1048576) // magic numbers are great
{
free_loaded_icon(result);
throw runtime_error("invalid icon file size"); throw runtime_error("invalid icon file size");
}
DWORD iconOffset; DWORD iconOffset;
if (!fread(&iconOffset, sizeof(DWORD), 1, file)) if (!fread(&iconOffset, sizeof(DWORD), 1, file))
{
free_loaded_icon(result);
throw runtime_error("unable to read offset from file"); throw runtime_error("unable to read offset from file");
}
fpos_t pos; fpos_t pos;
fgetpos(file, &pos); fgetpos(file, &pos);
if (fseek(file, iconOffset, SEEK_SET)) if (fseek(file, iconOffset, SEEK_SET))
{
free_loaded_icon(result);
throw runtime_error("corrupted icon file, too small"); throw runtime_error("corrupted icon file, too small");
}
icon.data = new BYTE[size]; icon.data = new BYTE[size];