Skip to content

Commit a818a8a

Browse files
committed
Fix deserialization issue for CFB
1 parent 589214e commit a818a8a

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

BinaryObjectScanner/Data/StaticChecks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public static List<IExecutableCheck<PortableExecutable>> PortableExecutableCheck
139139
}
140140
catch (ReflectionTypeLoadException rtle)
141141
{
142-
assemblyTypes = [.. rtle.Types];
142+
assemblyTypes = [.. rtle!.Types];
143143
}
144144

145145
// Get information from the type param

BinaryObjectScanner/FileType/CFB.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public bool Extract(Stream? stream, string file, string outDir, bool includeDebu
2929
{
3030
// Get a wrapper for the CFB
3131
var model = Deserialize(stream);
32+
if (model == null)
33+
return false;
34+
3235
var cfb = new SabreTools.Serialization.Wrappers.CFB(model, stream);
3336
if (cfb?.Model == null)
3437
return false;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Below is a list of protections detected by BinaryObjectScanner. The two columns
5757
| AegiSoft License Manager | True | True | |
5858
| Alpha-DVD | False | True | Unconfirmed¹ |
5959
| Alpha-ROM | True | False | |
60-
| Armadillo | True | False | |
60+
| Armadillo | True | False | |
6161
| Bitpool | False | True | |
6262
| ByteShield | True | True | |
6363
| C-Dilla License Management Solution / CD-Secure / CD-Compress | True | True | |

0 commit comments

Comments
 (0)