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

oleaut32: Do not cast NULL.

This commit is contained in:
Michael Stefaniuc 2008-11-02 00:21:15 +01:00 committed by Alexandre Julliard
parent b609a5c037
commit 25f33cb0bc
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/olepicture.c
View File

@ -1610,9 +1610,7 @@ succ:
end:
if(png_ptr)
ppng_destroy_read_struct(&png_ptr,
(info_ptr ? &info_ptr : (png_infopp) NULL),
(png_infopp)NULL);
ppng_destroy_read_struct(&png_ptr, info_ptr ? &info_ptr : NULL, NULL);
HeapFree(GetProcessHeap(), 0, row_pointers);
HeapFree(GetProcessHeap(), 0, pngdata);
return ret;

12
dlls/oleaut32/ungif.c
View File

@ -148,16 +148,16 @@ MakeMapObject(int ColorCount,
/*** FIXME: Our ColorCount has to be a power of two. Is it necessary to
* make the user know that or should we automatically round up instead? */
if (ColorCount != (1 << BitSize(ColorCount))) {
return ((ColorMapObject *) NULL);
return NULL;
}
Object = ungif_alloc(sizeof(ColorMapObject));
if (Object == (ColorMapObject *) NULL) {
return ((ColorMapObject *) NULL);
if (Object == NULL) {
return NULL;
}
Object->Colors = ungif_calloc(ColorCount, sizeof(GifColorType));
if (Object->Colors == (GifColorType *) NULL) {
if (Object->Colors == NULL) {
return NULL;
}
@ -413,9 +413,9 @@ DGifGetImageDesc(GifFileType * GifFile) {
return GIF_ERROR;
}
}
sp->RasterBits = (unsigned char *)NULL;
sp->RasterBits = NULL;
sp->ExtensionBlockCount = 0;
sp->ExtensionBlocks = (ExtensionBlock *) NULL;
sp->ExtensionBlocks = NULL;
GifFile->ImageCount++;