src/hotspot/os/windows/os_windows.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 2540,2550 ****
  #ifdef _WIN64
            // If it's a legal stack address map the entire region in
            //
            PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
            address addr = (address) exceptionRecord->ExceptionInformation[1];
!           if (addr > thread->stack_reserved_zone_base() && addr < thread->stack_base()) {
              addr = (address)((uintptr_t)addr &
                               (~((uintptr_t)os::vm_page_size() - (uintptr_t)1)));
              os::commit_memory((char *)addr, thread->stack_base() - addr,
                                !ExecMem);
              return EXCEPTION_CONTINUE_EXECUTION;
--- 2540,2550 ----
  #ifdef _WIN64
            // If it's a legal stack address map the entire region in
            //
            PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
            address addr = (address) exceptionRecord->ExceptionInformation[1];
!           if (thread->is_in_usable_stack(addr)) {
              addr = (address)((uintptr_t)addr &
                               (~((uintptr_t)os::vm_page_size() - (uintptr_t)1)));
              os::commit_memory((char *)addr, thread->stack_base() - addr,
                                !ExecMem);
              return EXCEPTION_CONTINUE_EXECUTION;