claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make GetFileStream safer until fixed

Browse Source
This commit is contained in:
Matt Nadareski
2024-07-15 21:44:05 -04:00
parent 0e97b2025a
commit 5dc6b658d2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SabreTools.DatTools/Rebuilder.cs
View File

@@ -743,13 +743,22 @@ namespace SabreTools.DatTools
if (isZip != null) if (isZip != null)
{ {
BaseArchive? archive = BaseArchive.Create(file); BaseArchive? archive = BaseArchive.Create(file);
if (archive != null) if (archive == null)
return false;
try
{ {
// TODO: Write entry to a temporary file to avoid over-large in-memory streams // TODO: Write entry to a temporary file to avoid over-large in-memory streams
// TODO: Once entry is written, replace GetEntryStream implementations // TODO: Once entry is written, replace GetEntryStream implementations
ItemType itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>(); ItemType itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>();
(stream, _) = archive.GetEntryStream(datItem.GetName() ?? itemType.AsStringValue() ?? string.Empty); (stream, _) = archive.GetEntryStream(datItem.GetName() ?? itemType.AsStringValue() ?? string.Empty);
} }
catch
{
// Ignore the exception for now -- usually an over-large file
stream = null;
return false;
}
} }
// Otherwise, just open the filestream // Otherwise, just open the filestream
else else