X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fentry.c;h=f5829d395af02a3555138d88234b8df301b6e68e;hb=804490a8b12a94a19e7c1a8710a7d8a2fb7d5477;hp=48afbf5d9d3e99724999f9246196f253e7e1af56;hpb=4a8ab5dbf2ba037b0824d64bb3217ca06671884a;p=openldap

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 48afbf5d9d..f5829d395a 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -109,8 +109,6 @@ str2entry( char *s )
 		}
 
 		if ( strcasecmp( type, "dn" ) == 0 ) {
-			struct berval *pdn = NULL;
-
 			free( type );
 
 			if ( e->e_dn != NULL ) {
@@ -131,22 +129,21 @@ str2entry( char *s )
 			}
 
 			rc = dnPrettyNormal( NULL, &vals[0], &e->e_name, &e->e_nname );
-			free( vals[0].bv_val );
 			if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 				LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1, "str2entry: "
 					"entry %ld has invalid DN \"%s\"\n",
-					(long) e->e_id,
-					pdn->bv_val ? pdn->bv_val : "" ));
+					(long) e->e_id, vals[0].bv_val ));
 #else
 				Debug( LDAP_DEBUG_ANY, "str2entry: "
 					"entry %ld has invalid DN \"%s\"\n",
-					(long) e->e_id,
-					pdn->bv_val ? pdn->bv_val : "", 0 );
+					(long) e->e_id, vals[0].bv_val, 0 );
 #endif
 				entry_free( e );
+				free( vals[0].bv_val );
 				return NULL;
 			}
+			free( vals[0].bv_val );
 			continue;
 		}
 
@@ -308,6 +305,8 @@ entry2str(
 	int		i;
 	ber_len_t tmplen;
 
+	assert( e != NULL );
+
 	/*
 	 * In string format, an entry looks like this:
 	 *	dn: <dn>\n