Merge pull request #8393 from Mailaender/zipfile-nre

Fixed a dereference null return value in ZipFile.GetContent
This commit is contained in:
Oliver Brakmann
2015-06-10 21:47:30 +02:00

View File

@@ -58,7 +58,11 @@ namespace OpenRA.FileSystem
public Stream GetContent(string filename)
{
using (var z = pkg.GetInputStream(pkg.GetEntry(filename)))
var entry = pkg.GetEntry(filename);
if (entry == null)
return null;
using (var z = pkg.GetInputStream(entry))
{
var ms = new MemoryStream();
z.CopyTo(ms);