From b00a6f222b573d2ae4661ee28859b9517911bbdc Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Jun 30 2008 18:13:05 +0000 Subject: slapi_pw_find_sv() expects an array, make sure we have a NULL terminated one to avoid potential segfaults Avoid leaking memory too. --- diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c index 031243d..eae63da 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c +++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c @@ -1270,24 +1270,28 @@ static int ipapwd_CheckPolicy(struct ipapwd_data *data) /* skip policy checks */ slapi_entry_free(policy); goto no_policy; - } + } /* first of all check current password, if any */ old_pw = slapi_entry_attr_get_charptr(data->target, "userPassword"); if (old_pw) { - Slapi_Value *cpw; + Slapi_Value *cpw[2] = {NULL, NULL}; Slapi_Value *pw; - cpw = slapi_value_new_string(old_pw); + cpw[0] = slapi_value_new_string(old_pw); pw = slapi_value_new_string(data->password); - if (!cpw || !pw) { + if (!cpw[0] || !pw) { slapi_log_error(SLAPI_LOG_PLUGIN, "ipa_pwd_extop", "ipapwd_checkPassword: Out of Memory\n"); slapi_entry_free(policy); + slapi_value_free(&cpw[0]); + slapi_value_free(&pw); return LDAP_OPERATIONS_ERROR; } - ret = slapi_pw_find_sv(&cpw, pw); + ret = slapi_pw_find_sv(cpw, pw); + slapi_value_free(&cpw[0]); + slapi_value_free(&pw); if (ret == 0) { slapi_log_error(SLAPI_LOG_TRACE, "ipa_pwd_extop",