Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -103,9 +103,9 @@ namespace System.IO.Compression
throw new ArgumentException("Stream must support reading, writing and seeking for Update archive mode");
try {
zipFile = mode == ZipArchiveMode.Create ?
SharpCompress.Archive.Zip.ZipArchive.Create() :
SharpCompress.Archive.Zip.ZipArchive.Open(stream);
zipFile = mode != ZipArchiveMode.Create && stream.Length != 0
? SharpCompress.Archive.Zip.ZipArchive.Open(stream)
: SharpCompress.Archive.Zip.ZipArchive.Create();
} catch (Exception e) {
throw new InvalidDataException("The contents of the stream are not in the zip archive format.", e);
}