Marcus Meissner : winemenubuilder: Avoid double free (Coverity).
Alexandre Julliard
julliard at winehq.org
Mon Aug 22 10:24:13 CDT 2016
Module: wine
Branch: master
Commit: 2e32c0c6572a0da72164196715781940c38aa352
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e32c0c6572a0da72164196715781940c38aa352
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Sun Aug 21 20:38:18 2016 +0200
winemenubuilder: Avoid double free (Coverity).
Signed-off-by: Marcus Meissner <marcus at jet.franken.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/winemenubuilder/winemenubuilder.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 2b7340f..e0c6ba2 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -1005,13 +1005,8 @@ static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntr
position.QuadPart = 0;
hr = IStream_Seek(iconStream, position, STREAM_SEEK_SET, NULL);
- if (FAILED(hr))
- goto end;
- hr = convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName);
-
-end:
- HeapFree(GetProcessHeap(), 0, pIconDirEntry);
- return hr;
+ if (FAILED(hr)) return hr;
+ return convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName);
}
static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra)
More information about the wine-cvs
mailing list