don't leak in case of attribute not found

This commit is contained in:
Pierangelo Masarati 2005-08-09 03:39:12 +00:00
parent 2e36d49a73
commit eae2233d0c

View File

@ -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;
}