Attachment 310469 Details for Bug 453185 – corrected patch

[patch] corrected patch

0001-slapi_pw_find_sv-expects-an-array-make-sure-we-ha.patch (text/plain), 1.56 KB, created by Simo Sorce on 2008-06-27 18:54:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simo Sorce

Created: 2008-06-27 18:54:28 UTC

Size: 1.56 KB

patch

obsolete

>>From 42c40c264f1361361f8678cec6ab1068d3d76c9c Mon Sep 17 00:00:00 2001
>From: Simo Sorce <ssorce@redhat.com>
>Date: Tue, 24 Jun 2008 08:40:58 -0400
>Subject: [PATCH] slapi_pw_find_sv() expects an array, make sure we have a NULL terminated
> one to avoid potential segfaults
>
>---
> .../ipa-pwd-extop/ipa_pwd_extop.c                  |   10 +++++-----
> 1 files changed, 5 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 21e50db..0bf0826 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,24 @@ 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);
> 			return LDAP_OPERATIONS_ERROR;
> 		}
> 
>-		ret = slapi_pw_find_sv(&cpw, pw);
>+		ret = slapi_pw_find_sv(cpw, pw);
> 
> 		if (ret == 0) {
> 			slapi_log_error(SLAPI_LOG_TRACE, "ipa_pwd_extop",
>-- 
>1.5.5.1
>

Actions: View | Diff

Attachments on bug 453185: 310466 | 310469 | 310476