[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 e17814693278ce37175d3d0b73f5e21184f50e5f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 6 22:15:13 2003 +0000

            Reviewed by Chris Blumenberg.
    
    	- fixed 3366173 - crash in DOM::DomShared::ref loading www.berkheiser.net
    
            * khtml/ecma/kjs_html.cpp:
            (Image::putValue): Check for NULL before refing, because we set
    	onLoadListener with a function that returns NULL if passed a value
    	that's not a function.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 14c68d8..9bcd1d1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-08-06  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Chris Blumenberg.
+
+	- fixed 3366173 - crash in DOM::DomShared::ref loading www.berkheiser.net
+	
+        * khtml/ecma/kjs_html.cpp:
+        (Image::putValue): Check for NULL before refing, because we set
+	onLoadListener with a function that returns NULL if passed a value
+	that's not a function.
+
+2003-08-06  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Darin and Dave.
 
 	- fixed 3364433 - repro crash in khtml::RenderBlock::nodeAtPoint
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 14c68d8..9bcd1d1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-08-06  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Chris Blumenberg.
+
+	- fixed 3366173 - crash in DOM::DomShared::ref loading www.berkheiser.net
+	
+        * khtml/ecma/kjs_html.cpp:
+        (Image::putValue): Check for NULL before refing, because we set
+	onLoadListener with a function that returns NULL if passed a value
+	that's not a function.
+
+2003-08-06  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Darin and Dave.
 
 	- fixed 3364433 - repro crash in khtml::RenderBlock::nodeAtPoint
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index e69292a..4318ac5 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3200,7 +3200,7 @@ void Image::putValue(ExecState *exec, int token, const Value& value, int /*attr*
   }
   case OnLoad:
     onLoadListener = Window::retrieveActive(exec)->getJSEventListener(value, true);
-    onLoadListener->ref();
+    if (onLoadListener) onLoadListener->ref();
     break;
   default:
     kdWarning() << "HTMLDocument::putValue unhandled token " << token << endl;

-- 
WebKit Debian packaging