Commit bfb2699c authored by Bas Couwenberg's avatar Bas Couwenberg Committed by Bas Couwenberg

Imported Debian patch 7.0.1-3ubuntu0.1

parent 9685fee6
mapserver (7.0.1-3ubuntu0.1) yakkety-security; urgency=medium
* Add upstream patches to fix CVE-2016-9839 & CVE-2017-5522.
(LP: 1648998)
(LP: #1648998)
-- Bas Couwenberg <sebastic@debian.org> Wed, 18 Jan 2017 23:41:26 +0100
......
Source: mapserver
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
Alan Boudreault <aboudreault@mapgears.com>,
Bas Couwenberg <sebastic@debian.org>
......
Description: Backport #4928 and #5356
Author: Thomas Bonfort <thomas.bonfort@gmail.com>
Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb797a6980210bc54
Last-Update: 2017-01-24
--- a/mapogr.cpp
+++ b/mapogr.cpp
@@ -1166,18 +1166,15 @@ msOGRFileOpen(layerObj *layer, const cha
Index: mapserver-7.0.1/mapogr.cpp
===================================================================
--- mapserver-7.0.1.orig/mapogr.cpp 2017-01-24 09:11:10.138507761 -0500
+++ mapserver-7.0.1/mapogr.cpp 2017-01-24 09:11:29.750720544 -0500
@@ -1166,18 +1166,15 @@
RELEASE_OGR_LOCK;
if( hDS == NULL ) {
......@@ -32,7 +35,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
CPLFree( pszDSName );
CPLFree( pszLayerDef );
return NULL;
@@ -1202,10 +1199,13 @@ msOGRFileOpen(layerObj *layer, const cha
@@ -1202,10 +1199,13 @@
ACQUIRE_OGR_LOCK;
hLayer = OGR_DS_ExecuteSQL( hDS, pszLayerDef, NULL, NULL );
if( hLayer == NULL ) {
......@@ -50,7 +53,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
RELEASE_OGR_LOCK;
msConnPoolRelease( layer, hDS );
CPLFree( pszLayerDef );
@@ -1237,9 +1237,11 @@ msOGRFileOpen(layerObj *layer, const cha
@@ -1237,9 +1237,11 @@
}
if (hLayer == NULL) {
......@@ -65,7 +68,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
CPLFree( pszLayerDef );
msConnPoolRelease( layer, hDS );
return NULL;
@@ -1662,7 +1664,14 @@ static int msOGRFileWhichShapes(layerObj
@@ -1662,7 +1664,13 @@
CPLErrorReset();
if( OGR_L_SetAttributeFilter( psInfo->hLayer, pszOGRFilter ) != OGRERR_NONE ) {
......@@ -73,7 +76,6 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
+ msSetError(MS_OGRERR,
+ "SetAttributeFilter(%s) failed on layer %s.",
+ "msOGRFileWhichShapes()",
+ layer->filter.string+6,
+ layer->filter.string+6, layer->name?layer->name:"(null)");
+ msDebug("SetAttributeFilter(%s) failed on layer %s.\n%s",
+ layer->filter.string+6, layer->name?layer->name:"(null)",
......@@ -81,7 +83,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
RELEASE_OGR_LOCK;
msFree(pszOGRFilter);
return MS_FAILURE;
@@ -1875,8 +1884,8 @@ msOGRFileNextShape(layerObj *layer, shap
@@ -1875,8 +1883,8 @@
if( (hFeature = OGR_L_GetNextFeature( psInfo->hLayer )) == NULL ) {
psInfo->last_record_index_read = -1;
if( CPLGetLastErrorType() == CE_Failure ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment