diff --git a/BurnOutSharp/ExecutableType/Microsoft/NE/NewExecutable.cs b/BurnOutSharp/ExecutableType/Microsoft/NE/NewExecutable.cs
index cf77e17c..52ad2b36 100644
--- a/BurnOutSharp/ExecutableType/Microsoft/NE/NewExecutable.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/NE/NewExecutable.cs
@@ -164,16 +164,24 @@ namespace BurnOutSharp.ExecutableType.Microsoft.NE
///
public byte[] ReadArbitraryRange(int rangeStart = -1, int length = -1)
{
- // If we have a source stream, use that
- if (this._sourceStream != null)
- return ReadArbitraryRangeFromSourceStream(rangeStart, length);
+ try
+ {
+ // If we have a source stream, use that
+ if (this._sourceStream != null)
+ return ReadArbitraryRangeFromSourceStream(rangeStart, length);
- // If we have a source array, use that
- if (this._sourceArray != null)
- return ReadArbitraryRangeFromSourceArray(rangeStart, length);
+ // If we have a source array, use that
+ if (this._sourceArray != null)
+ return ReadArbitraryRangeFromSourceArray(rangeStart, length);
- // Otherwise, return null
- return null;
+ // Otherwise, return null
+ return null;
+ }
+ catch (Exception ex)
+ {
+ // TODO: How to handle this differently?
+ return null;
+ }
}
///
diff --git a/BurnOutSharp/ExecutableType/Microsoft/PE/PortableExecutable.cs b/BurnOutSharp/ExecutableType/Microsoft/PE/PortableExecutable.cs
index deb7a628..a87b01c2 100644
--- a/BurnOutSharp/ExecutableType/Microsoft/PE/PortableExecutable.cs
+++ b/BurnOutSharp/ExecutableType/Microsoft/PE/PortableExecutable.cs
@@ -554,16 +554,24 @@ namespace BurnOutSharp.ExecutableType.Microsoft.PE
///
public byte[] ReadArbitraryRange(int rangeStart = -1, int length = -1)
{
- // If we have a source stream, use that
- if (this._sourceStream != null)
- return ReadArbitraryRangeFromSourceStream(rangeStart, length);
+ try
+ {
+ // If we have a source stream, use that
+ if (this._sourceStream != null)
+ return ReadArbitraryRangeFromSourceStream(rangeStart, length);
- // If we have a source array, use that
- if (this._sourceArray != null)
- return ReadArbitraryRangeFromSourceArray(rangeStart, length);
+ // If we have a source array, use that
+ if (this._sourceArray != null)
+ return ReadArbitraryRangeFromSourceArray(rangeStart, length);
- // Otherwise, return null
- return null;
+ // Otherwise, return null
+ return null;
+ }
+ catch (Exception ex)
+ {
+ // TODO: How to handle this differently?
+ return null;
+ }
}
///
diff --git a/BurnOutSharp/Scanner.cs b/BurnOutSharp/Scanner.cs
index 595734dc..5d8e3cb6 100644
--- a/BurnOutSharp/Scanner.cs
+++ b/BurnOutSharp/Scanner.cs
@@ -254,7 +254,7 @@ namespace BurnOutSharp
if (!File.Exists(file))
return null;
- // Initialze the protections found
+ // Initialize the protections found
var protections = new ConcurrentDictionary>();
// Get the extension for certain checks