mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

serialNumberAndIssuerPretty() and serialNumberAndIssuerNormalize()

Browse Source 
were confused about realloced memory.
This commit is contained in:
Hallvard Furuseth 2005-07-30 23:30:42 +00:00
parent 5ff31144a7
commit 9601e1e7ec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/schema_init.c
View File

@ -2434,13 +2434,14 @@ serialNumberAndIssuerPretty(
out->bv_len = sn.bv_len + newi.bv_len + 1; out->bv_len = sn.bv_len + newi.bv_len + 1;
out->bv_val = slap_sl_realloc( newi.bv_val, out->bv_len + 1, ctx ); out->bv_val = slap_sl_realloc( newi.bv_val, out->bv_len + 1, ctx );
if( BER_BVISNULL( out ) ) { if( out->bv_val == NULL ) {
out->bv_len = 0;
slap_sl_free( newi.bv_val, ctx ); slap_sl_free( newi.bv_val, ctx );
return LDAP_OTHER; return LDAP_OTHER;
} }
/* push issuer over */ /* push issuer over */
AC_MEMCPY( &out->bv_val[sn.bv_len+1], newi.bv_val, newi.bv_len ); AC_MEMCPY( &out->bv_val[sn.bv_len+1], out->bv_val, newi.bv_len );
/* insert sn and "$" */ /* insert sn and "$" */
AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len ); AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len );
out->bv_val[sn.bv_len] = '$'; out->bv_val[sn.bv_len] = '$';
@ -2510,13 +2511,14 @@ serialNumberAndIssuerNormalize(
out->bv_len = sn.bv_len + newi.bv_len + 1; out->bv_len = sn.bv_len + newi.bv_len + 1;
out->bv_val = slap_sl_realloc( newi.bv_val, out->bv_len + 1, ctx ); out->bv_val = slap_sl_realloc( newi.bv_val, out->bv_len + 1, ctx );
if( BER_BVISNULL( out ) ) { if( out->bv_val == NULL ) {
out->bv_len = 0;
slap_sl_free( newi.bv_val, ctx ); slap_sl_free( newi.bv_val, ctx );
return LDAP_OTHER; return LDAP_OTHER;
} }
/* push issuer over */ /* push issuer over */
AC_MEMCPY( &out->bv_val[sn.bv_len+1], newi.bv_val, newi.bv_len ); AC_MEMCPY( &out->bv_val[sn.bv_len+1], out->bv_val, newi.bv_len );
/* insert sn and "$" */ /* insert sn and "$" */
AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len ); AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len );
out->bv_val[sn.bv_len] = '$'; out->bv_val[sn.bv_len] = '$';