[mapserver-commits] r10483 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-08-27 04:15:34 +0000 (Fri, 27 Aug 2010)
New Revision: 10483

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/maperror.c
Log:
Fixed ticket #3524.

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-08-27 04:08:04 UTC (rev 10482)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-08-27 04:15:34 UTC (rev 10483)
@@ -20,6 +20,8 @@
 - Fix computation of shape bounds when the first line contains no points
   (#3119)(fixes #3383)
 
+- Fixed error message tiles on zero-sized map cause memory allocation errors in maperror.c. (#3524)
+
 Version 5.6.5 (2010-07-14):
 ---------------------------
 

Modified: branches/branch-5-6/mapserver/maperror.c
===================================================================
--- branches/branch-5-6/mapserver/maperror.c	2010-08-27 04:08:04 UTC (rev 10482)
+++ branches/branch-5-6/mapserver/maperror.c	2010-08-27 04:15:34 UTC (rev 10483)
@@ -396,7 +396,7 @@
   char *pFormatBuffer;
   char cGDFormat[128];
   if (map) {
-      if( map->width != -1 && map->height != -1 )
+      if( map->width > 0 && map->height > 0 )
       {
           width = map->width;
           height = map->height;