mapserver: don't crash when WIDTH or HEIGHT are missing.

git-svn-id: http://svn.osgeo.org/qgis/trunk@15102 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 28, 2011 · 6ab1537 · 6ab1537
1 parent ca0216c
commit 6ab1537
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
@@ -49,7 +49,7 @@ void printRequestInfos()
 #ifdef QGSMSDEBUG
   //print out some infos about the request
   QgsMSDebugMsg( "************************new request**********************" )
-  QgsMSDebugMsg( QDateTime::currentDateTime().toString( "yyyy-mm-dd hh:mm:ss" ) );
+  QgsMSDebugMsg( QDateTime::currentDateTime().toString( "yyyy-MM-dd hh:mm:ss" ) );
 
   if ( getenv( "REMOTE_ADDR" ) != NULL )
   {

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -715,10 +715,13 @@ QImage* QgsWMSServer::createImage( int width, int height ) const
     {
       width = 0; //width parameter is mandatory
     }
-    width = wit->second.toInt( &conversionSuccess );
-    if ( !conversionSuccess )
+    else
     {
-      width = 0;
+      width = wit->second.toInt( &conversionSuccess );
+      if ( !conversionSuccess )
+      {
+        width = 0;
+      }
     }
   }
 
@@ -729,10 +732,13 @@ QImage* QgsWMSServer::createImage( int width, int height ) const
     {
       height = 0; //height parameter is mandatory
     }
-    height = hit->second.toInt( &conversionSuccess );
-    if ( !conversionSuccess )
+    else
     {
-      height = 0;
+      height = hit->second.toInt( &conversionSuccess );
+      if ( !conversionSuccess )
+      {
+        height = 0;
+      }
     }
   }