Changeset 149420 in webkit for trunk/Source/JavaScriptCore/API/JSContextRef.cpp

Timestamp:

Apr 30, 2013, 7:38:19 PM (12 years ago)

Author:

[email protected]

Message:

JSContextGroupSetExecutionTimeLimit() should not pass a callback to the
VM watchdog if its client did not pass one in.
​https://bugs.webkit.org/show_bug.cgi?id=115461.

Reviewed by Geoffrey Garen.

• API/JSContextRef.cpp:

(internalScriptTimeoutCallback):
(JSContextGroupSetExecutionTimeLimit):

• API/tests/testapi.c:

(main):

• Added test case when the time limit callback is 0.
• Also updated a check to verify that a TerminatedExecutionException is thrown when the time out is cancelled.
• Also fixed some cosmetic typos.

File:

• trunk/Source/JavaScriptCore/API/JSContextRef.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -84 +84 @@
     JSShouldTerminateCallback callback = reinterpret_cast<JSShouldTerminateCallback>(callbackPtr);
     JSContextRef contextRef = toRef(exec);
+    ASSERT(callback);
     return callback(contextRef, callbackData);
 }
@@ -92 +93 @@
     APIEntryShim entryShim(&vm);
     Watchdog& watchdog = vm.watchdog;
-    void* callbackPtr = reinterpret_cast<void*>(callback);
-    watchdog.setTimeLimit(vm, limit, internalScriptTimeoutCallback, callbackPtr, callbackData);
+    if (callback) {
+        void* callbackPtr = reinterpret_cast<void*>(callback);
+        watchdog.setTimeLimit(vm, limit, internalScriptTimeoutCallback, callbackPtr, callbackData);
+    } else
+        watchdog.setTimeLimit(vm, limit);
 }