Merge pull request #8658 from elpaso/bugfix-20783-crash-when-unzippin…

…g-corrupted-zip Do not crash when zipped project is not a valid zip
qgis · Dec 12, 2018 · 969b7894de9a9bb553e5fd49d82b582418025185 · 969b789
2 parents 6de0160 + 9ca85f7
commit 969b7894de9a9bb553e5fd49d82b582418025185
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 src/core/qgsziputils.cpp
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;
   }