[mapserver] 01/02: Add upstream patch to fix CVE-2017-5522 (stack buffer overflow).

[Bas Couwenberg]

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

sebastic pushed a commit to branch wheezy
in repository mapserver.

commit c1961c44cd9c8ee925d88f1ad852524a1ccf6982
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 18 21:47:24 2017 +0100

    Add upstream patch to fix CVE-2017-5522 (stack buffer overflow).
---
 debian/changelog                   |  6 ++++++
 debian/patches/CVE-2017-5522.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f28658f..596634b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapserver (6.0.1-3.2+deb7u4) UNRELEASED; urgency=medium
+
+  * Add upstream patch to fix CVE-2017-5522 (stack buffer overflow).
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2017 21:47:07 +0100
+
 mapserver (6.0.1-3.2+deb7u3) wheezy-security; urgency=high
 
   * Add upstream patch to fix CVE-2016-9839.
diff --git a/debian/patches/CVE-2017-5522.patch b/debian/patches/CVE-2017-5522.patch
new file mode 100644
index 0000000..7626634
--- /dev/null
+++ b/debian/patches/CVE-2017-5522.patch
@@ -0,0 +1,29 @@
+Description: security fix (patch by EvenR)
+ Fixes CVE-2017-5522 (stack buffer overflow)
+Author: Even Rouault <even.rouault at spatialys.com>
+Origin: https://github.com/mapserver/mapserver/commit/cf7a13e62e5c56e4c7f455c1c38037a96dd1019d
+
+--- a/mapogcfilter.c
++++ b/mapogcfilter.c
+@@ -2874,6 +2874,9 @@ char *FLTGetIsLikeComparisonExpression(F
+ 
+     pszValue = psFilterNode->psRightNode->pszValue;
+     nLength = strlen(pszValue);
++
++    if( 1 + 2 * nLength + 1 + 1 >= sizeof(szTmp) )
++        return NULL;
+     
+     iTmp =0;
+     if (nLength > 0 && pszValue[0] != pszWild[0] && 
+--- a/mapogcfiltercommon.c
++++ b/mapogcfiltercommon.c
+@@ -146,6 +146,9 @@ char *FLTGetIsLikeComparisonCommonExpres
+ 
+     pszValue = psFilterNode->psRightNode->pszValue;
+     nLength = strlen(pszValue);
++
++    if( 1 + 2 * nLength + 1 + 1 >= sizeof(szTmp) )
++        return NULL;
+     
+     iTmp =0;
+     if (nLength > 0 && pszValue[0] != pszWild[0] && 
diff --git a/debian/patches/series b/debian/patches/series
index 9a801a0..e0bd16a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ multiarch-libgd
 contenttype
 cve-2013-7262
 0001-Backport-4928-and-5356.patch
+CVE-2017-5522.patch

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