Addressed issues identified in issue #6463. (#6466)

Addressed issues identified in issue #6463. Mostly expanding allowed values to account for documentation and adding line numbers to error messages to make debugging easier.
MapServer · Feb 1, 2022 · 4d82b30 · 4d82b30
1 parent 4ba9fc0
commit 4d82b30
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 57 deletions.
diff --git a/mapdraw.c b/mapdraw.c
@@ -282,8 +282,8 @@ imageObj *msDrawMap(mapObj *map, int querymap)
   if(map->debug >= MS_DEBUGLEVEL_TUNING) msGettimeofday(&mapstarttime, NULL);
 
   if(querymap) { /* use queryMapObj image dimensions */
-    if(map->querymap.width != -1) map->width = map->querymap.width;
-    if(map->querymap.height != -1) map->height = map->querymap.height;
+    if(map->querymap.width > 0 && map->querymap.width <= map->maxsize) map->width = map->querymap.width;
+    if(map->querymap.height > 0 && map->querymap.height <= map->maxsize) map->height = map->querymap.height;
   }
 
   msApplyMapConfigOptions(map);