diff --git a/BurnOutSharp.Builder/BFPK.cs b/BurnOutSharp.Builder/BFPK.cs
index 06f70f57..314c080d 100644
--- a/BurnOutSharp.Builder/BFPK.cs
+++ b/BurnOutSharp.Builder/BFPK.cs
@@ -26,8 +26,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseArchive(dataStream);
}
@@ -43,7 +42,7 @@ namespace BurnOutSharp.Builder
public static Archive ParseArchive(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Builder/LinearExecutable.cs b/BurnOutSharp.Builder/LinearExecutable.cs
index 35ade8e2..8fb2c534 100644
--- a/BurnOutSharp.Builder/LinearExecutable.cs
+++ b/BurnOutSharp.Builder/LinearExecutable.cs
@@ -24,8 +24,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseExecutable(dataStream);
}
@@ -41,7 +40,7 @@ namespace BurnOutSharp.Builder
public static Executable ParseExecutable(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Builder/MSDOS.cs b/BurnOutSharp.Builder/MSDOS.cs
index 9bdc064a..088339b5 100644
--- a/BurnOutSharp.Builder/MSDOS.cs
+++ b/BurnOutSharp.Builder/MSDOS.cs
@@ -25,8 +25,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseExecutable(dataStream);
}
@@ -42,7 +41,7 @@ namespace BurnOutSharp.Builder
public static Executable ParseExecutable(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Builder/MicrosoftCabinet.cs b/BurnOutSharp.Builder/MicrosoftCabinet.cs
index 43541d71..fdba2f6a 100644
--- a/BurnOutSharp.Builder/MicrosoftCabinet.cs
+++ b/BurnOutSharp.Builder/MicrosoftCabinet.cs
@@ -72,8 +72,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseCabinet(dataStream);
}
@@ -89,7 +88,7 @@ namespace BurnOutSharp.Builder
public static Cabinet ParseCabinet(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Builder/MoPaQ.cs b/BurnOutSharp.Builder/MoPaQ.cs
index 7b9a6ae9..74dcf296 100644
--- a/BurnOutSharp.Builder/MoPaQ.cs
+++ b/BurnOutSharp.Builder/MoPaQ.cs
@@ -225,8 +225,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseArchive(dataStream);
}
@@ -242,7 +241,7 @@ namespace BurnOutSharp.Builder
public static Archive ParseArchive(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Builder/NewExecutable.cs b/BurnOutSharp.Builder/NewExecutable.cs
index a9d05648..2c2ac630 100644
--- a/BurnOutSharp.Builder/NewExecutable.cs
+++ b/BurnOutSharp.Builder/NewExecutable.cs
@@ -27,8 +27,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseExecutable(dataStream);
}
@@ -44,7 +43,7 @@ namespace BurnOutSharp.Builder
public static Executable ParseExecutable(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Builder/PortableExecutable.cs b/BurnOutSharp.Builder/PortableExecutable.cs
index 24bfcbdd..bf4c5d98 100644
--- a/BurnOutSharp.Builder/PortableExecutable.cs
+++ b/BurnOutSharp.Builder/PortableExecutable.cs
@@ -29,8 +29,7 @@ namespace BurnOutSharp.Builder
return null;
// Create a memory stream and parse that
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return ParseExecutable(dataStream);
}
@@ -46,7 +45,7 @@ namespace BurnOutSharp.Builder
public static Executable ParseExecutable(Stream data)
{
// If the data is invalid
- if (data == null)
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
return null;
// If the offset is out of bounds
diff --git a/BurnOutSharp.Wrappers/BFPK.cs b/BurnOutSharp.Wrappers/BFPK.cs
index daec2e05..4d444b65 100644
--- a/BurnOutSharp.Wrappers/BFPK.cs
+++ b/BurnOutSharp.Wrappers/BFPK.cs
@@ -55,8 +55,16 @@ namespace BurnOutSharp.Wrappers
/// A BFPK archive wrapper on success, null on failure
public static BFPK Create(byte[] data, int offset)
{
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ // If the data is invalid
+ if (data == null)
+ return null;
+
+ // If the offset is out of bounds
+ if (offset < 0 || offset >= data.Length)
+ return null;
+
+ // Create a memory stream and use that
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return Create(dataStream);
}
@@ -67,6 +75,10 @@ namespace BurnOutSharp.Wrappers
/// A BFPK archive wrapper on success, null on failure
public static BFPK Create(Stream data)
{
+ // If the data is invalid
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
+ return null;
+
var archive = Builder.BFPK.ParseArchive(data);
if (archive == null)
return null;
diff --git a/BurnOutSharp.Wrappers/LinearExecutable.cs b/BurnOutSharp.Wrappers/LinearExecutable.cs
index 68180211..41aca6ca 100644
--- a/BurnOutSharp.Wrappers/LinearExecutable.cs
+++ b/BurnOutSharp.Wrappers/LinearExecutable.cs
@@ -301,8 +301,16 @@ namespace BurnOutSharp.Wrappers
/// An LE/LX executable wrapper on success, null on failure
public static LinearExecutable Create(byte[] data, int offset)
{
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ // If the data is invalid
+ if (data == null)
+ return null;
+
+ // If the offset is out of bounds
+ if (offset < 0 || offset >= data.Length)
+ return null;
+
+ // Create a memory stream and use that
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return Create(dataStream);
}
@@ -313,6 +321,10 @@ namespace BurnOutSharp.Wrappers
/// An LE/LX executable wrapper on success, null on failure
public static LinearExecutable Create(Stream data)
{
+ // If the data is invalid
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
+ return null;
+
var executable = Builder.LinearExecutable.ParseExecutable(data);
if (executable == null)
return null;
diff --git a/BurnOutSharp.Wrappers/MSDOS.cs b/BurnOutSharp.Wrappers/MSDOS.cs
index f8cf809d..5d78a4fc 100644
--- a/BurnOutSharp.Wrappers/MSDOS.cs
+++ b/BurnOutSharp.Wrappers/MSDOS.cs
@@ -105,8 +105,16 @@ namespace BurnOutSharp.Wrappers
/// An MS-DOS executable wrapper on success, null on failure
public static MSDOS Create(byte[] data, int offset)
{
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ // If the data is invalid
+ if (data == null)
+ return null;
+
+ // If the offset is out of bounds
+ if (offset < 0 || offset >= data.Length)
+ return null;
+
+ // Create a memory stream and use that
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return Create(dataStream);
}
@@ -117,6 +125,10 @@ namespace BurnOutSharp.Wrappers
/// An MS-DOS executable wrapper on success, null on failure
public static MSDOS Create(Stream data)
{
+ // If the data is invalid
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
+ return null;
+
var executable = Builder.MSDOS.ParseExecutable(data);
if (executable == null)
return null;
diff --git a/BurnOutSharp.Wrappers/MicrosoftCabinet.cs b/BurnOutSharp.Wrappers/MicrosoftCabinet.cs
index 4d96ef6c..06f18110 100644
--- a/BurnOutSharp.Wrappers/MicrosoftCabinet.cs
+++ b/BurnOutSharp.Wrappers/MicrosoftCabinet.cs
@@ -116,8 +116,16 @@ namespace BurnOutSharp.Wrappers
/// A cabinet wrapper on success, null on failure
public static MicrosoftCabinet Create(byte[] data, int offset)
{
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ // If the data is invalid
+ if (data == null)
+ return null;
+
+ // If the offset is out of bounds
+ if (offset < 0 || offset >= data.Length)
+ return null;
+
+ // Create a memory stream and use that
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return Create(dataStream);
}
@@ -128,6 +136,10 @@ namespace BurnOutSharp.Wrappers
/// A cabinet wrapper on success, null on failure
public static MicrosoftCabinet Create(Stream data)
{
+ // If the data is invalid
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
+ return null;
+
var cabinet = Builder.MicrosoftCabinet.ParseCabinet(data);
if (cabinet == null)
return null;
diff --git a/BurnOutSharp.Wrappers/NewExecutable.cs b/BurnOutSharp.Wrappers/NewExecutable.cs
index 41387bae..3729ce57 100644
--- a/BurnOutSharp.Wrappers/NewExecutable.cs
+++ b/BurnOutSharp.Wrappers/NewExecutable.cs
@@ -233,8 +233,16 @@ namespace BurnOutSharp.Wrappers
/// An NE executable wrapper on success, null on failure
public static NewExecutable Create(byte[] data, int offset)
{
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ // If the data is invalid
+ if (data == null)
+ return null;
+
+ // If the offset is out of bounds
+ if (offset < 0 || offset >= data.Length)
+ return null;
+
+ // Create a memory stream and use that
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return Create(dataStream);
}
@@ -245,6 +253,10 @@ namespace BurnOutSharp.Wrappers
/// An NE executable wrapper on success, null on failure
public static NewExecutable Create(Stream data)
{
+ // If the data is invalid
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
+ return null;
+
var executable = Builder.NewExecutable.ParseExecutable(data);
if (executable == null)
return null;
diff --git a/BurnOutSharp.Wrappers/PortableExecutable.cs b/BurnOutSharp.Wrappers/PortableExecutable.cs
index 8ac985ca..4ce69a44 100644
--- a/BurnOutSharp.Wrappers/PortableExecutable.cs
+++ b/BurnOutSharp.Wrappers/PortableExecutable.cs
@@ -871,8 +871,16 @@ namespace BurnOutSharp.Wrappers
/// A PE executable wrapper on success, null on failure
public static PortableExecutable Create(byte[] data, int offset)
{
- MemoryStream dataStream = new MemoryStream(data);
- dataStream.Position = offset;
+ // If the data is invalid
+ if (data == null)
+ return null;
+
+ // If the offset is out of bounds
+ if (offset < 0 || offset >= data.Length)
+ return null;
+
+ // Create a memory stream and use that
+ MemoryStream dataStream = new MemoryStream(data, offset, data.Length - offset);
return Create(dataStream);
}
@@ -883,6 +891,10 @@ namespace BurnOutSharp.Wrappers
/// A PE executable wrapper on success, null on failure
public static PortableExecutable Create(Stream data)
{
+ // If the data is invalid
+ if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead)
+ return null;
+
var executable = Builder.PortableExecutable.ParseExecutable(data);
if (executable == null)
return null;