Lines 188-194
GifUnionColorMap(const ColorMapObject *ColorIn1,
Link Here
|
188 |
|
188 |
|
189 |
/* perhaps we can shrink the map? */ |
189 |
/* perhaps we can shrink the map? */ |
190 |
if (RoundUpTo < ColorUnion->ColorCount) { |
190 |
if (RoundUpTo < ColorUnion->ColorCount) { |
191 |
GifColorType *new_map = (GifColorType *)reallocarray(Map, |
191 |
GifColorType *new_map = (GifColorType *)openbsd_reallocarray(Map, |
192 |
RoundUpTo, sizeof(GifColorType)); |
192 |
RoundUpTo, sizeof(GifColorType)); |
193 |
if( new_map == NULL ) { |
193 |
if( new_map == NULL ) { |
194 |
GifFreeMapObject(ColorUnion); |
194 |
GifFreeMapObject(ColorUnion); |
Lines 232-238
GifAddExtensionBlock(int *ExtensionBlockCount,
Link Here
|
232 |
if (*ExtensionBlocks == NULL) |
232 |
if (*ExtensionBlocks == NULL) |
233 |
*ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); |
233 |
*ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock)); |
234 |
else { |
234 |
else { |
235 |
ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray |
235 |
ExtensionBlock* ep_new = (ExtensionBlock *)openbsd_reallocarray |
236 |
(*ExtensionBlocks, (*ExtensionBlockCount + 1), |
236 |
(*ExtensionBlocks, (*ExtensionBlockCount + 1), |
237 |
sizeof(ExtensionBlock)); |
237 |
sizeof(ExtensionBlock)); |
238 |
if( ep_new == NULL ) |
238 |
if( ep_new == NULL ) |
Lines 325-331
GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
Link Here
|
325 |
if (GifFile->SavedImages == NULL) |
325 |
if (GifFile->SavedImages == NULL) |
326 |
GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); |
326 |
GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage)); |
327 |
else |
327 |
else |
328 |
GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages, |
328 |
GifFile->SavedImages = (SavedImage *)openbsd_reallocarray(GifFile->SavedImages, |
329 |
(GifFile->ImageCount + 1), sizeof(SavedImage)); |
329 |
(GifFile->ImageCount + 1), sizeof(SavedImage)); |
330 |
|
330 |
|
331 |
if (GifFile->SavedImages == NULL) |
331 |
if (GifFile->SavedImages == NULL) |
Lines 355-361
GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
Link Here
|
355 |
} |
355 |
} |
356 |
|
356 |
|
357 |
/* next, the raster */ |
357 |
/* next, the raster */ |
358 |
sp->RasterBits = (unsigned char *)reallocarray(NULL, |
358 |
sp->RasterBits = (unsigned char *)openbsd_reallocarray(NULL, |
359 |
(CopyFrom->ImageDesc.Height * |
359 |
(CopyFrom->ImageDesc.Height * |
360 |
CopyFrom->ImageDesc.Width), |
360 |
CopyFrom->ImageDesc.Width), |
361 |
sizeof(GifPixelType)); |
361 |
sizeof(GifPixelType)); |
Lines 369-375
GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
Link Here
|
369 |
|
369 |
|
370 |
/* finally, the extension blocks */ |
370 |
/* finally, the extension blocks */ |
371 |
if (sp->ExtensionBlocks != NULL) { |
371 |
if (sp->ExtensionBlocks != NULL) { |
372 |
sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL, |
372 |
sp->ExtensionBlocks = (ExtensionBlock *)openbsd_reallocarray(NULL, |
373 |
CopyFrom->ExtensionBlockCount, |
373 |
CopyFrom->ExtensionBlockCount, |
374 |
sizeof(ExtensionBlock)); |
374 |
sizeof(ExtensionBlock)); |
375 |
if (sp->ExtensionBlocks == NULL) { |
375 |
if (sp->ExtensionBlocks == NULL) { |