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 10dffebdbb8fe1de244b11bed11913cf1b9e4f8e..f01e7aa06d518ae43edae3970726c81a0086ca8b 100644 (file)
--- 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 85c3e23e810512fa80ec31c302a2a5a1a8a97cb5..c05dcf8434a42c5be71614da7e63e53c2f18cc6c 100644 (file)
--- 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;
 }