SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-07-16 22:05:13 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Unroll Linq statements to fix exceptions (fixes #287)

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-10 22:27:18 -04:00
parent eae2e3366b
commit d2a73a153b
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
BinaryObjectScanner/FileType/Executable.cs
View File

@@ -43,7 +43,7 @@ namespace BinaryObjectScanner.FileType
get
{
contentCheckClasses ??= InitCheckClasses<IContentCheck>();
return contentCheckClasses ?? Enumerable.Empty<IContentCheck>();
return contentCheckClasses ?? [];
}
}
@@ -55,7 +55,7 @@ namespace BinaryObjectScanner.FileType
get
{
linearExecutableCheckClasses ??= InitCheckClasses<ILinearExecutableCheck>();
return linearExecutableCheckClasses ?? Enumerable.Empty<ILinearExecutableCheck>();
return linearExecutableCheckClasses ?? [];
}
}
@@ -67,7 +67,7 @@ namespace BinaryObjectScanner.FileType
get
{
msdosExecutableCheckClasses ??= InitCheckClasses<IMSDOSExecutableCheck>();
return msdosExecutableCheckClasses ?? Enumerable.Empty<IMSDOSExecutableCheck>();
return msdosExecutableCheckClasses ?? [];
}
}
@@ -79,7 +79,7 @@ namespace BinaryObjectScanner.FileType
get
{
newExecutableCheckClasses ??= InitCheckClasses<INewExecutableCheck>();
return newExecutableCheckClasses ?? Enumerable.Empty<INewExecutableCheck>();
return newExecutableCheckClasses ?? [];
}
}
@@ -91,7 +91,7 @@ namespace BinaryObjectScanner.FileType
get
{
portableExecutableCheckClasses ??= InitCheckClasses<IPortableExecutableCheck>();
return portableExecutableCheckClasses ?? Enumerable.Empty<IPortableExecutableCheck>();
return portableExecutableCheckClasses ?? [];
}
}
@@ -537,17 +537,29 @@ namespace BinaryObjectScanner.FileType
/// Initialize all implementations of a type
/// </summary>
private static IEnumerable<T>? InitCheckClasses<T>() =>
InitCheckClasses<T>(typeof(Handler).Assembly) ?? Enumerable.Empty<T>();
InitCheckClasses<T>(typeof(Handler).Assembly) ?? [];
/// <summary>
/// Initialize all implementations of a type
/// </summary>
private static IEnumerable<T>? InitCheckClasses<T>(Assembly assembly)
{
return assembly.GetTypes()?
.Where(t => t.IsClass && t.GetInterface(typeof(T).Name) != null)?
.Select(t => (T?)Activator.CreateInstance(t))
.Cast<T>() ?? [];
List<T?> types = [];
try
{
foreach (Type type in assembly.GetTypes())
{
if (type.IsClass && type.GetInterface(typeof(T).Name) != null)
{
var instance = (T?)Activator.CreateInstance(type);
if (instance != null)
types.Add(instance);
}
}
}
catch { }
return types;
}
#endregion

19
BinaryObjectScanner/Handler.cs
View File

@@ -211,9 +211,22 @@ namespace BinaryObjectScanner
/// </summary>
private static IEnumerable<T?> InitCheckClasses<T>(Assembly assembly)
{
return assembly.GetTypes()?
.Where(t => t.IsClass && t.GetInterface(typeof(T).Name) != null)?
.Select(t => (T?)Activator.CreateInstance(t)) ?? [];
List<T?> types = [];
try
{
foreach (Type type in assembly.GetTypes())
{
if (type.IsClass && type.GetInterface(typeof(T).Name) != null)
{
var instance = (T?)Activator.CreateInstance(type);
if (instance != null)
types.Add(instance);
}
}
}
catch { }
return types;
}
#endregion