dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-28 14:38:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

catch malloc(0)/calloc(0) with an assert

Browse Source 
Actually, it turns out we now should never call these functions
with a zero size, otherwise something is wrong in the logic.

Change-Id: Ie414fcbec95486c169190470a71f2cff0843782a
This commit is contained in:
skal 2013-01-23 20:08:49 +01:00
parent 152ec3d2ee
commit 757ebcb1c1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/utils.c
View File

@ -30,12 +30,14 @@ static int CheckSizeArgumentsOverflow(uint64_t nmemb, size_t size) {
void* WebPSafeMalloc(uint64_t nmemb, size_t size) { void* WebPSafeMalloc(uint64_t nmemb, size_t size) {
if (!CheckSizeArgumentsOverflow(nmemb, size)) return NULL; if (!CheckSizeArgumentsOverflow(nmemb, size)) return NULL;
return (nmemb > 0 && size > 0) ? malloc((size_t)(nmemb * size)) : NULL; assert(nmemb * size > 0);
return malloc((size_t)(nmemb * size));
} }
void* WebPSafeCalloc(uint64_t nmemb, size_t size) { void* WebPSafeCalloc(uint64_t nmemb, size_t size) {
if (!CheckSizeArgumentsOverflow(nmemb, size)) return NULL; if (!CheckSizeArgumentsOverflow(nmemb, size)) return NULL;
return (nmemb > 0 && size > 0) ? calloc((size_t)nmemb, size) : NULL; assert(nmemb * size > 0);
return calloc((size_t)nmemb, size);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------