From eae2233d0ce2e956a6018b2dfd1f00e3d9478075 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Tue, 9 Aug 2005 03:39:12 +0000 Subject: [PATCH] don't leak in case of attribute not found --- servers/slapd/slapi/slapi_utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c index ca370dd483..8c82d9adea 100644 --- a/servers/slapd/slapi/slapi_utils.c +++ b/servers/slapd/slapi/slapi_utils.c @@ -226,12 +226,12 @@ slapi_entry_attr_merge( BerVarray bv; int rc; - rc = bvptr2obj( vals, &bv ); + rc = slap_str2ad( type, &ad, &text ); if ( rc != LDAP_SUCCESS ) { return -1; } - rc = slap_str2ad( type, &ad, &text ); + rc = bvptr2obj( vals, &bv ); if ( rc != LDAP_SUCCESS ) { return -1; } -- 2.39.5