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

Imported Debian patch 7.0.0-9ubuntu3.1

parent 30f33b60
mapserver (7.0.0-9ubuntu3.1) xenial-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:38:33 +0100
......
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
@@ -1158,18 +1158,15 @@ msOGRFileOpen(layerObj *layer, const cha
Index: mapserver-7.0.0/mapogr.cpp
===================================================================
--- mapserver-7.0.0.orig/mapogr.cpp 2017-01-24 09:12:57.751675311 -0500
+++ mapserver-7.0.0/mapogr.cpp 2017-01-24 09:13:13.431845432 -0500
@@ -1158,18 +1158,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;
@@ -1194,10 +1191,13 @@ msOGRFileOpen(layerObj *layer, const cha
@@ -1194,10 +1191,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 );
@@ -1229,9 +1229,11 @@ msOGRFileOpen(layerObj *layer, const cha
@@ -1229,9 +1229,11 @@
}
if (hLayer == NULL) {
......@@ -65,7 +68,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
CPLFree( pszLayerDef );
msConnPoolRelease( layer, hDS );
return NULL;
@@ -1650,7 +1652,14 @@ static int msOGRFileWhichShapes(layerObj
@@ -1650,7 +1652,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;
@@ -1855,8 +1864,8 @@ msOGRFileNextShape(layerObj *layer, shap
@@ -1855,8 +1863,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