Changeset 170386 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Jun 24, 2014, 1:29:27 PM (11 years ago)

Author:

[email protected]

Message:

REGRESSION (r169703): Invalid cast in JSC::asGetterSetter / JSC::JSObject::defineOwnNonIndexProperty
​https://bugs.webkit.org/show_bug.cgi?id=134046

Reviewed by Filip Pizlo.

• runtime/GetterSetter.h:

(JSC::asGetterSetter):

• runtime/JSObject.cpp:

(JSC::JSObject::defineOwnNonIndexProperty): We need to check for a CustomGetterSetter here as well as
a normal GetterSetter. If we encounter a CustomGetterSetter, we delete it, create a new normal GetterSetter,
and insert it like normal. We also need to check for CustomAccessors when checking for unconfigurable properties.

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -2647 +2647 @@
             return false;
         }
+        if (current.attributes() & CustomAccessor) {
+            if (throwException)
+                exec->vm().throwException(exec, createTypeError(exec, ASCIILiteral("Attempting to change access mechanism for an unconfigurable property.")));
+            return false;
+        }
     }
     JSValue accessor = getDirect(exec->vm(), propertyName);
     if (!accessor)
         return false;
-    GetterSetter* getterSetter = asGetterSetter(accessor);
+    GetterSetter* getterSetter;
+    if (accessor.isCustomGetterSetter())
+        getterSetter = GetterSetter::create(exec->vm());
+    else {
+        ASSERT(accessor.isGetterSetter());
+        getterSetter = asGetterSetter(accessor);
+    }
     if (descriptor.setterPresent())
         getterSetter->setSetter(exec->vm(), descriptor.setterObject());