From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 20:37:52 +0000 (+0000)
Subject: ITS#6764
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~131
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eabaac5f3bedff8ff7d7d3494be57b102cbb01ec;p=openldap

ITS#6764
---

diff --git a/CHANGES b/CHANGES
index cbc8b2a04f..2d97c14fe0 100644
--- 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 d84c1907cd..e2288fbf98 100644
--- 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;