Fix #11092:

jef-n · jef-n · commit acf1f70f137f · 2014-08-30T09:03:05.000+02:00
* fix crash when invalid shapefile layer is repacked
* error out if vector file writer is invoke with an empty filename
* don't allow "Save as..." without a given filename
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -47,6 +47,7 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, const QgsRec
   }
 
   mSelectedOnly->setEnabled( layerHasSelectedFeatures );
+  buttonBox->button( QDialogButtonBox::Ok )->setDisabled( true );
 }
 
 void QgsVectorLayerSaveAsDialog::setup()
@@ -284,6 +285,11 @@ void QgsVectorLayerSaveAsDialog::on_mFormatComboBox_currentIndexChanged( int idx
   }
 }
 
+void QgsVectorLayerSaveAsDialog::on_leFilename_textChanged( const QString& text )
+{
+  buttonBox->button( QDialogButtonBox::Ok )->setEnabled( QFileInfo( text ).absoluteDir().exists() );
+}
+
 void QgsVectorLayerSaveAsDialog::on_browseFilename_clicked()
 {
   QSettings settings;
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.h b/src/app/ogr/qgsvectorlayersaveasdialog.h
@@ -67,6 +67,7 @@ class QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSav
 
   private slots:
     void on_mFormatComboBox_currentIndexChanged( int idx );
+    void on_leFilename_textChanged( const QString& text );
     void on_mCRSSelection_currentIndexChanged( int idx );
     void on_browseFilename_clicked();
     void on_browseCRS_clicked();
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -77,6 +77,13 @@ QgsVectorFileWriter::QgsVectorFileWriter(
   QStringList layOptions = layerOptions;
   QStringList dsOptions = datasourceOptions;
 
+  if ( theVectorFileName.isEmpty() )
+  {
+    mErrorMessage = QObject::tr( "Empty filename given" );
+    mError = ErrCreateDataSource;
+    return;
+  }
+
   QString ogrDriverName;
   if ( driverName == "MapInfo MIF" )
   {
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -126,7 +126,7 @@ bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
 
 void QgsOgrProvider::repack()
 {
-  if ( ogrDriverName != "ESRI Shapefile" )
+  if ( ogrDriverName != "ESRI Shapefile" || ogrOrigLayer == 0 )
     return;
 
   QByteArray layerName = OGR_FD_GetName( OGR_L_GetLayerDefn( ogrOrigLayer ) );

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, const QgsRec`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`mSelectedOnly->setEnabled( layerHasSelectedFeatures );`
	`50`	`+ buttonBox->button( QDialogButtonBox::Ok )->setDisabled( true );`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`void QgsVectorLayerSaveAsDialog::setup()`
`@@ -284,6 +285,11 @@ void QgsVectorLayerSaveAsDialog::on_mFormatComboBox_currentIndexChanged( int idx`
`284`	`285`	`}`
`285`	`286`	`}`
`286`	`287`
	`288`	`+void QgsVectorLayerSaveAsDialog::on_leFilename_textChanged( const QString& text )`
	`289`	`+{`
	`290`	`+ buttonBox->button( QDialogButtonBox::Ok )->setEnabled( QFileInfo( text ).absoluteDir().exists() );`
	`291`	`+}`
	`292`	`+`
`287`	`293`	`void QgsVectorLayerSaveAsDialog::on_browseFilename_clicked()`
`288`	`294`	`{`
`289`	`295`	`QSettings settings;`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )`
`126`	`126`
`127`	`127`	`void QgsOgrProvider::repack()`
`128`	`128`	`{`
`129`		`- if ( ogrDriverName != "ESRI Shapefile" )`
	`129`	`+ if ( ogrDriverName != "ESRI Shapefile" \|\| ogrOrigLayer == 0 )`
`130`	`130`	`return;`
`131`	`131`
`132`	`132`	`QByteArray layerName = OGR_FD_GetName( OGR_L_GetLayerDefn( ogrOrigLayer ) );`