github
/
amiga-clib2
mirror of https://github.com/adtools/clib2.git
1
0
Fork 0
Code Releases Wiki Activity

This got lost last year 

The missing calloc() overflow test never made it to the CVS or git repositories :-(
This commit is contained in:
obarthel 2017-07-08 18:10:28 +02:00
parent 1b2c798467
commit febe690623
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/stdlib_calloc.c
View File

@ -59,13 +59,25 @@ __calloc(size_t num_elements,size_t element_size,const char * file,int line)
}
#endif /* __MEM_DEBUG */
/* This might overflow. */
total_size = num_elements * element_size;
result = __malloc(total_size,file,line);
if(result != NULL)
memset(result,0,total_size);
/* No arithmetic overflow? */
if(total_size >= num_elements)
{
result = __malloc(total_size,file,line);
if(result != NULL)
memset(result,0,total_size);
else
SHOWMSG("memory allocation failure");
}
/* Multiplying the number and size of elements overflows
* the size_t range.
*/
else
SHOWMSG("memory allocation failure");
{
D(("calloc(num_elements=%ld, element_size=%ld) overflow"));
}
return(result);
}