Handle some warnings and messages

SabreTools · Apr 24, 2024 · 90223e6 · 90223e6
1 parent 2f2cf76
commit 90223e6
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 14 deletions.
diff --git a/BinaryObjectScanner/FileType/GZIP.cs b/BinaryObjectScanner/FileType/GZIP.cs
@@ -42,10 +42,14 @@ public class GZIP : IExtractable
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             entry.WriteToFile(tempFile);
                         }

diff --git a/BinaryObjectScanner/FileType/PKZIP.cs b/BinaryObjectScanner/FileType/PKZIP.cs
@@ -42,11 +42,15 @@ public class PKZIP : IExtractable
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
-                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If the entry is partial due to an incomplete multi-part archive, skip it
                             if (!entry.IsComplete)
                                 continue;
 

diff --git a/BinaryObjectScanner/FileType/RAR.cs b/BinaryObjectScanner/FileType/RAR.cs
@@ -42,10 +42,14 @@ public class RAR : IExtractable
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             entry.WriteToFile(tempFile);
                         }

diff --git a/BinaryObjectScanner/FileType/SevenZip.cs b/BinaryObjectScanner/FileType/SevenZip.cs
@@ -26,6 +26,9 @@ public class SevenZip : IExtractable
         /// <inheritdoc/>
         public string? Extract(Stream? stream, string file, bool includeDebug)
         {
+            if (stream == null)
+                return null;
+
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
@@ -39,10 +42,14 @@ public class SevenZip : IExtractable
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             entry.WriteToFile(tempFile);
                         }

diff --git a/BinaryObjectScanner/FileType/TapeArchive.cs b/BinaryObjectScanner/FileType/TapeArchive.cs
@@ -42,10 +42,14 @@ public class TapeArchive : IExtractable
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             entry.WriteToFile(tempFile);
                         }

diff --git a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
@@ -33,6 +33,10 @@ public class EmbeddedExecutable : IExtractablePortableExecutable, IPortableExecu
         {
             try
             {
+                // If there are no resources
+                if (pex.ResourceData == null)
+                    return null;
+
                 // Get the resources that have an executable signature
                 var resources = pex.ResourceData
                     .Where(kvp => kvp.Value != null && kvp.Value is byte[])
@@ -57,11 +61,8 @@ public class EmbeddedExecutable : IExtractablePortableExecutable, IPortableExecu
                         tempFile = Path.Combine(tempPath, tempFile);
 
                         // Write the resource data to a temp file
-                        using (var tempStream = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
-                        {
-                            if (tempStream != null)
-                                tempStream.Write(data, 0, data.Length);
-                        }
+                        using var tempStream = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.ReadWrite);
+                        tempStream?.Write(data, 0, data.Length);
                     }
                     catch (Exception ex)
                     {

diff --git a/BinaryObjectScanner/Packer/WinRARSFX.cs b/BinaryObjectScanner/Packer/WinRARSFX.cs
@@ -51,10 +51,14 @@ public class WinRARSFX : IExtractablePortableExecutable, IPortableExecutableChec
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             entry.WriteToFile(tempFile);
                         }

diff --git a/BinaryObjectScanner/Packer/WinZipSFX.cs b/BinaryObjectScanner/Packer/WinZipSFX.cs
@@ -74,7 +74,7 @@ public class WinZipSFX : IExtractableNewExecutable, IExtractablePortableExecutab
         /// Handle common extraction between executable types
         /// </summary>
         /// <inheritdoc/>
-        public string? Extract(string file, bool includeDebug)
+        public static string? Extract(string file, bool includeDebug)
         {
 #if NET462_OR_GREATER || NETCOREAPP
             try
@@ -89,10 +89,14 @@ public class WinZipSFX : IExtractableNewExecutable, IExtractablePortableExecutab
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             // If we have a partial entry due to an incomplete multi-part archive, skip it
                             if (!entry.IsComplete)
                                 continue;