From c8353f7acdec4a42f537b0d475aaae005ba72363 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 15 Dec 2014 14:36:55 +0000 Subject: [PATCH] ITS#8003 fix off-by-one in LDIF length must account for leading space when counting total number of lines --- include/ldif.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ldif.h b/include/ldif.h index f638ef9bb4..69bb0c9b91 100644 --- a/include/ldif.h +++ b/include/ldif.h @@ -52,12 +52,12 @@ LDAP_LDIF_V (int) ldif_debug; */ #define LDIF_SIZE_NEEDED(nlen,vlen) \ ((nlen) + 4 + LDIF_BASE64_LEN(vlen) \ - + ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / LDIF_LINE_WIDTH * 2 )) + + ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / (LDIF_LINE_WIDTH-1) * 2 )) #define LDIF_SIZE_NEEDED_WRAP(nlen,vlen,wrap) \ ((nlen) + 4 + LDIF_BASE64_LEN(vlen) \ - + ((wrap) == 0 ? ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / ( LDIF_LINE_WIDTH ) * 2 ) : \ - ((wrap) == LDIF_LINE_WIDTH_MAX ? 0 : ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / (wrap) * 2 )))) + + ((wrap) == 0 ? ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / ( LDIF_LINE_WIDTH-1 ) * 2 ) : \ + ((wrap) == LDIF_LINE_WIDTH_MAX ? 0 : ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / (wrap-1) * 2 )))) LDAP_LDIF_F( int ) ldif_parse_line LDAP_P(( -- 2.39.5