From b49c6e96fd37dd008402f9c2105d7ba4cf6d80c9 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 20 Nov 2024 21:48:37 -0500 Subject: [PATCH] Add guards around previous commit --- ExtractionTool/Program.cs | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/ExtractionTool/Program.cs b/ExtractionTool/Program.cs index 4f1cc272..5fa462d3 100644 --- a/ExtractionTool/Program.cs +++ b/ExtractionTool/Program.cs @@ -182,31 +182,38 @@ namespace ExtractionTool // 7-zip SFX var szsfx = new SevenZipSFX(); - szsfx.Extract(file, pex, outputDirectory, includeDebug); + if (szsfx.CheckExecutable(file, pex, includeDebug) != null) + szsfx.Extract(file, pex, outputDirectory, includeDebug); // CExe var ce = new CExe(); - ce.Extract(file, pex, outputDirectory, includeDebug); + if (ce.CheckExecutable(file, pex, includeDebug) != null) + ce.Extract(file, pex, outputDirectory, includeDebug); // Embedded archives var ea = new EmbeddedArchive(); - ea.Extract(file, pex, outputDirectory, includeDebug); + if (ea.CheckExecutable(file, pex, includeDebug) != null) + ea.Extract(file, pex, outputDirectory, includeDebug); // Embedded executables var ee = new EmbeddedExecutable(); - ee.Extract(file, pex, outputDirectory, includeDebug); + if (ee.CheckExecutable(file, pex, includeDebug) != null) + ee.Extract(file, pex, outputDirectory, includeDebug); // WinRAR SFX var wrsfx = new WinRARSFX(); - wrsfx.Extract(file, pex, outputDirectory, includeDebug); + if (wrsfx.CheckExecutable(file, pex, includeDebug) != null) + wrsfx.Extract(file, pex, outputDirectory, includeDebug); // WinZip SFX var wzsfx = new WinZipSFX(); - wzsfx.Extract(file, pex, outputDirectory, includeDebug); + if (wzsfx.CheckExecutable(file, pex, includeDebug) != null) + wzsfx.Extract(file, pex, outputDirectory, includeDebug); // Wise Installer var wi = new WiseInstaller(); - wi.Extract(file, pex, outputDirectory, includeDebug); + if (wi.CheckExecutable(file, pex, includeDebug) != null) + wi.Extract(file, pex, outputDirectory, includeDebug); } // GCF