Changeset 10258 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Aug 19, 2005, 9:01:56 AM (20 years ago)

Author:

darin

Message:

Reviewed by Maciej.
Revised and landed by Darin.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4474 REGRESSION: Crash when using in-place operator on uninitialized array element

• kjs/nodes.cpp: (AssignResolveNode::evaluate): Remove unneeded "isSet" assertion. (AssignBracketNode::evaluate): Replace code that tested "isSet" with code that tests the return value of getPropertySlot.

• kjs/property_slot.h: Removed unneeded "isSet" function. Property slots are either uninitialized or set. There's no "initialized and not set" state.

Location:

trunk/JavaScriptCore/kjs

Files:

• nodes.cpp (modified) (4 diffs)
• property_slot.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
@@ -1676 +1675 @@
     v = m_right->evaluate(exec);
   } else {
-    assert(slot.isSet());
     ValueImp *v1 = slot.getValue(exec, m_ident);
     KJS_CHECKEXCEPTIONVALUE
@@ -1774 +1772 @@
     } else {
       PropertySlot slot;
-      base->getPropertySlot(exec, propertyIndex, slot);    
-      ValueImp *v1 = slot.isSet() ? slot.getValue(exec, propertyIndex) : Undefined();
+      ValueImp *v1 = base->getPropertySlot(exec, propertyIndex, slot) ? slot.getValue(exec, propertyIndex) : Undefined();
       KJS_CHECKEXCEPTIONVALUE
       ValueImp *v2 = m_right->evaluate(exec);
@@ -1794 +1791 @@
   } else {
     PropertySlot slot;
-    base->getPropertySlot(exec, propertyName, slot);    
-    ValueImp *v1 = slot.isSet() ? slot.getValue(exec, propertyName) : Undefined();
+    ValueImp *v1 = base->getPropertySlot(exec, propertyName, slot) ? slot.getValue(exec, propertyName) : Undefined();
     KJS_CHECKEXCEPTIONVALUE
     ValueImp *v2 = m_right->evaluate(exec);

trunk/JavaScriptCore/kjs/property_slot.h

@@ -21 +21 @@
  */
 
-#ifndef _KJS_PROPERTY_SLOT_H_
-#define _KJS_PROPERTY_SLOT_H_
+#ifndef KJS_PROPERTY_SLOT_H
+#define KJS_PROPERTY_SLOT_H
 
 #include "identifier.h"
@@ -38 +38 @@
 public:
     typedef ValueImp *(*GetValueFunc)(ExecState *, const Identifier&, const PropertySlot&);
-
-    bool isSet() const { return m_getValue != 0; }
 
     ValueImp *getValue(ExecState *exec, const Identifier& propertyName) const
@@ -64 +62 @@
     void setStaticEntry(ObjectImp *slotBase, const HashEntry *staticEntry, GetValueFunc getValue)
     {
+        assert(getValue);
         m_slotBase = slotBase;
         m_data.staticEntry = staticEntry;
@@ -71 +70 @@
     void setCustom(ObjectImp *slotBase, GetValueFunc getValue)
     {
+        assert(getValue);
         m_slotBase = slotBase;
         m_getValue = getValue;
@@ -77 +77 @@
     void setCustomIndex(ObjectImp *slotBase, unsigned long index, GetValueFunc getValue)
     {
+        assert(getValue);
         m_slotBase = slotBase;
         m_data.index = index;