fix filewriter crash

git-svn-id: http://svn.osgeo.org/qgis/trunk@14492 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 2, 2010 · 2d8120f · 2d8120f
1 parent 1828dd7
commit 2d8120f
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -435,6 +435,16 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
 
     OGRGeometryH mGeom2 = createEmptyGeometry( geom->wkbType() );
 
+    if ( !mGeom2 )
+    {
+      QgsDebugMsg( QString( "Failed to create empty geometry for type %1 (OGR error: %2)" ).arg( geom->wkbType() ).arg( CPLGetLastErrorMsg() ) );
+      mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )
+                      .arg( QString::fromUtf8( CPLGetLastErrorMsg() ) );
+      mError = ErrFeatureWriteFailed;
+      OGR_F_Destroy( poFeature );
+      return false;
+    }
+
     OGRErr err = OGR_G_ImportFromWkb( mGeom2, geom->asWkb(), geom->wkbSize() );
     if ( err != OGRERR_NONE )
     {