detect braindead entries (e.g. from back-perl, ITS#4845,ITS#4852)

diff --git a/CHANGES b/CHANGES
index d9188bdbc142c6dcb1a143c2c19886b14ef49205..98904df33c02f77978ebdf5ab645f7480e3a022c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.35 Engineering
+       Fixed entry consistency check in str2entry2 (ITS#4852)
        Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851)
 
 OpenLDAP 2.3.34 Release (2007/02/16)

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index eee5addac23ba18498ba5b94c1f2adaaee8ac838..af8b3c7ec440deaa043f94b1a1573afceb9eb823 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -132,6 +132,11 @@ str2entry2( char *s, int checkvals )
                        break;
                }
                i++;
+               if (i >= lines) {
+                       Debug( LDAP_DEBUG_TRACE,
+                               "<= str2entry ran past end of entry\n", 0, 0, 0 );
+                       goto fail;
+               }
 
                rc = ldif_parse_line2( s, type+i, vals+i, &freev );
                freeval[i] = freev;