Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1508416: Check TLS initialization before reading sAlreadyHandlingTrap. r=luke

Browse Source 
--HG--
extra : rebase_source : e8d9c35323a54540b57ef4efed2fe05548e07260
This commit is contained in:
David Major 2018-11-19 20:30:51 -05:00
parent d6372b1489
commit ca5f5855d3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/wasm/WasmSignalHandlers.cpp
View File

@ -27,6 +27,7 @@
#include "wasm/WasmInstance.h"
#if defined(XP_WIN)
# include <winternl.h> // must include before util/Windows.h's `#undef`s
# include "util/Windows.h"
#elif defined(XP_DARWIN)
# include <mach/exc.h>
@ -490,10 +491,18 @@ HandleTrap(CONTEXT* context, JSContext* assertCx = nullptr)
// =============================================================================
#if defined(XP_WIN)
// Obtained empirically from thread_local codegen on x86/x64/arm64.
// Compiled in all user binaries, so should be stable over time.
static const unsigned sThreadLocalArrayPointerIndex = 11;
static LONG WINAPI
WasmTrapHandler(LPEXCEPTION_POINTERS exception)
{
// Make sure TLS is initialized before reading sAlreadyHandlingTrap.
if (!NtCurrentTeb()->Reserved1[sThreadLocalArrayPointerIndex]) {
return EXCEPTION_CONTINUE_SEARCH;
}
if (sAlreadyHandlingTrap.get()) {
return EXCEPTION_CONTINUE_SEARCH;
}