ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 04:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #553 from goatcorp/invalidFile

Browse source 
handle import errors when looking for types
This commit is contained in:
goaaats 2021-09-13 06:12:27 +02:00 • committed by GitHub
commit 35af17f556
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Dalamud/Plugin/Internal/LocalPlugin.cs
View file

@ -49,11 +49,8 @@ namespace Dalamud.Plugin.Internal
config.PreferSharedTypes = true; config.PreferSharedTypes = true;
}); });
Version assemblyVersion;
try try
{ {
// BadImageFormatException
this.pluginAssembly = this.loader.LoadDefaultAssembly(); this.pluginAssembly = this.loader.LoadDefaultAssembly();
} }
catch (Exception ex) catch (Exception ex)
@ -66,7 +63,17 @@ namespace Dalamud.Plugin.Internal
throw new InvalidPluginException(this.DllFile); throw new InvalidPluginException(this.DllFile);
} }
this.pluginType = this.pluginAssembly.GetTypes().FirstOrDefault(type => type.IsAssignableTo(typeof(IDalamudPlugin))); try
{
this.pluginType = this.pluginAssembly.GetTypes().FirstOrDefault(type => type.IsAssignableTo(typeof(IDalamudPlugin)));
}
catch (ReflectionTypeLoadException ex)
{
Log.Error(ex, $"Could not load one or more types when searching for IDalamudPlugin: {this.DllFile.FullName}");
// Something blew up when parsing types, but we still want to look for IDalamudPlugin. Let Load() handle the error.
this.pluginType = ex.Types.FirstOrDefault(type => type.IsAssignableTo(typeof(IDalamudPlugin)));
}
if (this.pluginType == default) if (this.pluginType == default)
{ {
this.pluginAssembly = null; this.pluginAssembly = null;
@ -77,7 +84,7 @@ namespace Dalamud.Plugin.Internal
throw new InvalidPluginException(this.DllFile); throw new InvalidPluginException(this.DllFile);
} }
assemblyVersion = this.pluginAssembly.GetName().Version; var assemblyVersion = this.pluginAssembly.GetName().Version;
// Files that may or may not exist // Files that may or may not exist
this.manifestFile = LocalPluginManifest.GetManifestFile(this.DllFile); this.manifestFile = LocalPluginManifest.GetManifestFile(this.DllFile);