SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-04-26 16:20:39 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Increase extraction safety

Browse Source
This commit is contained in:
Matt Nadareski
2024-12-03 03:43:39 -05:00
parent 6b7ad781b7
commit c70b5f6ec8
7 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BinaryObjectScanner/FileType/CFB.cs
View File

@@ -30,6 +30,9 @@ namespace BinaryObjectScanner.FileType
// Not supported for .NET Framework 2.0 or .NET Framework 3.5 due to library support
return false;
#else
if (stream == null || !stream.CanRead)
return false;
try
{
using var msi = new CompoundFile(stream, CFSUpdateMode.ReadOnly, CFSConfiguration.Default);

9
BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
View File

@@ -25,6 +25,9 @@ namespace BinaryObjectScanner.FileType
{
try
{
if (!File.Exists(file))
return false;
var archive = new ISv3(file);
foreach (var cfile in archive.Files)
{
@@ -39,10 +42,8 @@ namespace BinaryObjectScanner.FileType
if (fileContents == null || !string.IsNullOrEmpty(error))
continue;
using (FileStream fs = File.OpenWrite(tempFile))
{
fs.Write(fileContents, 0, fileContents.Length);
}
using FileStream fs = File.OpenWrite(tempFile);
fs.Write(fileContents, 0, fileContents.Length);
}
catch (Exception ex)
{

3
BinaryObjectScanner/FileType/InstallShieldCAB.cs
View File

@@ -54,6 +54,9 @@ namespace BinaryObjectScanner.FileType
try
{
if (!File.Exists(file))
return false;
var cabfile = InstallShieldCabinet.Open(file);
if (cabfile?.HeaderList == null)
return false;

3
BinaryObjectScanner/FileType/MPQ.cs
View File

@@ -32,6 +32,9 @@ namespace BinaryObjectScanner.FileType
#else
try
{
if (!File.Exists(file))
return false;
// Try to open the archive and listfile
var mpqArchive = new MpqArchive(file, FileAccess.Read);
string? listfile = null;

3
BinaryObjectScanner/FileType/MicrosoftCAB.cs
View File

@@ -33,6 +33,9 @@ namespace BinaryObjectScanner.FileType
#else
try
{
if (!File.Exists(file))
return false;
// Loop over each entry
var cabArchive = new MSCabinet(file);
foreach (var compressedFile in cabArchive.GetFiles())

3
BinaryObjectScanner/FileType/MicrosoftLZ.cs
View File

@@ -24,6 +24,9 @@ namespace BinaryObjectScanner.FileType
/// <inheritdoc/>
public bool Extract(Stream? stream, string file, string outDir, bool includeDebug)
{
if (stream == null || !stream.CanRead)
return false;
try
{
var data = Decompressor.Decompress(stream);

3
BinaryObjectScanner/FileType/XZ.cs
View File

@@ -26,6 +26,9 @@ namespace BinaryObjectScanner.FileType
public bool Extract(Stream? stream, string file, string outDir, bool includeDebug)
{
#if NET462_OR_GREATER || NETCOREAPP
if (stream == null || !stream.CanRead)
return false;
try
{
// Try opening the stream