Fix #5387 (potential remote DOS when using fastcgi)

This commit is contained in:
landry 2017-02-14 09:46:56 +00:00
parent 87d90723b8
commit eb8a52f4c0
2 changed files with 24 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2017/02/07 08:17:57 landry Exp $
# $OpenBSD: Makefile,v 1.44 2017/02/14 09:46:56 landry Exp $
MULTI_PACKAGES= -utils -main -php -perl
@ -14,6 +14,7 @@ PKGNAME-utils= mapserver-utils-${V}
PKGNAME-php= php-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
SHARED_LIBS += mapserver 2.0
REVISION-main = 0
CATEGORIES= geo www

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-mapwms_c,v 1.3 2017/02/14 09:46:56 landry Exp $
https://github.com/mapserver/mapserver/issues/5387
--- mapwms.c.orig Mon Jan 16 17:02:20 2017
+++ mapwms.c Wed Feb 8 15:20:26 2017
@@ -791,7 +791,6 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
const char *wms_request, owsRequestObj *ows_request)
{
int i, adjust_extent = MS_FALSE, nonsquare_enabled = MS_FALSE;
- int nLayerOrder = 0;
int transparent = MS_NOOVERRIDE;
int bbox_pixel_is_point = MS_FALSE;
outputFormatObj *format = NULL;
@@ -870,6 +869,7 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
if (strcasecmp(names[i], "LAYERS") == 0) {
int j, k, iLayer, *layerOrder;
+ int nLayerOrder = 0;
char ***nestedGroups = NULL;
int *numNestedGroups = NULL;
int *isUsedInNestedGroup = NULL;