Added two 0 pointer checks

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14245 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 18, 2010 · 3cdf4dd · 3cdf4dd
1 parent b761df0
commit 3cdf4dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -568,7 +568,10 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
     {
       try
       {
-        fet.geometry()->transform( *ct );
+        if ( fet.geometry() )
+        {
+          fet.geometry()->transform( *ct );
+        }
       }
       catch ( QgsCsException &e )
       {

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3926,6 +3926,10 @@ void QgsVectorLayer::drawFeature( QgsRenderContext &renderContext,
   bool needToTrim = false;
 
   QgsGeometry* geom = fet.geometry();
+  if ( !geom )
+  {
+    return;
+  }
   unsigned char* feature = geom->asWkb();
 
   QGis::WkbType wkbType = geom->wkbType();