Fix exception System.ArgumentException when checking file format (#481

) * Fix exception `System.ArgumentException` when checking file format * update PR number
microsoft · Sep 9, 2021 · fbcdacb · fbcdacb
1 parent becf484
commit fbcdacb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/src/BinaryParsers/ElfBinary/ElfBinary.cs b/src/BinaryParsers/ElfBinary/ElfBinary.cs
@@ -81,6 +81,7 @@ public static bool CanLoadBinary(Uri uri)
                 return ELFReader.CheckELFType(Path.GetFullPath(uri.LocalPath)) != Class.NotELF;
             }
             catch (IOException) { return false; }
+            catch (ArgumentException) { return false; }
             catch (UnauthorizedAccessException) { return false; }
         }
 

diff --git a/src/BinaryParsers/MachOBinary/MachOBinary.cs b/src/BinaryParsers/MachOBinary/MachOBinary.cs
@@ -48,6 +48,7 @@ public static bool CanLoadBinary(Uri uri)
                         machOs: out _) != MachOResult.NotMachO;
             }
             catch (IOException) { return false; }
+            catch (ArgumentException) { return false; }
             catch (UnauthorizedAccessException) { return false; }
         }
 

diff --git a/src/BinaryParsers/PEBinary/PEBinary.cs b/src/BinaryParsers/PEBinary/PEBinary.cs
@@ -106,6 +106,7 @@ public static bool CanLoadBinary(Uri uri)
                 }
             }
             catch (IOException) { return false; }
+            catch (ArgumentException) { return false; }
             catch (UnauthorizedAccessException) { return false; }
         }
 

diff --git a/src/ReleaseHistory.md b/src/ReleaseHistory.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+* BUGFIX: Fix exception `System.ArgumentException` when checking file format. [#481](https://github.com/microsoft/binskim/pull/481)
 * BUGFIX: Change compiler report rule to report all modules in file. [#476](https://github.com/microsoft/binskim/pull/476)
 * FEATURE: Add dialects to the reporting rules. [#475](https://github.com/microsoft/binskim/pull/475)
 * BUGFIX: Fix exception `System.AccessViolationException` caused by trying to read data out of boundary. [#470](https://github.com/microsoft/binskim/pull/470)
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,7 @@ public static bool CanLoadBinary(Uri uri) @@
                     }
                 }
                 catch (IOException) { return false; }
+                catch (ArgumentException) { return false; }
                 catch (UnauthorizedAccessException) { return false; }
             }
@@ Expand Down @@