Changeset 17507 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Oct 31, 2006, 6:14:01 PM (19 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Beth.

Fixed ​http://bugs.webkit.org/show_bug.cgi?id=11477
REGRESSION: GMail crashes in KJS::FunctionImp::callerGetter

• kjs/function.cpp: (KJS::FunctionImp::argumentsGetter): Removed unnecessary braces. (KJS::FunctionImp::callerGetter): More logical NULL checking.

LayoutTests:

Added test for accessing the 'caller' property from inside an event
listener.

• fast/events/caller-access-from-event-listener-expected.txt: Added.
• fast/events/caller-access-from-event-listener.html: Added.

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -220 +220 @@
   Context* context = exec->m_context;
   while (context) {
-    if (context->function() == thisObj) {
+    if (context->function() == thisObj)
       return static_cast<ActivationImp*>(context->activationObject())->get(exec, propertyName);
-    }
     context = context->callingContext();
   }
@@ -230 +229 @@
 JSValue* FunctionImp::callerGetter(ExecState* exec, JSObject*, const Identifier&, const PropertySlot& slot)
 {
-    FunctionImp* thisObj = static_cast<FunctionImp* >(slot.slotBase());
+    FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
     Context* context = exec->m_context;
     while (context) {
-        if (context->function() == thisObj) 
-            return (context->callingContext()->function()) ? context->callingContext()->function() : jsNull();
-        
+        if (context->function() == thisObj)
+            break;
         context = context->callingContext();
     }
-    return jsNull();
+
+    if (!context)
+        return jsNull();
+    
+    Context* callingContext = context->callingContext();
+    if (!callingContext)
+        return jsNull();
+    
+    FunctionImp* callingFunction = callingContext->function();
+    if (!callingFunction)
+        return jsNull();
+
+    return callingFunction;
 }