fix some crash on invalid layers

jef-n · jef-n · commit d9a2b3527fec · 2015-06-29T22:33:28.000+02:00
(cherry picked from commit 34488f8 & 8fbee12)
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -284,7 +284,7 @@ class QgsVectorLayer : QgsMapLayer
     /** Removes a vector layer join */
     void removeJoin( const QString& joinLayerId );
 
-    const QList< QgsVectorJoinInfo >& vectorJoins() const;
+    const QList< QgsVectorJoinInfo > vectorJoins() const;
 
     /**
      * Add a new field which is calculated by the expression specified
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1867,7 +1867,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe
 
   QGis::WkbType wkbType = layer->wkbType();
 
-  if ( layer->providerType() == "ogr" )
+  if ( layer->providerType() == "ogr" && layer->dataProvider() )
   {
     QStringList theURIParts = layer->dataProvider()->dataSourceUri().split( "|" );
     QString srcFileName = theURIParts[0];
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2840,7 +2840,7 @@ int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const
 
 bool QgsVectorLayer::addJoin( const QgsVectorJoinInfo& joinInfo )
 {
-  return mJoinBuffer->addJoin( joinInfo );
+  return mJoinBuffer && mJoinBuffer->addJoin( joinInfo );
 }
 
 void QgsVectorLayer::checkJoinLayerRemove( QString theLayerId )
@@ -2850,12 +2850,16 @@ void QgsVectorLayer::checkJoinLayerRemove( QString theLayerId )
 
 void QgsVectorLayer::removeJoin( const QString& joinLayerId )
 {
-  mJoinBuffer->removeJoin( joinLayerId );
+  if ( mJoinBuffer )
+    mJoinBuffer->removeJoin( joinLayerId );
 }
 
-const QList< QgsVectorJoinInfo >& QgsVectorLayer::vectorJoins() const
+const QList< QgsVectorJoinInfo > QgsVectorLayer::vectorJoins() const
 {
-  return mJoinBuffer->vectorJoins();
+  if ( mJoinBuffer )
+    return mJoinBuffer->vectorJoins();
+  else
+    return QList< QgsVectorJoinInfo >();
 }
 
 void QgsVectorLayer::addExpressionField( const QString& exp, const QgsField& fld )
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -647,7 +647,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Removes a vector layer join */
     void removeJoin( const QString& joinLayerId );
 
-    const QList< QgsVectorJoinInfo >& vectorJoins() const;
+    const QList<QgsVectorJoinInfo> vectorJoins() const;
 
     /**
      * Add a new field which is calculated by the expression specified

Original file line number	Diff line number	Diff line change
`@@ -1867,7 +1867,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe`
`1867`	`1867`
`1868`	`1868`	`QGis::WkbType wkbType = layer->wkbType();`
`1869`	`1869`
`1870`		`- if ( layer->providerType() == "ogr" )`
	`1870`	`+ if ( layer->providerType() == "ogr" && layer->dataProvider() )`
`1871`	`1871`	`{`
`1872`	`1872`	`QStringList theURIParts = layer->dataProvider()->dataSourceUri().split( "\|" );`
`1873`	`1873`	`QString srcFileName = theURIParts[0];`
Original file line number	Diff line number	Diff line change
`@@ -2840,7 +2840,7 @@ int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const`
`2840`	`2840`
`2841`	`2841`	`bool QgsVectorLayer::addJoin( const QgsVectorJoinInfo& joinInfo )`
`2842`	`2842`	`{`
`2843`		`- return mJoinBuffer->addJoin( joinInfo );`
	`2843`	`+ return mJoinBuffer && mJoinBuffer->addJoin( joinInfo );`
`2844`	`2844`	`}`
`2845`	`2845`
`2846`	`2846`	`void QgsVectorLayer::checkJoinLayerRemove( QString theLayerId )`
`@@ -2850,12 +2850,16 @@ void QgsVectorLayer::checkJoinLayerRemove( QString theLayerId )`
`2850`	`2850`
`2851`	`2851`	`void QgsVectorLayer::removeJoin( const QString& joinLayerId )`
`2852`	`2852`	`{`
`2853`		`- mJoinBuffer->removeJoin( joinLayerId );`
	`2853`	`+ if ( mJoinBuffer )`
	`2854`	`+ mJoinBuffer->removeJoin( joinLayerId );`
`2854`	`2855`	`}`
`2855`	`2856`
`2856`		`-const QList< QgsVectorJoinInfo >& QgsVectorLayer::vectorJoins() const`
	`2857`	`+const QList< QgsVectorJoinInfo > QgsVectorLayer::vectorJoins() const`
`2857`	`2858`	`{`
`2858`		`- return mJoinBuffer->vectorJoins();`
	`2859`	`+ if ( mJoinBuffer )`
	`2860`	`+ return mJoinBuffer->vectorJoins();`
	`2861`	`+ else`
	`2862`	`+ return QList< QgsVectorJoinInfo >();`
`2859`	`2863`	`}`
`2860`	`2864`
`2861`	`2865`	`void QgsVectorLayer::addExpressionField( const QString& exp, const QgsField& fld )`