[QGIS Commit] r14245 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-09-18 08:59:37 +0000 (Sat, 18 Sep 2010)
New Revision: 14245

Modified:
   trunk/qgis/src/core/qgsvectorfilewriter.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Added two 0 pointer checks

Modified: trunk/qgis/src/core/qgsvectorfilewriter.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorfilewriter.cpp	2010-09-17 12:39:15 UTC (rev 14244)
+++ trunk/qgis/src/core/qgsvectorfilewriter.cpp	2010-09-18 08:59:37 UTC (rev 14245)
@@ -568,7 +568,10 @@
     {
       try
       {
-        fet.geometry()->transform( *ct );
+        if ( fet.geometry() )
+        {
+          fet.geometry()->transform( *ct );
+        }
       }
       catch ( QgsCsException &e )
       {

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2010-09-17 12:39:15 UTC (rev 14244)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2010-09-18 08:59:37 UTC (rev 14245)
@@ -3926,6 +3926,10 @@
   bool needToTrim = false;
 
   QgsGeometry* geom = fet.geometry();
+  if ( !geom )
+  {
+    return;
+  }
   unsigned char* feature = geom->asWkb();
 
   QGis::WkbType wkbType = geom->wkbType();