Changeset 208935 in webkit

Timestamp:

Nov 20, 2016 5:31:20 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

Fix exception scope verification failures in DateConstructor.cpp and DatePrototype.cpp.
​https://bugs.webkit.org/show_bug.cgi?id=164995

Reviewed by Darin Adler.

• runtime/DateConstructor.cpp:

(JSC::millisecondsFromComponents):
(JSC::constructDate):

• runtime/DatePrototype.cpp:

(JSC::dateProtoFuncToPrimitiveSymbol):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/DateConstructor.cpp (modified) (4 diffs)
• runtime/DatePrototype.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-11-20  Mark Lam  <mark.lam@apple.com>
+
+        Fix exception scope verification failures in DateConstructor.cpp and DatePrototype.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=164995
+
+        Reviewed by Darin Adler.
+
+        * runtime/DateConstructor.cpp:
+        (JSC::millisecondsFromComponents):
+        (JSC::constructDate):
+        * runtime/DatePrototype.cpp:
+        (JSC::dateProtoFuncToPrimitiveSymbol):
+
 2016-11-20  Caitlin Potter  <caitp@igalia.com>
 

trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp

@@ -110 +110 @@
 static double millisecondsFromComponents(ExecState* exec, const ArgList& args, WTF::TimeType timeType)
 {
-    double doubleArguments[] = {
-        args.at(0).toNumber(exec), 
-        args.at(1).toNumber(exec), 
-        args.at(2).toNumber(exec), 
-        args.at(3).toNumber(exec), 
-        args.at(4).toNumber(exec), 
-        args.at(5).toNumber(exec), 
-        args.at(6).toNumber(exec)
-    };
+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    double doubleArguments[7];
+    for (int i = 0; i < 7; i++) {
+        doubleArguments[i] = args.at(i).toNumber(exec);
+        RETURN_IF_EXCEPTION(scope, 0);
+    }
 
     int numArgs = args.size();
@@ -141 +140 @@
     t.setIsDST(-1);
     double ms = (numArgs >= 7) ? doubleArguments[6] : 0;
-    return gregorianDateTimeToMS(exec->vm(), t, ms, timeType);
+    return gregorianDateTimeToMS(vm, t, ms, timeType);
 }
 
@@ -160 +159 @@
         else {
             JSValue primitive = args.at(0).toPrimitive(exec);
+            RETURN_IF_EXCEPTION(scope, nullptr);
             if (primitive.isString())
                 value = parseDate(vm, primitive.getString(exec));
@@ -167 +167 @@
     } else
         value = millisecondsFromComponents(exec, args, WTF::LocalTime);
+    RETURN_IF_EXCEPTION(scope, nullptr);
 
     Structure* dateStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->dateStructure());

trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp

@@ -621 +621 @@
         type = PreferString;
 
+    scope.release();
     return JSValue::encode(thisObject->ordinaryToPrimitive(exec, type));
 }