add failfast if entryExitRecord list is messed up

MikeHolman · MikeHolman · commit 7266bf70da8d · 2016-05-04T15:38:14.000-07:00
diff --git a/lib/Runtime/Base/ThreadContext.cpp b/lib/Runtime/Base/ThreadContext.cpp
@@ -1872,6 +1872,12 @@ ThreadContext::PushEntryExitRecord(Js::ScriptEntryExitRecord * record)
         Assert(lastRecord->leaveForHost || lastRecord->leaveForAsyncHostOperation);
         lastRecord->hasReentered = true;
         record->next = lastRecord;
+
+        // these are on stack, which grows down. if this condition doesn't hold, then the list somehow got messed up
+        if ((uintptr_t)record > (uintptr_t)lastRecord)
+        {
+            RaiseFailFastException(nullptr, nullptr, 0);
+        }
     }
 
     this->entryExitRecord = record;
@@ -1881,6 +1887,12 @@ void ThreadContext::PopEntryExitRecord(Js::ScriptEntryExitRecord * record)
 {
     AssertMsg(record && record == this->entryExitRecord, "Mismatch script entry/exit");
 
+    // these are on stack, which grows down. if this condition doesn't hold, then the list somehow got messed up
+    if (this->entryExitRecord->next && (uintptr_t)this->entryExitRecord > (uintptr_t)this->entryExitRecord->next)
+    {
+        RaiseFailFastException(nullptr, nullptr, 0);
+    }
+
     this->entryExitRecord = this->entryExitRecord->next;
 }
 
diff --git a/lib/Runtime/Library/JavascriptFunction.cpp b/lib/Runtime/Library/JavascriptFunction.cpp
@@ -645,7 +645,7 @@ namespace Js
                 exceptionInfo;
 
                 // ensure that hosts are not doing SEH across Chakra frames, as that can lead to bad state (e.g. destructors not being called)
-                RaiseFailFastException(NULL, NULL, NULL);
+                RaiseFailFastException(nullptr, nullptr, 0);
             }
         }
         //ret should never be null here

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ namespace Js`
`645`	`645`	`exceptionInfo;`
`646`	`646`
`647`	`647`	`// ensure that hosts are not doing SEH across Chakra frames, as that can lead to bad state (e.g. destructors not being called)`
`648`		`- RaiseFailFastException(NULL, NULL, NULL);`
	`648`	`+ RaiseFailFastException(nullptr, nullptr, 0);`
`649`	`649`	`}`
`650`	`650`	`}`
`651`	`651`	`//ret should never be null here`