Check whether layer index is valid in getZpos().

wonder · wonder · commit 4cb0b8abc72d · 2007-03-02T18:51:27.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6744 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -175,8 +175,11 @@ QgsMapRender* QgsMapCanvas::mapRender()
 
 QgsMapLayer* QgsMapCanvas::getZpos(int index)
 {
-  QString layer = mMapRender->layerSet()[index];
-  return QgsMapLayerRegistry::instance()->mapLayer(layer);
+  std::deque<QString>& layers = mMapRender->layerSet();
+  if (index >= 0 && index < (int) layers.size())
+    return QgsMapLayerRegistry::instance()->mapLayer(layers[index]);
+  else
+    return NULL;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,11 @@ QgsMapRender* QgsMapCanvas::mapRender()`
`175`	`175`
`176`	`176`	`QgsMapLayer* QgsMapCanvas::getZpos(int index)`
`177`	`177`	`{`
`178`		`- QString layer = mMapRender->layerSet()[index];`
`179`		`- return QgsMapLayerRegistry::instance()->mapLayer(layer);`
	`178`	`+ std::deque<QString>& layers = mMapRender->layerSet();`
	`179`	`+ if (index >= 0 && index < (int) layers.size())`
	`180`	`+ return QgsMapLayerRegistry::instance()->mapLayer(layers[index]);`
	`181`	`+ else`
	`182`	`+ return NULL;`
`180`	`183`	`}`
`181`	`184`
`182`	`185`