[Pkg-openldap-devel] [openldap] 01/01: ITS#8003/#806909

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch jessie
in repository openldap.

commit 2a90a889219c966cc297b72c5d772a367669efee
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Dec 13 08:41:27 2015 -0800

    ITS#8003/#806909
---
 debian/changelog                                   |  8 ++++++
 .../ITS8003-fix-off-by-one-in-LDIF-length.patch    | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eb2fcca..e2a0fbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openldap (2.4.40+dfsg-1+deb8u2) UNRELEASED; urgency=medium
+
+  * debian/patches/ITS8003-fix-off-by-one-in-LDIF-length.patch: Import
+    upstream patch to fix a crash when adding a large attribute value with the
+    auditlog overlay enabled. (Closes: #806909)
+
+ -- Ryan Tandy <ryan at nardis.ca>  Sat, 12 Dec 2015 16:11:38 -0800
+
 openldap (2.4.40+dfsg-1+deb8u1) jessie-security; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff --git a/debian/patches/ITS8003-fix-off-by-one-in-LDIF-length.patch b/debian/patches/ITS8003-fix-off-by-one-in-LDIF-length.patch
new file mode 100644
index 0000000..2e1d76f
--- /dev/null
+++ b/debian/patches/ITS8003-fix-off-by-one-in-LDIF-length.patch
@@ -0,0 +1,33 @@
+From c8353f7acdec4a42f537b0d475aaae005ba72363 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc at openldap.org>
+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 f638ef9..69bb0c9 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.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 65ae4bd..ac7d74a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ ITS8027-deref-reject-empty-attr-list.patch
 ITS8046-fix-vrFilter_free-crash.patch
 ITS7975-fix-mdb-onelevel-search.patch
 ITS8240-remove-obsolete-assert.patch
+ITS8003-fix-off-by-one-in-LDIF-length.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git