From 0414d77f4796baf246bce548d8e4bfd9b9daa482 Mon Sep 17 00:00:00 2001
From: Sasha Semennikov <alsemenn@sashas-mbp.guest.corp.microsoft.com>
Date: Tue, 2 Aug 2016 16:45:21 -0700
Subject: For helper method frame DAC doesn't read register pointers. So set
 them to NULL to not user "wrong" data.

Moved context pointers NULL assignment to gmsamd64.cpp

Squash commits
---
 src/debug/di/divalue.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/debug')

diff --git a/src/debug/di/divalue.cpp b/src/debug/di/divalue.cpp
index b5ec8ac3f5..50ecd68aa9 100644
--- a/src/debug/di/divalue.cpp
+++ b/src/debug/di/divalue.cpp
@@ -1324,8 +1324,11 @@ HRESULT CordbReferenceValue::BuildFromGCHandle(
         NULL, // EnregisteredValueHome * pRemoteRegAddr,        
         &pRefValue);
 
-    pRefValue->QueryInterface(__uuidof(ICorDebugReferenceValue), (void**)pOutRef);
-
+    if (SUCCEEDED(hr))
+    {
+        pRefValue->QueryInterface(__uuidof(ICorDebugReferenceValue), (void**)pOutRef);
+    }
+    
     return hr;
 }
 
-- 
cgit v1.2.3