fix crash deleting a new column which contains changed values (fix #13366),

brushtyler · brushtyler · commit ce6264065de0 · 2015-09-22T01:36:09.000+02:00
when a column is deleted just rearrange changed attribute map indexes before calling updateLayerFields on the buffer,
otherwise QgsVectorLayerFeatureIterator::updateChangedAttributes will use the changed attribute map with old/wrong indexes
diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp
@@ -323,8 +323,8 @@ void QgsVectorLayerUndoCommandAddAttribute::undo()
   int index = layer()->fields().fieldOriginIndex( mFieldIndex );
 
   mBuffer->mAddedAttributes.removeAt( index );
-  mBuffer->updateLayerFields();
   mBuffer->handleAttributeDeleted( mFieldIndex );
+  mBuffer->updateLayerFields();
 
   emit mBuffer->attributeDeleted( mFieldIndex );
 }
@@ -417,7 +417,7 @@ void QgsVectorLayerUndoCommandDeleteAttribute::redo()
     mBuffer->mAddedAttributes.removeAt( mOriginIndex ); // removing temporary attribute
   }
 
-  mBuffer->updateLayerFields();
   mBuffer->handleAttributeDeleted( mFieldIndex ); // update changed attributes + new features
+  mBuffer->updateLayerFields();
   emit mBuffer->attributeDeleted( mFieldIndex );
 }

Original file line number	Diff line number	Diff line change
`@@ -323,8 +323,8 @@ void QgsVectorLayerUndoCommandAddAttribute::undo()`
`323`	`323`	`int index = layer()->fields().fieldOriginIndex( mFieldIndex );`
`324`	`324`
`325`	`325`	`mBuffer->mAddedAttributes.removeAt( index );`
`326`		`- mBuffer->updateLayerFields();`
`327`	`326`	`mBuffer->handleAttributeDeleted( mFieldIndex );`
	`327`	`+ mBuffer->updateLayerFields();`
`328`	`328`
`329`	`329`	`emit mBuffer->attributeDeleted( mFieldIndex );`
`330`	`330`	`}`
`@@ -417,7 +417,7 @@ void QgsVectorLayerUndoCommandDeleteAttribute::redo()`
`417`	`417`	`mBuffer->mAddedAttributes.removeAt( mOriginIndex ); // removing temporary attribute`
`418`	`418`	`}`
`419`	`419`
`420`		`- mBuffer->updateLayerFields();`
`421`	`420`	`mBuffer->handleAttributeDeleted( mFieldIndex ); // update changed attributes + new features`
	`421`	`+ mBuffer->updateLayerFields();`
`422`	`422`	`emit mBuffer->attributeDeleted( mFieldIndex );`
`423`	`423`	`}`