OGR provider: don't segfault when the layer cannot be retrieved (e.g. datasource with 0 layer)

rouault · timlinux · commit d0cf9dfeda1a · 2011-11-21T09:24:49.000+02:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -188,7 +188,14 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
     }
 
     ogrLayer = ogrOrigLayer;
-    setSubsetString( mSubsetString );
+    if (ogrLayer != NULL )
+    {
+      setSubsetString( mSubsetString );
+    }
+    else
+    {
+      valid = false;
+    }
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,14 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`ogrLayer = ogrOrigLayer;`
`191`		`- setSubsetString( mSubsetString );`
	`191`	`+ if (ogrLayer != NULL )`
	`192`	`+ {`
	`193`	`+ setSubsetString( mSubsetString );`
	`194`	`+ }`
	`195`	`+ else`
	`196`	`+ {`
	`197`	`+ valid = false;`
	`198`	`+ }`
`192`	`199`	`}`
`193`	`200`	`else`
`194`	`201`	`{`