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

jef · jef · commit 030f8ab8b7d9 · 2011-01-28T23:52:58.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15102 c8812cc2-4d05-0410-92ff-de0c093fc19c
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;
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void printRequestInfos()`
`49`	`49`	`#ifdef QGSMSDEBUG`
`50`	`50`	`//print out some infos about the request`
`51`	`51`	`QgsMSDebugMsg( "**********************new request********************" )`
`52`		`- QgsMSDebugMsg( QDateTime::currentDateTime().toString( "yyyy-mm-dd hh:mm:ss" ) );`
	`52`	`+ QgsMSDebugMsg( QDateTime::currentDateTime().toString( "yyyy-MM-dd hh:mm:ss" ) );`
`53`	`53`
`54`	`54`	`if ( getenv( "REMOTE_ADDR" ) != NULL )`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -715,10 +715,13 @@ QImage* QgsWMSServer::createImage( int width, int height ) const`
`715`	`715`	`{`
`716`	`716`	`width = 0; //width parameter is mandatory`
`717`	`717`	`}`
`718`		`- width = wit->second.toInt( &conversionSuccess );`
`719`		`- if ( !conversionSuccess )`
	`718`	`+ else`
`720`	`719`	`{`
`721`		`- width = 0;`
	`720`	`+ width = wit->second.toInt( &conversionSuccess );`
	`721`	`+ if ( !conversionSuccess )`
	`722`	`+ {`
	`723`	`+ width = 0;`
	`724`	`+ }`
`722`	`725`	`}`
`723`	`726`	`}`
`724`	`727`
`@@ -729,10 +732,13 @@ QImage* QgsWMSServer::createImage( int width, int height ) const`
`729`	`732`	`{`
`730`	`733`	`height = 0; //height parameter is mandatory`
`731`	`734`	`}`
`732`		`- height = hit->second.toInt( &conversionSuccess );`
`733`		`- if ( !conversionSuccess )`
	`735`	`+ else`
`734`	`736`	`{`
`735`		`- height = 0;`
	`737`	`+ height = hit->second.toInt( &conversionSuccess );`
	`738`	`+ if ( !conversionSuccess )`
	`739`	`+ {`
	`740`	`+ height = 0;`
	`741`	`+ }`
`736`	`742`	`}`
`737`	`743`	`}`
`738`	`744`