Merge pull request #8658 from elpaso/bugfix-20783-crash-when-unzipping-corrupted-zip

elpaso · web-flow · commit 969b7894de9a · 2018-12-12T15:28:37.000+01:00
Do not crash when zipped project is not a valid zip
diff --git a/src/core/qgsziputils.cpp b/src/core/qgsziputils.cpp
@@ -110,7 +110,7 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
   }
   else
   {
-    QString err = QObject::tr( "Error opening zip archive: '%1'" ).arg( zip_strerror( z ) );
+    QString err = QObject::tr( "Error opening zip archive: '%1'" ).arg( z ? zip_strerror( z ) : zipFilename );
     QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString`
`110`	`110`	`}`
`111`	`111`	`else`
`112`	`112`	`{`
`113`		`- QString err = QObject::tr( "Error opening zip archive: '%1'" ).arg( zip_strerror( z ) );`
	`113`	`+ QString err = QObject::tr( "Error opening zip archive: '%1'" ).arg( z ? zip_strerror( z ) : zipFilename );`
`114`	`114`	`QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );`
`115`	`115`	`return false;`
`116`	`116`	`}`