diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
| commit | 61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch) | |
| tree | cb37caa1784bc738b976273335d6ed04a7cc80b0 /src/vm/coreassemblyspec.cpp | |
| parent | 5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff) | |
| download | coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2 coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip | |
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'src/vm/coreassemblyspec.cpp')
| -rw-r--r-- | src/vm/coreassemblyspec.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/vm/coreassemblyspec.cpp b/src/vm/coreassemblyspec.cpp index 7cb1f56315..1d3567e769 100644 --- a/src/vm/coreassemblyspec.cpp +++ b/src/vm/coreassemblyspec.cpp @@ -275,8 +275,32 @@ STDAPI BinderAcquirePEImage(LPCWSTR wszAssemblyPath, STDAPI BinderHasNativeHeader(PEImage *pPEImage, BOOL* result) { - *result = pPEImage->HasNativeHeader(); - return S_OK; + HRESULT hr = S_OK; + + _ASSERTE(pPEImage != NULL); + _ASSERTE(result != NULL); + + EX_TRY + { + *result = pPEImage->HasNativeHeader(); + } + EX_CATCH_HRESULT(hr); + + if (FAILED(hr)) + { + *result = false; + +#if defined(FEATURE_PAL) + // PAL_LOADLoadPEFile may fail while loading IL masquerading as NI. + // This will result in a ThrowHR(E_FAIL). Suppress the error. + if(hr == E_FAIL) + { + hr = S_OK; + } +#endif // defined(FEATURE_PAL) + } + + return hr; } STDAPI BinderAcquireImport(PEImage *pPEImage, |