[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 842baf59f2618ef0d111e474f63cfd7bc4d8ed02
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 22:23:08 2004 +0000

            Reviewed by NOBODY (OOPS!).
    
    	- fixed <rdar://problem/3567047>: REGRESSION: repro crash inside KJS (dispatchToBoolean) at www.thedonnas.com
    	- fixed <rdar://problem/3550461>: REGRESSION: repro crash in JavaScript at www.alaska.com
    
    	* khtml/ecma/kjs_window.cpp:
            (Window::getListener): Return Null() when the listener object is
    	null, indicating the code failed to parse. Otherwise we return a
    	bad value which can later crash the JS interpreter.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6e14e38..47193a0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-03-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed <rdar://problem/3567047>: REGRESSION: repro crash inside KJS (dispatchToBoolean) at www.thedonnas.com
+	- fixed <rdar://problem/3550461>: REGRESSION: repro crash in JavaScript at www.alaska.com
+        
+	* khtml/ecma/kjs_window.cpp:
+        (Window::getListener): Return Null() when the listener object is
+	null, indicating the code failed to parse. Otherwise we return a
+	bad value which can later crash the JS interpreter.
+
 2004-03-01  Darin Adler  <darin at apple.com>
 
         Reviewed by Vicki.
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index dad8e88..b06bc3c 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1046,7 +1046,7 @@ Value Window::getListener(ExecState *exec, int eventId) const
     return Undefined();
 
   DOM::EventListener *listener = doc->getHTMLWindowEventListener(eventId);
-  if (listener)
+  if (listener && static_cast<JSEventListener*>(listener)->listenerObjImp())
     return static_cast<JSEventListener*>(listener)->listenerObj();
   else
     return Null();

-- 
WebKit Debian packaging