changeset 11272:23ef929f97d3

8151805: fatal error: heap walk aborted with error 1 Reviewed-by: gtriantafill, dcubed
author ctornqvi
date Tue, 17 May 2016 15:44:20 -0400
parents 5577f7c94439
children 3feab0cb558b
files src/os/windows/vm/os_windows.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp	Tue May 17 11:39:38 2016 -0400
+++ b/src/os/windows/vm/os_windows.cpp	Tue May 17 15:44:20 2016 -0400
@@ -5277,7 +5277,8 @@
         }
       }
       DWORD err = GetLastError();
-      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED) {
+      if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED &&
+         (err == ERROR_INVALID_FUNCTION && phe.lpData != NULL)) {
         HeapUnlock(heap);
         fatal("heap walk aborted with error %d", err);
       }