ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Don't free user supplied data in Shell_NotifyIcon if GetIconInfo failed. 

We should free the nid and in such a case we were doing it.
This commit is contained in:
Mikołaj Zalewski 2007-03-18 11:51:53 +01:00 committed by Alexandre Julliard
parent cdf06864e2
commit 50275015f8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/shell32/systray.c
View File

@ -89,6 +89,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
{
HWND tray;
COPYDATASTRUCT cds;
char *buffer = NULL;
TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize);
@ -102,7 +103,6 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
if (nid->uFlags & NIF_ICON)
{
ICONINFO iconinfo;
char *buffer;
BITMAP bmMask;
BITMAP bmColour;
LONG cbMaskBits;
@ -156,8 +156,7 @@ noicon:
/* FIXME: if statement only needed because we don't support interprocess
* icon handles */
if (nid->uFlags & NIF_ICON)
HeapFree(GetProcessHeap(), 0, cds.lpData);
HeapFree(GetProcessHeap(), 0, buffer);
return TRUE;
}