From: Howard Chu <hyc@symas.com>
Date: Sat, 12 Sep 2015 21:17:16 +0000 (+0100)
Subject: Revert "Revert "ITS#8240""
X-Git-Tag: OPENLDAP_REL_ENG_2_4_43~53
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b85b9f7ee5fe37aa2fb8f6e3f004102cab88fa10;p=openldap

Revert "Revert "ITS#8240""

We have never documented our use of assert, so can't expect
builders to do the right thing.
This reverts commit c5b4cd672eb4a3296e62711473e4c9b7e8a07378.
---

diff --git a/CHANGES b/CHANGES
index 10dffebdbb..f01e7aa06d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.43 Engineering
+	Fixed liblber remove obsolete assert (ITS#8240)
 	Fixed slap tools minor one time memory leak (ITS#8082)
 	Fixed slapd to avoid redundant processing of abandon ops (ITS#8232)
 	Fixed slapd syncrepl segv when present list is NULL (ITS#8231, ITS#8042)
diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 85c3e23e81..c05dcf8434 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -679,7 +679,7 @@ done:
 		return (ber->ber_tag);
 	}
 
-	assert( 0 ); /* ber structure is messed up ?*/
+	/* invalid input */
 	return LBER_DEFAULT;
 }