diff options
author | Filip Navara <filip.navara@gmail.com> | 2019-01-07 04:16:50 +0100 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-06 19:16:50 -0800 |
commit | ee8bc3272391e46862dd8d27d3e086dc3bf953cf (patch) | |
tree | f746f44980ba3b327438281146e46ea01227f9ff /src/vm/assembly.cpp | |
parent | c3a4a5b292d516ea214006ca1b00feb04e40ec1d (diff) | |
download | coreclr-ee8bc3272391e46862dd8d27d3e086dc3bf953cf.tar.gz coreclr-ee8bc3272391e46862dd8d27d3e086dc3bf953cf.tar.bz2 coreclr-ee8bc3272391e46862dd8d27d3e086dc3bf953cf.zip |
Remove CAS era security checks around resource loads (#21825)
Diffstat (limited to 'src/vm/assembly.cpp')
-rw-r--r-- | src/vm/assembly.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vm/assembly.cpp b/src/vm/assembly.cpp index 5724c6643d..4bd4a18b03 100644 --- a/src/vm/assembly.cpp +++ b/src/vm/assembly.cpp @@ -1855,7 +1855,6 @@ BOOL Assembly::FileNotFound(HRESULT hr) BOOL Assembly::GetResource(LPCSTR szName, DWORD *cbResource, PBYTE *pbInMemoryResource, Assembly** pAssemblyRef, LPCSTR *szFileName, DWORD *dwLocation, - StackCrawlMark *pStackMark, BOOL fSkipSecurityCheck, BOOL fSkipRaiseResolveEvent) { CONTRACTL @@ -1869,9 +1868,9 @@ BOOL Assembly::GetResource(LPCSTR szName, DWORD *cbResource, DomainAssembly *pAssembly = NULL; BOOL result = GetDomainAssembly()->GetResource(szName, cbResource, pbInMemoryResource, &pAssembly, - szFileName, dwLocation, pStackMark, fSkipSecurityCheck, + szFileName, dwLocation, fSkipRaiseResolveEvent); - if (result && pAssemblyRef != NULL && pAssembly!=NULL) + if (result && pAssemblyRef != NULL && pAssembly != NULL) *pAssemblyRef = pAssembly->GetAssembly(); return result; |