ITS#6764

diff --git a/CHANGES b/CHANGES
index cbc8b2a04f25999ae4d4319fc97d076ac7abf3bb..2d97c14fe0d3ccffd3f214a7273b622c4ead059a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering
        Added contrib/kinit for kerberos tickets
        Added contrib/noopsrch for entry counting (ITS#6598)
        Fixed liblber to not close invalid sockets (ITS#6585)
+       Fixed liblber unmatched brace handling (ITS#6764)
        Fixed liblber error setting (ITS#6732)
        Fixed liblber memory debugging (ITS#6733)
        Fixed libldap connectionless warnings (ITS#6747)

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index d84c1907cd0bcfbce49bbd62c3158419f5914cc4..e2288fbf986b45a1e7ce51a347bf768782e2527f 100644 (file)
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -390,6 +390,11 @@ int ber_flatten2(
                return -1;
        }
 
+       /* unmatched "{" and "}" */
+       if ( ber->ber_sos_ptr != NULL ) {
+               return -1;
+       }
+
        if ( ber == NULL ) {
                /* ber is null, create an empty berval */
                bv->bv_val = NULL;