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

Fixed minor MakeNSIS leaks (Bug #3474662)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6309 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-03-19 02:11:37 +00:00
parent a2fe9bec1b
commit d3d637fab9
5 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/icon.cpp
View file

@ -24,14 +24,20 @@ static FILE * open_icon(const TCHAR* filename, IconGroupHeader& igh)
throw runtime_error("can't open file");
if (!fread(&igh, sizeof(IconGroupHeader), 1, f))
{
fclose(f);
throw runtime_error("unable to read header from file");
}
FIX_ENDIAN_INT16_INPLACE(igh.wIsIcon);
FIX_ENDIAN_INT16_INPLACE(igh.wReserved);
FIX_ENDIAN_INT16_INPLACE(igh.wCount);
if (igh.wIsIcon != 1 || igh.wReserved != 0)
{
fclose(f);
throw runtime_error("invalid icon file");
}
return f;
}
@ -89,6 +95,7 @@ IconGroup load_icon_file(const TCHAR* filename)
IconGroup result;
FILE *file = open_icon(filename, iconHeader);
MANAGE_WITH(file, fclose);
for (WORD i = 0; i < iconHeader.wCount; i++)
{