mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6437, slap_sl_calloc():

Browse Source 
Check count*size overflow. Omit slap_sl_malloc failure check, it cannot fail.
This commit is contained in:
Hallvard Furuseth 2010-01-02 22:53:22 +00:00
parent 423c13a6d6
commit 4e66da4ec1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servers/slapd/sl_malloc.c
View File

@ -319,14 +319,25 @@ slap_sl_malloc(
return ch_malloc(size);
}
#define LIM_SQRT(t) /* some value < sqrt(max value of unsigned type t) */ \
((0UL|(t)-1) >>31>>31 > 1 ? ((t)1 <<32) - 1 : \
(0UL|(t)-1) >>31 ? 65535U : (0UL|(t)-1) >>15 ? 255U : 15U)
void *
slap_sl_calloc( ber_len_t n, ber_len_t size, void *ctx )
{
void *newptr;
ber_len_t total = n * size;
newptr = slap_sl_malloc( n*size, ctx );
if ( newptr ) {
/* The sqrt test is a slight optimization: often avoids the division */
if ((n | size) <= LIM_SQRT(ber_len_t) || n == 0 || total/n == size) {
newptr = slap_sl_malloc( total, ctx );
memset( newptr, 0, n*size );
} else {
Debug(LDAP_DEBUG_ANY, "slap_sl_calloc(%lu,%lu) out of range\n",
(unsigned long) n, (unsigned long) size, 0);
assert(0);
exit(EXIT_FAILURE);
}
return newptr;
}