[patch] Patch to fix infinite loop in konqeuror on maps.google.com

kdelibs-3.4.1-googlemaps.patch (text/plain), 1.32 KB, created by Nathan Toone on 2005-06-01 08:25:05 UTC

--- khtml/ecma/kjs_window.cpp.orig	2005-05-23 06:16:24.000000000 -0600
+++ khtml/ecma/kjs_window.cpp	2005-06-01 09:10:46.097273568 -0600
@@ -483,10 +483,10 @@ Value Window::get(ExecState *exec, const
   }
 
   // Look for overrides first
-  Value val = ObjectImp::get(exec, p);
-  if (!val.isA(UndefinedType)) {
+  ValueImp *val = getDirect(p);
+  if (val) {
     //kdDebug(6070) << "Window::get found dynamic property '" << p.ascii() << "'" << endl;
-    return isSafeScript(exec) ? val : Undefined();
+    return isSafeScript(exec) ? Value(val) : Undefined();
   }
 
   const HashEntry* entry = Lookup::findEntry(&WindowTable, p);
@@ -753,6 +753,19 @@ Value Window::get(ExecState *exec, const
       return getListener(exec,DOM::EventImpl::UNLOAD_EVENT);
     }
   }
+
+  // doing the remainder of ObjectImp::get() that is not covered by
+  // the getDirect() call above.
+  // #### guessed position. move further up or down?
+  Object proto = Object::dynamicCast(prototype());
+  assert(proto.isValid());
+  if (p == specialPrototypePropertyName)
+    return isSafeScript(exec) ? Value(proto) : Undefined();
+  Value val2 = proto.get(exec, p);
+  if (!val2.isA(UndefinedType)) {
+    return isSafeScript(exec) ? val2 : Undefined();
+  }
+
   KParts::ReadOnlyPart *rop = part->findFramePart( p.qstring() );
   if (rop)
     return retrieve(rop);