WMS 1.3.0 compliance: throw exception if feature info point is not wi…

…thin the WIDTH/HEIGHT parameters
qgis · Dec 13, 2016 · 6eba1ce · 6eba1ce
1 parent 34969b5
commit 6eba1ce
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2154,6 +2154,12 @@ bool QgsWMSServer::infoPointToMapCoordinates( int i, int j, QgsPoint* infoPoint,
     return false;
   }
 
+  //check if i, j are in the pixel range of the image
+  if ( i < 0 || i > mapRenderer->width() || j < 0 || j > mapRenderer->height() )
+  {
+    throw QgsMapServiceException( "InvalidPoint", "I/J parameters not within the pixel range" );
+  }
+
   double xRes = mapRenderer->extent().width() / mapRenderer->width();
   double yRes = mapRenderer->extent().height() / mapRenderer->height();
   infoPoint->setX( mapRenderer->extent().xMinimum() + i * xRes + xRes / 2.0 );