upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-18 04:44:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SEGV when no newSuperior is specified

Browse source
This commit is contained in:
Howard Chu 2001-12-24 20:27:00 +00:00
parent 5b49e1a9c5
commit 6654fffb3e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/modrdn.c
View file

@ -382,7 +382,7 @@ do_modrdn(
#endif
{
if ( (*be->be_modrdn)( be, conn, op, pdn->bv_val, ndn->bv_val,
pnewrdn->bv_val, deloldrdn, pnewSuperior->bv_val ) == 0
pnewrdn->bv_val, deloldrdn, pnewSuperior ? pnewSuperior->bv_val : NULL ) == 0
#ifdef SLAPD_MULTIMASTER
&& ( be->be_update_ndn == NULL || !repl_user )
#endif
@ -390,7 +390,7 @@ do_modrdn(
struct replog_moddn moddn;
moddn.newrdn = pnewrdn->bv_val;
moddn.deloldrdn = deloldrdn;
moddn.newsup = pnewSuperior->bv_val;
moddn.newsup = pnewSuperior ? pnewSuperior->bv_val : NULL;
replog( be, op, pdn->bv_val, ndn->bv_val, &moddn );
}
@ -423,8 +423,8 @@ cleanup:
if( nnewrdn != NULL ) ber_bvfree( nnewrdn );
free( newSuperior.bv_val );
if ( pnewSuperior != NULL ) free( pnewSuperior );
if ( nnewSuperior != NULL ) free( nnewSuperior );
if ( pnewSuperior != NULL ) ber_bvfree( pnewSuperior );
if ( nnewSuperior != NULL ) ber_bvfree( nnewSuperior );
return rc;
}