projects
/
platform
/
upstream
/
coreclr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4836b89
)
Fix a null dereference in the JIT interface.
author
Pat Gavlin
<pagavlin@microsoft.com>
Fri, 15 May 2015 20:45:57 +0000
(13:45 -0700)
committer
Pat Gavlin
<pagavlin@microsoft.com>
Fri, 15 May 2015 20:45:57 +0000
(13:45 -0700)
src/vm/jitinterface.cpp
patch
|
blob
|
history
diff --git
a/src/vm/jitinterface.cpp
b/src/vm/jitinterface.cpp
index
335a9db
..
ee25456
100644
(file)
--- a/
src/vm/jitinterface.cpp
+++ b/
src/vm/jitinterface.cpp
@@
-4904,7
+4904,7
@@
CORINFO_CLASS_HANDLE CEEInfo::getParentType(
// If we encounter __ComObject in the hierarchy, we need to skip it
// since this hierarchy is introduced by the EE, but won't be present
// in the metadata.
- if (IsComObjectClass(thParent))
+ if (
!thParent.IsNull() &&
IsComObjectClass(thParent))
{
result = (CORINFO_CLASS_HANDLE) g_pObjectClass;
}