stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent closing the PK3 stream before read operation has completed

Browse source
This commit is contained in:
ZZYZX 2019-12-31 13:35:43 +02:00
parent e61937c7b7
commit fa053bc097
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/Core/Data/PK3Reader.cs
View file

@ -40,6 +40,7 @@ namespace CodeImp.DoomBuilder.Data
private /*readonly*/ ArchiveType archivetype; //mxd
private /*readonly*/ Dictionary<string, byte[]> sevenzipentries; //mxd
private bool batchmode = true; //mxd
private bool issevenzip = false;
#endregion
@ -102,7 +103,9 @@ namespace CodeImp.DoomBuilder.Data
sevenzipentries.Add(reader.Entry.Key.ToLowerInvariant(), s.ToArray());
fileentries.Add(new DirectoryFileEntry(reader.Entry.Key));
}
}
issevenzip = true;
}
else
{
foreach (IArchiveEntry entry in archive.Entries)
@ -164,8 +167,11 @@ namespace CodeImp.DoomBuilder.Data
}
else if(!enable && !batchmode && archive != null)
{
archive.Dispose();
archive = null;
lock (archive)
{
archive.Dispose();
archive = null;
}
}
}
@ -511,17 +517,22 @@ namespace CodeImp.DoomBuilder.Data
{
UpdateArchive(true);
foreach(var entry in archive.Entries)
lock (archive)
{
if(entry.IsDirectory) continue;
// Is this the entry we are looking for?
if(string.Compare(entry.Key, fn, true) == 0)
foreach (var entry in archive.Entries)
{
filedata = new MemoryStream();
entry.WriteTo(filedata);
break;
if (entry.IsDirectory) continue;
// Is this the entry we are looking for?
if (string.Compare(entry.Key, fn, true) == 0)
{
filedata = new MemoryStream();
entry.WriteTo(filedata);
break;
}
}
}
UpdateArchive(false);