diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-25 23:56:46 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-25 23:56:46 -0400 |
| commit | 08b180ca891e51773fb5f96d3cf3721b865ec04c (patch) | |
| tree | 05a71fd77e88a10adfb9dcdd2c4c12f79eadd068 /src/SMAPI | |
| parent | fd7f81ac9c1fbf1ba0427f23fb0f2de3d9c5a028 (diff) | |
| download | SMAPI-08b180ca891e51773fb5f96d3cf3721b865ec04c.tar.gz SMAPI-08b180ca891e51773fb5f96d3cf3721b865ec04c.tar.bz2 SMAPI-08b180ca891e51773fb5f96d3cf3721b865ec04c.zip | |
add failsafe when loading symbols
Diffstat (limited to 'src/SMAPI')
| -rw-r--r-- | src/SMAPI/Framework/ModLoading/AssemblyLoader.cs | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs index e1ad9d37..3e35c9dd 100644 --- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs +++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs @@ -233,15 +233,28 @@ namespace StardewModdingAPI.Framework.ModLoading if (!file.Exists) yield break; // not a local assembly - // read assembly and symbols - byte[] assemblyBytes = File.ReadAllBytes(file.FullName); - Stream readStream = this.TrackForDisposal(new MemoryStream(assemblyBytes)); + // read assembly + AssemblyDefinition assembly; { - FileInfo symbolsFile = new FileInfo(Path.Combine(Path.GetDirectoryName(file.FullName)!, Path.GetFileNameWithoutExtension(file.FullName)) + ".pdb"); - if (symbolsFile.Exists) - this.SymbolReaderProvider.TryAddSymbolData(file.Name, () => this.TrackForDisposal(symbolsFile.OpenRead())); + byte[] assemblyBytes = File.ReadAllBytes(file.FullName); + Stream readStream = this.TrackForDisposal(new MemoryStream(assemblyBytes)); + + try + { + // read assembly with symbols + FileInfo symbolsFile = new FileInfo(Path.Combine(Path.GetDirectoryName(file.FullName)!, Path.GetFileNameWithoutExtension(file.FullName)) + ".pdb"); + if (symbolsFile.Exists) + this.SymbolReaderProvider.TryAddSymbolData(file.Name, () => this.TrackForDisposal(symbolsFile.OpenRead())); + assembly = this.TrackForDisposal(AssemblyDefinition.ReadAssembly(readStream, new ReaderParameters(ReadingMode.Immediate) { AssemblyResolver = assemblyResolver, InMemory = true, ReadSymbols = true, SymbolReaderProvider = this.SymbolReaderProvider })); + } + catch (SymbolsNotMatchingException ex) + { + // read assembly without symbols + this.Monitor.Log($" Failed loading PDB for '{file.Name}'. Technical details:\n{ex}"); + readStream.Position = 0; + assembly = this.TrackForDisposal(AssemblyDefinition.ReadAssembly(readStream, new ReaderParameters(ReadingMode.Immediate) { AssemblyResolver = assemblyResolver, InMemory = true })); + } } - AssemblyDefinition assembly = this.TrackForDisposal(AssemblyDefinition.ReadAssembly(readStream, new ReaderParameters(ReadingMode.Immediate) { AssemblyResolver = assemblyResolver, InMemory = true, ReadSymbols = true, SymbolReaderProvider = this.SymbolReaderProvider })); // skip if already visited if (visitedAssemblyNames.Contains(assembly.Name.Name)) |