Gracefully handle lack of IMetaDataImport interface (refs #249)

dnSpyEx · Oct 11, 2023 · 02fb851 · 02fb851
1 parent 1915d88
commit 02fb851
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 11 deletions.
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/DbgEngineImpl.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/DbgEngineImpl.cs
@@ -648,7 +648,7 @@ void UpdateDynamicModuleIds(DnModule dnModule) {
 			}
 			if (updatedModules is not null) {
 				foreach (var info in updatedModules) {
-					var mdi = info.dnModule.CorModule.GetMetaDataInterface<IMetaDataImport2>();
+					var mdi = info.dnModule.CorModule.GetMetaDataInterface<IMetaDataImport>();
 					var scopeName = MDAPI.GetModuleName(mdi) ?? string.Empty;
 					((DbgCorDebugInternalModuleImpl)info.dbgModule.InternalModule).ReflectionModule!.ScopeName = scopeName;
 				}

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/DnlibAssemblyResolverImpl.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/DnlibAssemblyResolverImpl.cs
@@ -59,7 +59,7 @@ public DnlibAssemblyResolverImpl(DbgEngineImpl engine, DmdAppDomain appDomain) {
 				return null;
 			if (!engine.TryGetDnModule(dbgModule, out var dnModule))
 				return null;
-			return dnModule.GetOrCreateCorModuleDef().Assembly;
+			return dnModule.GetOrCreateCorModuleDef()?.Assembly;
 		}
 	}
 }
diff --git a/...Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/Evaluation/DbgCorDebugInternalRuntimeImpl.cs b/...Debugger/dnSpy.Debugger.DotNet.CorDebug/Impl/Evaluation/DbgCorDebugInternalRuntimeImpl.cs
@@ -114,6 +114,9 @@ DbgDotNetRawModuleBytes GetRawModuleBytesCore(DbgModule module) {
 				return state.ToDbgDotNetRawModuleBytes();
 
 			var md = dnModule.GetOrCreateCorModuleDef();
+			if (md is null)
+				return DbgDotNetRawModuleBytes.None;
+
 			try {
 				md.DisableMDAPICalls = false;
 				md.LoadEverything(null);

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/DotNet/CorModuleDef.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/DotNet/CorModuleDef.cs
@@ -180,7 +180,7 @@ void CreateCorLibTypes() {
 			corLibTypes = new CorLibTypes(this, UpdateRowId(corLibAsmRef));
 		}
 
-		IAssembly GetCorAssemblyRef() {
+		IAssembly? GetCorAssemblyRef() {
 			if (corModuleDefHelper.IsCorLib == true)
 				return Assembly;
 			if (corModuleDefHelper.IsDynamic)

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/DotNet/ICorModuleDefHelper.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/DotNet/ICorModuleDefHelper.cs
@@ -26,7 +26,7 @@ interface ICorModuleDefHelper {
 		/// <summary>
 		/// Gets the currently loaded core library (eg. mscorlib)
 		/// </summary>
-		IAssembly CorLib { get; }
+		IAssembly? CorLib { get; }
 
 		/// <summary>
 		/// true if it's a dynamic module (types can be added at runtime)

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/CorModuleDefHelper.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/CorModuleDefHelper.cs
@@ -37,7 +37,7 @@ public CorModuleDefHelper(DnModule module) {
 			Debug.Assert(!module.IsDynamic || module.Address == 0);
 		}
 
-		public IAssembly CorLib {
+		public IAssembly? CorLib {
 			get {
 				var corAsm = module.AppDomain.Assemblies.FirstOrDefault();
 				Debug2.Assert(corAsm is not null);
@@ -47,7 +47,7 @@ public IAssembly CorLib {
 				Debug2.Assert(corMod is not null);
 				if (corMod is null)
 					return AssemblyRefUser.CreateMscorlibReferenceCLR20();
-				return corMod.GetOrCreateCorModuleDef().Assembly;
+				return corMod.GetOrCreateCorModuleDef()?.Assembly;
 			}
 		}
 

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/DnAssembly.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/DnAssembly.cs
@@ -113,16 +113,26 @@ internal void InitializeAssemblyAndModules() {
 
 			var created = new List<DnModule>();
 			var modules = this.modules.GetAll();
+			bool canCreateAssemblyDef = true;
 			for (int i = 0; i < modules.Length; i++) {
 				var module = modules[i];
 				if (module.CorModuleDef is not null) {
 					Debug2.Assert(corAssemblyDef is not null);
 					continue;
 				}
-				module.CorModuleDef = new CorModuleDef(module.CorModule.GetMetaDataInterface<IMetaDataImport>(), new CorModuleDefHelper(module));
-				if (corAssemblyDef is null)
-					corAssemblyDef = new CorAssemblyDef(module.CorModuleDef, 1);
-				corAssemblyDef.Modules.Add(module.CorModuleDef);
+
+				var mdi = module.CorModule.GetMetaDataInterface<IMetaDataImport>();
+				if (mdi is null) {
+					canCreateAssemblyDef = false;
+					continue;
+				}
+
+				module.CorModuleDef = new CorModuleDef(mdi, new CorModuleDefHelper(module));
+
+				if (canCreateAssemblyDef)
+					corAssemblyDef ??= new CorAssemblyDef(module.CorModuleDef, 1);
+				corAssemblyDef?.Modules.Add(module.CorModuleDef);
+
 				module.CorModuleDef.Initialize();
 				created.Add(module);
 			}

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/DnModule.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/DnModule.cs
@@ -32,7 +32,7 @@ sealed class DnModule {
 		/// Returns the created module or creates one if none has been created
 		/// </summary>
 		/// <returns></returns>
-		public CorModuleDef GetOrCreateCorModuleDef() {
+		public CorModuleDef? GetOrCreateCorModuleDef() {
 			Debugger.DebugVerifyThread();
 			if (CorModuleDef is not null)
 				return CorModuleDef;