krb5 commit: Fix krb5_ldap_put_password_policy cleanup

Greg Hudson ghudson at MIT.EDU
Thu Mar 28 15:53:00 EDT 2013


https://github.com/krb5/krb5/commit/57dbbf1a57887975362862688ed7f48904dce6fe
commit 57dbbf1a57887975362862688ed7f48904dce6fe
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Mar 28 15:21:10 2013 -0400

    Fix krb5_ldap_put_password_policy cleanup
    
    Initialize policy_dn since we clean it up.  Also free it
    unconditionally.

 src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c
index 433fb75..c6fdbb4 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c
@@ -189,7 +189,7 @@ cleanup:
 krb5_error_code
 krb5_ldap_put_password_policy(krb5_context context, osa_policy_ent_t policy)
 {
-    char                        *policy_dn;
+    char                        *policy_dn=NULL;
     krb5_error_code             st=0;
     LDAP                        *ld=NULL;
     LDAPMod                     **mods=NULL;
@@ -227,8 +227,7 @@ krb5_ldap_put_password_policy(krb5_context context, osa_policy_ent_t policy)
     }
 
 cleanup:
-    if (policy_dn != NULL)
-        free (policy_dn);
+    free(policy_dn);
     ldap_mods_free(mods, 1);
     krb5_ldap_put_handle_to_pool(ldap_context, ldap_server_handle);
     return(st);


More information about the cvs-krb5 mailing list