From 4b057bc04a4368470269f726cf11385ff38b21ec Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 24 Jun 2011 13:10:01 -0700 Subject: [PATCH] ITS#6978 bail out on invalid LDIF --- CHANGES | 1 + clients/tools/ldapmodify.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index fa2071ef1b..73a231c05f 100644 --- 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 7cd9774de5..2d11045114 100644 --- 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; -- 2.39.5