From 9e4802b211dd90a71fd8ba905153fc169cfdd412 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Sat, 20 Dec 2003 15:07:31 +0000
Subject: [PATCH] ITS#2865 from HEAD

---
 servers/slapd/entry.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index fdd5a18444..87791c9850 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -557,6 +557,16 @@ int entry_decode(struct berval *bv, Entry **e)
 	BerVarray bptr;
 
 	i = entry_getlen(&ptr);
+	if (!i) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, INFO, 
+			"entry_decode: entry length was zero\n", 0, 0, 0);
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"entry_decode: entry length was zero\n", 0, 0, 0);
+#endif
+		return LDAP_OTHER;
+	}
 	x = ch_calloc(1, i);
 	i = entry_getlen(&ptr);
 	x->e_name.bv_val = ptr;
-- 
2.39.5