Merge pull request #64 from rouault/master

OGR provider: don't segfault when the layer cannot be retrieved (e.g. datasource with 0 layer)
qgis · Nov 21, 2011 · c828683 · c828683
2 parents 555e028 + 7f1ca27
commit c828683
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -294,7 +294,14 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
     }
 
     ogrLayer = ogrOrigLayer;
-    setSubsetString( mSubsetString );
+    if (ogrLayer != NULL )
+    {
+      setSubsetString( mSubsetString );
+    }
+    else
+    {
+      valid = false;
+    }
   }
   else
   {