From c7a17ccebae3b3f70c3976ce66b8cc96b536f0c5 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Thu, 23 Apr 2015 14:00:34 -0700
Subject: [PATCH] Fix NullReferenceException in EE

I made a struct into a class (in 0d415c29) but I missed a null check
around an existing member access.
---
 .../Core/Source/ExpressionCompiler/DkmUtilities.cs           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/DkmUtilities.cs b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/DkmUtilities.cs
index 2fb3864a25a..3318953cc92 100644
--- a/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/DkmUtilities.cs
+++ b/src/ExpressionEvaluator/Core/Source/ExpressionCompiler/DkmUtilities.cs
@@ -132,13 +132,12 @@ internal static object GetSymReader(this DkmClrModuleInstance clrModule)
             ResultProperties resultProperties,
             DkmClrRuntimeInstance runtimeInstance)
         {
-            if (compResult.Assembly == null)
+            if (compResult == null)
             {
-                Debug.Assert(compResult.TypeName == null);
-                Debug.Assert(compResult.MethodName == null);
                 return null;
             }
 
+            Debug.Assert(compResult.Assembly != null);
             Debug.Assert(compResult.TypeName != null);
             Debug.Assert(compResult.MethodName != null);
 
-- 
GitLab