Changeset 153673 in webkit for trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

Timestamp:

Aug 2, 2013, 3:30:48 PM (12 years ago)

Author:

[email protected]

Message:

Remove no-arguments constructor to PropertySlot
​https://bugs.webkit.org/show_bug.cgi?id=119460

Reviewed by Geoff Garen.

This constructor was unsafe if getValue is subsequently called,
and the property is a getter. Simplest to just remove it.

• runtime/Arguments.cpp:

(JSC::Arguments::defineOwnProperty):

• runtime/JSActivation.cpp:

(JSC::JSActivation::getOwnPropertyDescriptor):

• runtime/JSFunction.cpp:

(JSC::JSFunction::getOwnPropertyDescriptor):
(JSC::JSFunction::getOwnNonIndexPropertyNames):
(JSC::JSFunction::put):
(JSC::JSFunction::defineOwnProperty):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::defineOwnProperty):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::hasOwnPropertyForWrite):

• runtime/JSNameScope.cpp:

(JSC::JSNameScope::put):

• runtime/JSONObject.cpp:

(JSC::Stringifier::Holder::appendNextProperty):
(JSC::Walker::walk):

• runtime/JSObject.cpp:

(JSC::JSObject::hasProperty):
(JSC::JSObject::hasOwnProperty):
(JSC::JSObject::reifyStaticFunctionsForDelete):

• runtime/Lookup.h:

(JSC::getStaticPropertyDescriptor):
(JSC::getStaticFunctionDescriptor):
(JSC::getStaticValueDescriptor):

• runtime/ObjectConstructor.cpp:

(JSC::defineProperties):

• runtime/PropertySlot.h:

File:

• trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -516 +516 @@
         else {
             PropertySlot slot(m_object.get());
-            if (!m_object->methodTable()->getOwnPropertySlotByIndex(m_object.get(), exec, index, slot))
-                slot.setUndefined();
-            if (exec->hadException())
-                return false;
-            value = slot.getValue(exec, index);
+            if (m_object->methodTable()->getOwnPropertySlotByIndex(m_object.get(), exec, index, slot)) {
+                value = slot.getValue(exec, index);
+                if (exec->hadException())
+                    return false;
+            } else
+                value = jsUndefined();
         }
 
@@ -671 +672 @@
                     inValue = array->getIndexQuickly(index);
                 else {
-                    PropertySlot slot;
+                    PropertySlot slot(array);
                     if (array->methodTable()->getOwnPropertySlotByIndex(array, m_exec, index, slot))
                         inValue = slot.getValue(m_exec, index);
@@ -723 +724 @@
                     break;
                 }
-                PropertySlot slot;
+                PropertySlot slot(object);
                 if (object->methodTable()->getOwnPropertySlot(object, m_exec, properties[index], slot))
                     inValue = slot.getValue(m_exec, properties[index]);