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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 8d5cc9bd904fcc45fc9fb9a24e8d89b3bcf545fb
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 2 21:29:28 2003 +0000

            Code written by darin
            Reviewed by me
    
    	Fix for this bug:
    
    	<rdar://problem/3272162>: repro crash in khtml::CachedImage::checkNotify() on particular page
    
            * khtml/ecma/kjs_html.cpp:
            (Image::putValue): ref onLoadListener when setting a value to onLoad
            (Image::~Image): deref onLoadListener when destructing the image.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 99c8253..489e991 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-06-02  Ken Kocienda  <kocienda at apple.com>
+
+        Code written by darin
+        Reviewed by me
+
+	Fix for this bug:
+
+	<rdar://problem/3272162>: repro crash in khtml::CachedImage::checkNotify() on particular page
+
+        * khtml/ecma/kjs_html.cpp:
+        (Image::putValue): ref onLoadListener when setting a value to onLoad
+        (Image::~Image): deref onLoadListener when destructing the image.
+
 2003-06-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3263679, color: # doesn't parse.  Fix is to add an
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 99c8253..489e991 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-06-02  Ken Kocienda  <kocienda at apple.com>
+
+        Code written by darin
+        Reviewed by me
+
+	Fix for this bug:
+
+	<rdar://problem/3272162>: repro crash in khtml::CachedImage::checkNotify() on particular page
+
+        * khtml/ecma/kjs_html.cpp:
+        (Image::putValue): ref onLoadListener when setting a value to onLoad
+        (Image::~Image): deref onLoadListener when destructing the image.
+
 2003-06-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3263679, color: # doesn't parse.  Fix is to add an
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index d40cd52..c99595e 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3169,6 +3169,7 @@ void Image::putValue(ExecState *exec, int token, const Value& value, int /*attr*
   }
   case OnLoad:
     onLoadListener = Window::retrieveActive(exec)->getJSEventListener(value, true);
+    onLoadListener->ref();
     break;
   default:
     kdWarning() << "HTMLDocument::putValue unhandled token " << token << endl;
@@ -3192,6 +3193,7 @@ Image::Image(const DOM::Document &d)
 Image::~Image()
 {
   if ( img ) img->deref(this);
+  if ( onLoadListener ) onLoadListener->deref();
 }
 
 Value KJS::getHTMLCollection(ExecState *exec, const DOM::HTMLCollection &c)

-- 
WebKit Debian packaging