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

gdiplus: Fix a memory leak in GdipCreateMetafileFromWmf.

This commit is contained in:
Vincent Povirk 2009-12-31 16:15:37 -06:00 committed by Alexandre Julliard
parent 0c582dca3a
commit 01b32951a5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/gdiplus/graphics.c
View File

@ -1217,7 +1217,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
UINT read; UINT read;
BYTE* copy; BYTE* copy;
HENHMETAFILE hemf; HENHMETAFILE hemf;
GpStatus retval = GenericError; GpStatus retval = Ok;
TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile);
@ -1242,6 +1242,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){
ERR("could not make stream\n"); ERR("could not make stream\n");
GdipFree(copy); GdipFree(copy);
retval = GenericError;
goto err; goto err;
} }
@ -1253,7 +1254,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture,
(LPVOID*) &((*metafile)->image.picture)) != S_OK) (LPVOID*) &((*metafile)->image.picture)) != S_OK)
{
retval = GenericError;
goto err; goto err;
}
(*metafile)->image.type = ImageTypeMetafile; (*metafile)->image.type = ImageTypeMetafile;
@ -1277,10 +1281,9 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete,
TRACE("<-- %p\n", *metafile); TRACE("<-- %p\n", *metafile);
return Ok;
err: err:
GdipFree(*metafile); if (retval != Ok)
GdipFree(*metafile);
IStream_Release(stream); IStream_Release(stream);
return retval; return retval;
} }