tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED] (Author: versat) Fix Change Icon app memory leak and wrong usage of function memset. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1270 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2014-08-03 10:48:49 +00:00
parent c92f6cc91d
commit 8b9baff196
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PowerEditor/src/tools/ChangeIcon/ChangeIcon.cpp
View File

@ -121,7 +121,7 @@ bool Icon::readICO(TCHAR* filename)
_entries = new ICONDIRENTRY[count()];
if(!ReadFile( hFile, _entries, sizeof(*_entries)*count(), &dwBytesRead, NULL )) { _tprintf(_T("Error reading file '%s'\n"), filename); return false; }
// Read images
_imagesData=new LPBYTE[count()]; memset(_imagesData, sizeof(LPBYTE)*count(), 0);
_imagesData=new LPBYTE[count()]; memset(_imagesData, 0, sizeof(LPBYTE)*count());
for(int i=0; i<count(); ++i)
{
IFDEBUG( _tprintf(_T("%d: offset=%d, size=%d\n"), i, _entries[i].dwImageOffset, _entries[i].dwBytesInRes); )
@ -211,9 +211,12 @@ bool Icon::writeToEXE(TCHAR* lpFileName, LPCTSTR lpResName, UINT resLangId)
#undef _myWrite
// Replace icon group
if(!UpdateResource(hUpdate, RT_GROUP_ICON, lpResName, resLangId, resData, cbRes)) { _tprintf(_T("Unable to update icon group\n")); delete resData; return false; }
if(!UpdateResource(hUpdate, RT_GROUP_ICON, lpResName, resLangId, resData, cbRes))
{
_tprintf(_T("Unable to update icon group\n")); delete[] resData; return false;
}
IFDEBUG( _tprintf(_T("Updated group %d (lang %d)\n"), lpResName, resLangId); )
delete resData;
delete [] resData;
}
// Replace/add icons