Merge pull request #1460 from rouault/fix_crash_in_QgsVectorFileWriter_addFeature

wonder-sk · wonder-sk · commit 60a19892610a · 2014-06-19T10:34:15.000+07:00
Fix crash in QgsVectorFileWriter::addFeature()
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1548,6 +1548,8 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*
 {
   // create the feature
   OGRFeatureH poFeature = createFeature( feature );
+  if( !poFeature )
+      return false;
 
   //add OGR feature style type
   if ( mSymbologyExport != NoSymbology && renderer )

Original file line number	Diff line number	Diff line change
`@@ -1548,6 +1548,8 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2*`
`1548`	`1548`	`{`
`1549`	`1549`	`// create the feature`
`1550`	`1550`	`OGRFeatureH poFeature = createFeature( feature );`
	`1551`	`+ if( !poFeature )`
	`1552`	`+ return false;`
`1551`	`1553`
`1552`	`1554`	`//add OGR feature style type`
`1553`	`1555`	`if ( mSymbologyExport != NoSymbology && renderer )`