Title: [217498] trunk/Source/_javascript_Core
Revision
217498
Author
[email protected]
Date
2017-05-26 11:45:43 -0700 (Fri, 26 May 2017)

Log Message

REGRESSION(216914): testCFStrings encounters an invalid ExecState callee pointer.
https://bugs.webkit.org/show_bug.cgi?id=172651

Reviewed by Saam Barati.

This is because the assertion utility functions used in testCFStrings() expects
to get the JSGlobalContextRef from the global context variable.  However,
testCFStrings() creates its own JSGlobalContextRef but does not set the global
context variable to it.

The fix is to make testCFStrings() initialize the global context variable properly.

* API/tests/testapi.c:
(testCFStrings):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/tests/testapi.c (217497 => 217498)


--- trunk/Source/_javascript_Core/API/tests/testapi.c	2017-05-26 18:20:27 UTC (rev 217497)
+++ trunk/Source/_javascript_Core/API/tests/testapi.c	2017-05-26 18:45:43 UTC (rev 217498)
@@ -1239,7 +1239,10 @@
 #if USE(CF)
 static void testCFStrings(void)
 {
-    JSGlobalContextRef context = JSGlobalContextCreate(0);
+    /* The assertion utility functions we use below expects to get the JSGlobalContextRef
+       from the global context variable. */
+    JSGlobalContextRef oldContext = context;
+    context = JSGlobalContextCreate(0);
 
     UniChar singleUniChar = 65; // Capital A
     CFMutableStringRef cfString = CFStringCreateMutableWithExternalCharactersNoCopy(kCFAllocatorDefault, &singleUniChar, 1, 1, kCFAllocatorNull);
@@ -1332,6 +1335,7 @@
     CFRelease(cfEmptyString);
 
     JSGlobalContextRelease(context);
+    context = oldContext;
 }
 #endif
 

Modified: trunk/Source/_javascript_Core/ChangeLog (217497 => 217498)


--- trunk/Source/_javascript_Core/ChangeLog	2017-05-26 18:20:27 UTC (rev 217497)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-05-26 18:45:43 UTC (rev 217498)
@@ -1,3 +1,20 @@
+2017-05-26  Mark Lam  <[email protected]>
+
+        REGRESSION(216914): testCFStrings encounters an invalid ExecState callee pointer.
+        https://bugs.webkit.org/show_bug.cgi?id=172651
+
+        Reviewed by Saam Barati.
+
+        This is because the assertion utility functions used in testCFStrings() expects
+        to get the JSGlobalContextRef from the global context variable.  However,
+        testCFStrings() creates its own JSGlobalContextRef but does not set the global
+        context variable to it.
+
+        The fix is to make testCFStrings() initialize the global context variable properly.
+
+        * API/tests/testapi.c:
+        (testCFStrings):
+
 2017-05-26  Yusuke Suzuki  <[email protected]>
 
         Give ModuleProgram the same treatment that we did for ProgramCode in bug#167725
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to