From 7dc2199bfd7687f545a6d3b212a77497e22b1c25 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Wed, 14 Feb 2007 00:08:26 +0000
Subject: [PATCH] Fix rev 1.312

---
 servers/slapd/syncrepl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 1b313b5bbd..b5fef03d48 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1629,7 +1629,8 @@ syncrepl_message_to_entry(
 	if ( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_DELETE ) {
 		/* NOTE: this could be done even before decoding the DN,
 		 * although encoding errors wouldn't be detected */
-		return LDAP_SUCCESS;
+		rc = LDAP_SUCCESS;
+		goto done;
 	}
 
 	if ( entry == NULL ) {
@@ -1733,7 +1734,8 @@ done:
 			e = NULL;
 		}
 	}
-	*entry = e;
+	if ( entry )
+		*entry = e;
 
 	return rc;
 }
-- 
2.39.5