[mapserver-commits] r7782 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-07-03 13:51:27 -0400 (Thu, 03 Jul 2008)
New Revision: 7782

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maputil.c
Log:
Fixed seg fault with saveImage() in PHP MapScript due to #2673 (#2677)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-07-03 15:39:05 UTC (rev 7781)
+++ trunk/mapserver/HISTORY.TXT	2008-07-03 17:51:27 UTC (rev 7782)
@@ -13,6 +13,8 @@
 Current Version (SVN Trunk):
 ----------------------------
 
+- Fixed seg fault with saveImage() in PHP MapScript due to #2673 (#2677)
+
 - Fixed configure error related to new fribidi2 pkg-config support (#2664)
 
 - Fixed windows build problem (#2676)

Modified: trunk/mapserver/maputil.c
===================================================================
--- trunk/mapserver/maputil.c	2008-07-03 15:39:05 UTC (rev 7781)
+++ trunk/mapserver/maputil.c	2008-07-03 17:51:27 UTC (rev 7782)
@@ -640,7 +640,8 @@
     char szPath[MS_MAXPATHLEN];
     struct mstimeval starttime, endtime;
 
-    if(map->debug >= MS_DEBUGLEVEL_TUNING) msGettimeofday(&starttime, NULL);
+    if(map && map->debug >= MS_DEBUGLEVEL_TUNING) 
+        msGettimeofday(&starttime, NULL);
 
     if (img)
     {
@@ -717,7 +718,7 @@
                        "msSaveImage()"); 
     }
 
-    if(map->debug >= MS_DEBUGLEVEL_TUNING) {
+    if(map && map->debug >= MS_DEBUGLEVEL_TUNING) {
       msGettimeofday(&endtime, NULL);
       msDebug("msSaveImage() total time: %.3fs\n", 
               (endtime.tv_sec+endtime.tv_usec/1.0e6)-