godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-30 16:26:50 +00:00
Code Releases Wiki Activity

Merge pull request #66253 from raulsntos/dotnet/assembly-may-be-null

Browse Source 
C#: Guard against null assemblies
This commit is contained in:
Ignacio Roldán Etcheverry
2022-09-22 18:24:31 +02:00
committed by GitHub
parent 9f028f6571 f6d60764d3
commit 62792eeb9f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
View File

@@ -29,7 +29,7 @@ namespace Godot.SourceGenerators
{ {
while (symbol != null) while (symbol != null)
{ {
if (symbol.ContainingAssembly.Name == assemblyName && if (symbol.ContainingAssembly?.Name == assemblyName &&
symbol.ToString() == typeFullName) symbol.ToString() == typeFullName)
{ {
return true; return true;
@@ -47,7 +47,7 @@ namespace Godot.SourceGenerators
while (symbol != null) while (symbol != null)
{ {
if (symbol.ContainingAssembly.Name == "GodotSharp") if (symbol.ContainingAssembly?.Name == "GodotSharp")
return symbol; return symbol;
symbol = symbol.BaseType; symbol = symbol.BaseType;

10
modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/MarshalUtils.cs
View File

@@ -124,8 +124,8 @@ namespace Godot.SourceGenerators
if (typeKind == TypeKind.Struct) if (typeKind == TypeKind.Struct)
{ {
if (type.ContainingAssembly.Name == "GodotSharp" && if (type.ContainingAssembly?.Name == "GodotSharp" &&
type.ContainingNamespace.Name == "Godot") type.ContainingNamespace?.Name == "Godot")
{ {
return type switch return type switch
{ {
@@ -208,9 +208,9 @@ namespace Godot.SourceGenerators
if (type.SimpleDerivesFrom(typeCache.GodotObjectType)) if (type.SimpleDerivesFrom(typeCache.GodotObjectType))
return MarshalType.GodotObjectOrDerived; return MarshalType.GodotObjectOrDerived;
if (type.ContainingAssembly.Name == "GodotSharp") if (type.ContainingAssembly?.Name == "GodotSharp")
{ {
switch (type.ContainingNamespace.Name) switch (type.ContainingNamespace?.Name)
{ {
case "Godot": case "Godot":
return type switch return type switch
@@ -220,7 +220,7 @@ namespace Godot.SourceGenerators
_ => null _ => null
}; };
case "Collections" case "Collections"
when type.ContainingNamespace.FullQualifiedName() == "Godot.Collections": when type.ContainingNamespace?.FullQualifiedName() == "Godot.Collections":
return type switch return type switch
{ {
{ Name: "Dictionary" } => { Name: "Dictionary" } =>