upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 23:19:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid 0-sized, unused allocations

Browse source
This commit is contained in:
Pierangelo Masarati 2003-04-05 11:30:43 +00:00
parent c0ee56c306
commit 4022ee7b43
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/librewrite/subst.c
View file

@ -300,10 +300,12 @@ rewrite_subst_apply(
/*
* Prepare room for submatch expansion
*/
submatch = calloc( sizeof( struct berval ),
subst->lt_num_submatch );
if ( submatch == NULL ) {
return REWRITE_REGEXEC_ERR;
if ( subst->lt_num_submatch > 0 ) {
submatch = calloc( sizeof( struct berval ),
subst->lt_num_submatch );
if ( submatch == NULL ) {
return REWRITE_REGEXEC_ERR;
}
}
/*
@ -408,8 +410,8 @@ rewrite_subst_apply(
l += subst->lt_subs_len;
res = calloc( sizeof( char ), l + 1 );
if ( res == NULL ) {
free( submatch );
return REWRITE_REGEXEC_ERR;
rc = REWRITE_REGEXEC_ERR;
goto cleanup;
}
/*
@ -433,7 +435,12 @@ rewrite_subst_apply(
val->bv_val = res;
val->bv_len = l;
cleanup:;
if ( submatch ) {
free( submatch );
}
return rc;
}