fix invalid list index in identify results causing wrong result or segfault accessing actions from context menu

brushtyler · brushtyler · commit ffa2cfdf2b81 · 2011-12-31T17:33:29.000+01:00
diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
@@ -460,6 +460,8 @@ void QgsIdentifyResults::contextMenuEvent( QContextMenuEvent* event )
   {
     mActionPopup->addSeparator();
 
+    int featIdx = featItem->data( 0, Qt::UserRole + 1 ).toInt();
+
     // The assumption is made that an instance of QgsIdentifyResults is
     // created for each new Identify Results dialog box, and that the
     // contents of the popup menu doesn't change during the time that
@@ -471,7 +473,7 @@ void QgsIdentifyResults::contextMenuEvent( QContextMenuEvent* event )
       if ( !action.runable() )
         continue;
 
-      QgsFeatureAction *a = new QgsFeatureAction( action.name(), mFeatures[ idx ], vlayer, i, idx, this );
+      QgsFeatureAction *a = new QgsFeatureAction( action.name(), mFeatures[ featIdx ], vlayer, i, idx, this );
       mActionPopup->addAction( QgisApp::getThemeIcon( "/mAction.png" ), action.name(), a, SLOT( execute() ) );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,8 @@ void QgsIdentifyResults::contextMenuEvent( QContextMenuEvent* event )`
`460`	`460`	`{`
`461`	`461`	`mActionPopup->addSeparator();`
`462`	`462`
	`463`	`+ int featIdx = featItem->data( 0, Qt::UserRole + 1 ).toInt();`
	`464`	`+`
`463`	`465`	`// The assumption is made that an instance of QgsIdentifyResults is`
`464`	`466`	`// created for each new Identify Results dialog box, and that the`
`465`	`467`	`// contents of the popup menu doesn't change during the time that`
`@@ -471,7 +473,7 @@ void QgsIdentifyResults::contextMenuEvent( QContextMenuEvent* event )`
`471`	`473`	`if ( !action.runable() )`
`472`	`474`	`continue;`
`473`	`475`
`474`		`- QgsFeatureAction *a = new QgsFeatureAction( action.name(), mFeatures[ idx ], vlayer, i, idx, this );`
	`476`	`+ QgsFeatureAction *a = new QgsFeatureAction( action.name(), mFeatures[ featIdx ], vlayer, i, idx, this );`
`475`	`477`	`mActionPopup->addAction( QgisApp::getThemeIcon( "/mAction.png" ), action.name(), a, SLOT( execute() ) );`
`476`	`478`	`}`
`477`	`479`	`}`