[freexl] 02/03: Add patch to fix regression introduced by afl-vulnerabilitities.patch.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch ubuntu/vivid
in repository freexl.

commit 15dc50710a3ed7d7667ade8f0f91da1fd0cbee30
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Nov 12 22:05:46 2015 +0100

    Add patch to fix regression introduced by afl-vulnerabilitities.patch.
---
 debian/changelog                                      |  6 ++++++
 debian/patches/afl-vulnerabilitities-regression.patch | 18 ++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1771656..d0d5dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freexl (1.0.0h-1~exp1ubuntu2) UNRELEASED; urgency=medium
+
+  * Add patch to fix regression introduced by afl-vulnerabilitities.patch.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Nov 2015 22:04:49 +0100
+
 freexl (1.0.0h-1~exp1ubuntu1) vivid; urgency=high
 
   * SECURITY UPDATE: Fix multiple vulnerabilities (LP: #1437087):
diff --git a/debian/patches/afl-vulnerabilitities-regression.patch b/debian/patches/afl-vulnerabilitities-regression.patch
new file mode 100644
index 0000000..86156fa
--- /dev/null
+++ b/debian/patches/afl-vulnerabilitities-regression.patch
@@ -0,0 +1,18 @@
+Description: Fix regression introduced by afl-vulnerabilitities.patch.
+ Initially reported as a bug in GDAL and traced to FreeXL, see:
+ https://trac.osgeo.org/gdal/ticket/6200
+Origin: https://www.gaia-gis.it/fossil/freexl/fdiff?v1=61618ce51a9b0c15&v2=4f9408c216ead322&sbs=1
+Author: Alessandro Furieri <a.furieri at lqt.it>
+Bug-Debian: https://bugs.debian.org/781228
+
+--- a/src/freexl.c
++++ b/src/freexl.c
+@@ -3759,7 +3759,7 @@ read_biff_next_record (biff_workbook * w
+ 	  unsigned int already_done;
+ 	  unsigned int chunk =
+ 	      workbook->sector_end - (workbook->p_in - workbook->sector_buf);
+-          if (workbook->sector_end <= (workbook->p_in - workbook->sector_buf))
++          if (workbook->sector_end < (workbook->p_in - workbook->sector_buf))
+               return -1;
+ 	  memcpy (workbook->record, workbook->p_in, chunk);
+ 	  workbook->p_in += chunk;
diff --git a/debian/patches/series b/debian/patches/series
index 079be2f..b6ce158 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 afl-vulnerabilitities.patch
+afl-vulnerabilitities-regression.patch

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