Changeset 16613 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 28, 2006, 2:11:30 AM (19 years ago)

Author:

mjs

Message:

Reviewed by Mitz.

• fixed REGRESSION (r16606): javascriptCore Crash on website load

Plus style fixes.

• fixed some possible off-by-one bugs
• use indexing, not iterators, for Vectors
• store Vector by pointer instead of by value to avoid blowing out FunctionImp size

• kjs/function.cpp: (KJS::FunctionImp::addParameter): (KJS::FunctionImp::parameterString): (KJS::FunctionImp::processParameters): (KJS::FunctionImp::lengthGetter): (KJS::FunctionImp::getParameterName):
• kjs/function.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• function.cpp (modified) (5 diffs)
• function.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/function.cpp

@@ -152 +152 @@
 void FunctionImp::addParameter(const Identifier &n)
 {
-    parameters.append(Parameter(n));
+    if (!parameters)
+        parameters.set(new Vector<Parameter>);
+
+    parameters->append(Parameter(n));
 }
 
 UString FunctionImp::parameterString() const
 {
-  UString s;
-
-    Vector<Parameter>::const_iterator end = parameters.end();
-    for(Vector<Parameter>::const_iterator it = parameters.begin(); it < end; it++) {
+    UString s;
+
+    if (!parameters)
+        return s;
+
+    for (size_t i = 0; i < parameters->size(); ++i) {
         if (!s.isEmpty())
             s += ", ";
-        s += it->name.ustring();
-    }
-
-  return s;
+        s += parameters->at(i).name.ustring();
+    }
+
+    return s;
 }
 
@@ -173 +178 @@
 void FunctionImp::processParameters(ExecState *exec, const List &args)
 {
-  JSObject* variable = exec->context()->variableObject();
+    if (!parameters)
+        return;
+
+    JSObject* variable = exec->context()->variableObject();
 
 #ifdef KJS_VERBOSE
-  fprintf(stderr, "---------------------------------------------------\n"
+    fprintf(stderr, "---------------------------------------------------\n"
           "processing parameters for %s call\n",
           name().isEmpty() ? "(internal)" : name().ascii());
@@ -184 +192 @@
 
     JSValue  *v = *it;
-    Vector<Parameter>::const_iterator end = parameters.end();
-    for(Vector<Parameter>::iterator pit = parameters.begin(); pit < end; pit++) {
+    for (size_t i = 0; i < parameters->size(); ++i) {
       if (it != args.end()) {
 #ifdef KJS_VERBOSE
-        fprintf(stderr, "setting parameter %s ", p->name.ascii());
-        printInfo(exec,"to", *it);
+        fprintf(stderr, "setting parameter %s ", parameters->at(i).name.ascii());
+        printInfo(exec, "to", *it);
 #endif
-        variable->put(exec, pit->name, v);
+        variable->put(exec, parameters->at(i).name, v);
         v = ++it;
       } else
-        variable->put(exec, pit->name, jsUndefined());
+        variable->put(exec, parameters->at(i).name, jsUndefined());
   }
 #ifdef KJS_VERBOSE
   else {
-    for (int i = 0; i < args.size(); i++)
+    for (int i = 0; i < args.size(); ++i)
       printInfo(exec,"setting argument", args[i]);
   }
@@ -224 +231 @@
 {
     FunctionImp *thisObj = static_cast<FunctionImp *>(slot.slotBase());
-    return jsNumber(thisObj->parameters.size());
+    return jsNumber(thisObj->parameters ? thisObj->parameters->size() : 0);
 }
 
@@ -267 +274 @@
 Identifier FunctionImp::getParameterName(int index)
 {
-    if (static_cast<size_t>(index) > parameters.size())
+    if (!parameters)
+        return Identifier::null();
+
+    if (static_cast<size_t>(index) >= parameters->size())
         return Identifier::null();
   
-    Identifier name = parameters[index].name;
+    Identifier name = parameters->at(index).name;
 
     // Are there any subsequent parameters with the same name?
-    Vector<Parameter>::const_iterator end = parameters.end();
-    for (Vector<Parameter>::iterator it = &(parameters[index+1]); it < end; it++)
-        if (it->name == name)
+    for (size_t i = index + 1; i < parameters->size(); ++i)
+        if (parameters->at(i).name == name)
             return Identifier::null();
 

trunk/JavaScriptCore/kjs/function.h

@@ -94 +94 @@
     virtual void mark();
   protected:
-    Vector<Parameter> parameters;
+    OwnPtr<Vector<Parameter> > parameters;
 
   private: