diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2018-11-21 11:07:41 -0800 |
|---|---|---|
| committer | Aaron Robinson <arobins@microsoft.com> | 2018-11-21 11:07:41 -0800 |
| commit | fac2d42c8c1546c87317675728e048961004a2ee (patch) | |
| tree | 39cca1f68822573945b834c6f886bf9d654e8682 /src/vm/comtoclrcall.cpp | |
| parent | 844aa45629e683d546e98e4a8bb5dd660f8dacae (diff) | |
| download | coreclr-fac2d42c8c1546c87317675728e048961004a2ee.tar.gz coreclr-fac2d42c8c1546c87317675728e048961004a2ee.tar.bz2 coreclr-fac2d42c8c1546c87317675728e048961004a2ee.zip | |
Check for null on COM to CLR call if error occurs during thread instance get.
Diffstat (limited to 'src/vm/comtoclrcall.cpp')
| -rw-r--r-- | src/vm/comtoclrcall.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm/comtoclrcall.cpp b/src/vm/comtoclrcall.cpp index 5c275f025e..d2573262c9 100644 --- a/src/vm/comtoclrcall.cpp +++ b/src/vm/comtoclrcall.cpp @@ -782,7 +782,7 @@ extern "C" UINT64 __stdcall COMToCLRWorker(Thread *pThread, ComMethodFrame* pFra #ifndef _TARGET_X86_ ErrorExit: - if (pThread->PreemptiveGCDisabled()) + if (pThread != nullptr && pThread->PreemptiveGCDisabled()) pThread->EnablePreemptiveGC(); // The call failed so we need to report an error to the caller. |