ITS#6978 bail out on invalid LDIF

diff --git a/CHANGES b/CHANGES
index fa2071ef1b727554673b186fdcc5334b4166bb2e..73a231c05fd5b6984413cefa2fadfa46ed8f0184 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.4.26 Engineering
        Fixed libldap ASYNC TLS setup (ITS#6828)
        Fixed libldap with missing \n terminations (ITS#6947)
        Fixed tools double free (ITS#6946)
+       Fixed ldapmodify SEGV on invalid LDIF (ITS#6978)
        Added slapd extra_attrs database option (ITS#6513)
        Fixed slapd asserts (ITS#6932)
        Fixed slapd configfile param on windows (ITS#6933)

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 7cd9774de59ebb7a13528fb3a781f4060b681aa9..2d11045114f3b1d48eccec3a526d354588a32ded 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -449,7 +449,7 @@ process_ldif_rec( char *rbuf, int linenum )
                        fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
                                prog, linenum+i, dn == NULL ? "" : dn );
                        rc = LDAP_PARAM_ERROR;
-                       break;
+                       goto leave;
                }
                freeval[i] = freev;