Fix NRE in IsInRealmNamespace

realm · Jul 20, 2023 · 4e13543 · 4e13543
1 parent 4ff5a06
commit 4e13543
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 * None
 
 ### Fixed
-* None
+* Fixed an issue where building for Android on Unity would fail with "Could not analyze the user's assembly. Object reference not set to an instance of an object". (Issue [#3380](https://github.com/realm/realm-dotnet/issues/3380))
 
 ### Compatibility
 * Realm Studio: 13.0.0 or later.

diff --git a/Realm/Realm.Weaver/Analytics/Analytics.cs b/Realm/Realm.Weaver/Analytics/Analytics.cs
@@ -122,18 +122,18 @@ public Analytics(Config config, ImportedReferences references, ILogger logger, M
                 // check if it's the right signature, that is 2 params in total of which
                 // the second a bool and that it's set to true.
                 [Feature.Add] = instruction =>
-                    IsInRealmNamespace(instruction.Operand) &&
-                    instruction.Operand is MethodSpecification methodSpecification &&
+                    IsInRealmNamespace(instruction?.Operand) &&
+                    instruction?.Operand is MethodSpecification methodSpecification &&
                     methodSpecification.Parameters.Count == 2 &&
                     methodSpecification.Parameters[1].ParameterType.MetadataType == MetadataType.Boolean &&
-                    instruction.Previous.OpCode == OpCodes.Ldc_I4_1 ?
-                    new(true, Feature.Add) : default,
+                    instruction.Previous?.OpCode == OpCodes.Ldc_I4_1
+                        ? new(true, Feature.Add) : default,
                 [Feature.ShouldCompactOnLaunch] = _ => new(true, Feature.ShouldCompactOnLaunch),
                 [Feature.MigrationCallback] = _ => new(true, Feature.MigrationCallback),
                 [Feature.RealmChanged] = _ => new(true, Feature.RealmChanged),
                 ["SubscribeForNotifications"] = instruction =>
                 {
-                    if (instruction.Operand is not MethodSpecification methodSpecification || !IsInRealmNamespace(instruction.Operand))
+                    if (instruction?.Operand is not MethodSpecification methodSpecification || !IsInRealmNamespace(instruction?.Operand))
                     {
                         return default;
                     }
@@ -222,7 +222,7 @@ property.PropertyType is not GenericInstanceType genericType ||
 
             FeatureAnalysisResult AnalyzeRealmApi(Instruction instruction, string key)
             {
-                if (IsInRealmNamespace(instruction.Operand))
+                if (IsInRealmNamespace(instruction?.Operand))
                 {
                     return new(true, key);
                 }
@@ -506,14 +506,14 @@ private static async Task SendRequest(string prefixAddr, string payload, string
             await httpClient.GetAsync(new Uri(prefixAddr + payload + suffixAddr));
         }
 
-        private static bool IsInRealmNamespace(object operand)
+        private static bool IsInRealmNamespace(object? operand)
         {
             if (operand is not MemberReference memberReference)
             {
                 return false;
             }
 
-            return memberReference.DeclaringType.FullName.StartsWith("Realms", StringComparison.Ordinal);
+            return memberReference?.DeclaringType?.FullName?.StartsWith("Realms", StringComparison.Ordinal) == true;
         }
 
         public class Config