Merge pull request godotengine#66253 from raulsntos/dotnet/assembly-m…

…ay-be-null C#: Guard against null assemblies
akien-mga · Sep 22, 2022 · 62792ee · 62792ee
2 parents 9f028f6 + f6d6076
commit 62792ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
@@ -29,7 +29,7 @@ public static bool InheritsFrom(this INamedTypeSymbol? symbol, string assemblyNa
         {
             while (symbol != null)
             {
-                if (symbol.ContainingAssembly.Name == assemblyName &&
+                if (symbol.ContainingAssembly?.Name == assemblyName &&
                     symbol.ToString() == typeFullName)
                 {
                     return true;
@@ -47,7 +47,7 @@ public static bool InheritsFrom(this INamedTypeSymbol? symbol, string assemblyNa
 
             while (symbol != null)
             {
-                if (symbol.ContainingAssembly.Name == "GodotSharp")
+                if (symbol.ContainingAssembly?.Name == "GodotSharp")
                     return symbol;
 
                 symbol = symbol.BaseType;

diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs b/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs
@@ -124,8 +124,8 @@ INamedTypeSymbol GetTypeByMetadataNameOrThrow(string fullyQualifiedMetadataName)
 
                     if (typeKind == TypeKind.Struct)
                     {
-                        if (type.ContainingAssembly.Name == "GodotSharp" &&
-                            type.ContainingNamespace.Name == "Godot")
+                        if (type.ContainingAssembly?.Name == "GodotSharp" &&
+                            type.ContainingNamespace?.Name == "Godot")
                         {
                             return type switch
                             {
@@ -208,9 +208,9 @@ INamedTypeSymbol GetTypeByMetadataNameOrThrow(string fullyQualifiedMetadataName)
                         if (type.SimpleDerivesFrom(typeCache.GodotObjectType))
                             return MarshalType.GodotObjectOrDerived;
 
-                        if (type.ContainingAssembly.Name == "GodotSharp")
+                        if (type.ContainingAssembly?.Name == "GodotSharp")
                         {
-                            switch (type.ContainingNamespace.Name)
+                            switch (type.ContainingNamespace?.Name)
                             {
                                 case "Godot":
                                     return type switch
@@ -220,7 +220,7 @@ INamedTypeSymbol GetTypeByMetadataNameOrThrow(string fullyQualifiedMetadataName)
                                         _ => null
                                     };
                                 case "Collections"
-                                    when type.ContainingNamespace.FullQualifiedName() == "Godot.Collections":
+                                    when type.ContainingNamespace?.FullQualifiedName() == "Godot.Collections":
                                     return type switch
                                     {
                                         { Name: "Dictionary" } =>