diff options
| author | Simo Sorce <ssorce@redhat.com> | 2008-06-24 08:40:58 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2008-09-10 15:43:40 -0400 |
| commit | 6e0af503aa4893280f21df42bebc72459fabc27b (patch) | |
| tree | f6fdee43cc25211149605fb2c8c5479ff01aabf6 | |
| parent | 128587a19e20ed8f672d45b535fef547db14ecdb (diff) | |
| download | freeipa-6e0af503aa4893280f21df42bebc72459fabc27b.tar.gz freeipa-6e0af503aa4893280f21df42bebc72459fabc27b.tar.xz freeipa-6e0af503aa4893280f21df42bebc72459fabc27b.zip | |
slapi_pw_find_sv() expects an array, make sure we have a NULL terminated one to avoid potential segfaults Avoid leaking memory too.
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 14 |
1 files changed, 9 insertions, 5 deletions
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 21e50dbc..c25d0f11 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 @@ -1258,24 +1258,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", |