diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2018-04-07 14:21:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 14:21:46 -0700 |
| commit | 0f0320e58fd006a02cdecf7ae45426f54da333e5 (patch) | |
| tree | ffd6e13b10ffff47932688d71e9527d8c3031d76 /src/dlls/dbgshim/dbgshim.cpp | |
| parent | 8499136a9a79fd37a4acb9dc690a4815edd8081d (diff) | |
| download | coreclr-0f0320e58fd006a02cdecf7ae45426f54da333e5.tar.gz coreclr-0f0320e58fd006a02cdecf7ae45426f54da333e5.tar.bz2 coreclr-0f0320e58fd006a02cdecf7ae45426f54da333e5.zip | |
Fix OpenVirtualProcess SIGSEGV on Linux. (#17444)
Add DBI OpenVirtualProcessImpl2 that takes a module path instead of handle.
Fix assert on Windows debug.
Issue #17446
Diffstat (limited to 'src/dlls/dbgshim/dbgshim.cpp')
| -rw-r--r-- | src/dlls/dbgshim/dbgshim.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/dlls/dbgshim/dbgshim.cpp b/src/dlls/dbgshim/dbgshim.cpp index 39c966a3ce..f096b20431 100644 --- a/src/dlls/dbgshim/dbgshim.cpp +++ b/src/dlls/dbgshim/dbgshim.cpp @@ -1808,6 +1808,8 @@ CLRCreateInstance( REFIID riid, LPVOID *ppInterface) { + PUBLIC_CONTRACT; + #if defined(FEATURE_CORESYSTEM) if (ppInterface == NULL) @@ -1822,9 +1824,12 @@ CLRCreateInstance( GUID skuId = CLR_ID_CORECLR; #endif - CLRDebuggingImpl *pDebuggingImpl = new CLRDebuggingImpl(skuId); + CLRDebuggingImpl *pDebuggingImpl = new (nothrow) CLRDebuggingImpl(skuId); + if (NULL == pDebuggingImpl) + return E_OUTOFMEMORY; + return pDebuggingImpl->QueryInterface(riid, ppInterface); #else return E_NOTIMPL; #endif -}
\ No newline at end of file +} |