reject empty field names in QgsVectorLayer::addAttribute

jef-n · jef-n · commit e87ff24009f2 · 2012-02-01T09:28:32.000+01:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -979,8 +979,8 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
 
     select( attributes, rendererContext.extent() );
 
-    if ( ( mRendererV2->capabilities() & QgsFeatureRendererV2::SymbolLevels )
-         && mRendererV2->usingSymbolLevels() )
+    if (( mRendererV2->capabilities() & QgsFeatureRendererV2::SymbolLevels )
+        && mRendererV2->usingSymbolLevels() )
       drawRendererV2Levels( rendererContext, labeling );
     else
       drawRendererV2( rendererContext, labeling );
@@ -3426,6 +3426,9 @@ bool QgsVectorLayer::addAttribute( const QgsField &field )
   if ( !isEditable() )
     return false;
 
+  if ( field.name().isEmpty() )
+    return false;
+
   for ( QgsFieldMap::const_iterator it = mUpdatedFields.begin(); it != mUpdatedFields.end(); it++ )
   {
     if ( it.value().name() == field.name() )
