upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 02:29:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not leak memory in slappasswd

Browse source
This commit is contained in:
Ondřej Kuzník 2019-03-27 10:27:44 +00:00 committed by Ondřej Kuzník
parent 8b7f21c7aa
commit 3bda24173d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/slappasswd.c
View file

@ -112,7 +112,7 @@ slappasswd( int argc, char *argv[] )
int i;
char *newline = "\n";
struct berval passwd = BER_BVNULL;
struct berval hash;
struct berval hash = BER_BVNULL;
#ifdef LDAP_DEBUG
/* tools default to "none", so that at least LDAP_DEBUG_ANY
@ -257,7 +257,7 @@ slappasswd( int argc, char *argv[] )
}
lutil_passwd_hash( &passwd, scheme, &hash, &text );
if( hash.bv_val == NULL ) {
if ( BER_BVISNULL( &hash ) ) {
fprintf( stderr,
"Password generation failed for scheme %s: %s\n",
scheme, text ? text : "" );
@ -279,6 +279,12 @@ destroy:;
#ifdef SLAPD_MODULES
module_kill();
#endif
if ( !BER_BVISNULL( &hash ) ) {
ber_memfree( hash.bv_val );
}
if ( passwd.bv_val != hash.bv_val && !BER_BVISNULL( &passwd ) ) {
ber_memfree( passwd.bv_val );
}
return rc;
}