projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5bfbdca
)
Check for null methodhandle before checking if the method is in the same version...
author
Fadi Hanna
<fadim@microsoft.com>
Mon, 15 Apr 2019 23:25:16 +0000
(16:25 -0700)
committer
Jan Kotas
<jkotas@microsoft.com>
Mon, 15 Apr 2019 23:25:16 +0000
(16:25 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/
ee41ee41bcf5f6c1d77a261fa7cae469475b268a
src/coreclr/src/zap/zapinfo.cpp
patch
|
blob
|
history
diff --git
a/src/coreclr/src/zap/zapinfo.cpp
b/src/coreclr/src/zap/zapinfo.cpp
index
066eb39
..
21ce5f5
100644
(file)
--- a/
src/coreclr/src/zap/zapinfo.cpp
+++ b/
src/coreclr/src/zap/zapinfo.cpp
@@
-3864,7
+3864,7
@@
BOOL ZapInfo::pInvokeMarshalingRequired(CORINFO_METHOD_HANDLE method,
return TRUE;
#endif
- if (IsReadyToRunCompilation() && !m_pImage->GetCompileInfo()->IsInCurrentVersionBubble(m_pEEJitInfo->getMethodModule(method)))
+ if (IsReadyToRunCompilation() &&
method != NULL &&
!m_pImage->GetCompileInfo()->IsInCurrentVersionBubble(m_pEEJitInfo->getMethodModule(method)))
{
// FUTURE: ZapSig::EncodeMethod does not yet handle cross module references for ReadyToRun
// See zapsig.cpp around line 1217.