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

17
Source/util.cpp
View file

@ -145,20 +145,20 @@ int update_bitmap(CResourceEditor* re, WORD id, const TCHAR* filename, int width
dwSize -= 14;
unsigned char* bitmap = (unsigned char*)malloc(dwSize);
if (!bitmap) throw bad_alloc();
fseek(f, 14, SEEK_SET);
if (fread(bitmap, 1, dwSize, f) != dwSize) {
if (!bitmap) {
fclose(f);
return -2;
throw bad_alloc();
}
bool gotbmdata = !fseek(f, 14, SEEK_SET) && dwSize == fread(bitmap, 1, dwSize, f);
int retval = gotbmdata ? 0 : -2;
fclose(f);
re->UpdateResource(RT_BITMAP, id, NSIS_DEFAULT_LANG, bitmap, dwSize);
if (gotbmdata)
re->UpdateResource(RT_BITMAP, id, NSIS_DEFAULT_LANG, bitmap, dwSize);
free(bitmap);
return 0;
return retval;
}
#ifndef _WIN32
@ -717,6 +717,7 @@ static bool GetDLLVersionUsingRE(const tstring& filepath, DWORD& high, DWORD & l
free(dll);
return 0;
}
fclose(fdll);
try
{