Fix array elements walking

diff --git a/src/debug/debugger/valuewalk.cpp b/src/debug/debugger/valuewalk.cpp
index 34534ac..9351580 100644 (file)
--- a/src/debug/debugger/valuewalk.cpp
+++ b/src/debug/debugger/valuewalk.cpp
@@ -131,7 +131,9 @@ static HRESULT WalkMembers(ICorDebugValue *pInputValue, ICorDebugILFrame *pILFra
 
         for (ULONG32 i = 0; i < cElements; ++i)
         {
-            IfFailRet(cb(mdMethodDefNil, nullptr, nullptr, nullptr, true, "[" + std::to_string(i) + "]"));
+            ToRelease<ICorDebugValue> pElementValue;
+            pArrayValue->GetElementAtPosition(i, &pElementValue);
+            IfFailRet(cb(mdMethodDefNil, nullptr, nullptr, pElementValue, false, "[" + std::to_string(i) + "]"));
         }
 
         return S_OK;

diff --git a/src/debug/debugger/varobj.cpp b/src/debug/debugger/varobj.cpp
index 7633f8e..6e60aec 100644 (file)
--- a/src/debug/debugger/varobj.cpp
+++ b/src/debug/debugger/varobj.cpp
@@ -119,7 +119,8 @@ static HRESULT FetchFieldsAndProperties(ICorDebugValue *pInputValue,
             return S_OK;
 
         std::string className;
-        TypePrinter::GetTypeOfValue(pType, className);
+        if (pType)
+            TypePrinter::GetTypeOfValue(pType, className);
 
         ICorDebugValue *pResultValue = nullptr;