Merge pull request dotnet#1745 from ww898/thread_static_struct_issue

GetStaticFieldAddrNoCreate() returns data offset instead of NULL
dotnet-bot · Jan 19, 2016 · 2d2e591 · 2d2e591
2 parents 858827e + d10d183
commit 2d2e591
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/vm/threads.cpp b/src/vm/threads.cpp
@@ -10634,8 +10634,10 @@ TADDR Thread::GetStaticFieldAddrNoCreate(FieldDesc *pFD, PTR_AppDomain pDomain)
     if (pFD->IsByValue())
     {
         _ASSERTE(result != NULL);
-        result = dac_cast<TADDR>
-            ((* PTR_UNCHECKED_OBJECTREF(result))->GetData());
+        PTR_Object obj = *PTR_UNCHECKED_OBJECTREF(result);
+        if (obj == NULL)
+            return NULL;
+        result = dac_cast<TADDR>(obj->GetData());
     }
 
     return result;