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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 15c24c8c527ba7e5b9fba9ce512c69b261d26539
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 9 23:42:56 2003 +0000

    	- finished fixing crash in 3275675 -- REGRESSION: crash when replacing <div> which contains iframe (at www.kbs.co.kr)
    
            Reviewed by Darin
    
            * khtml/rendering/render_replaced.cpp:
            (RenderWidget::resizeWidget):
    	check for nil element() before ref/deref'ing
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4509 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 608ed85..e8a816f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-06-09  John Sullivan  <sullivan at apple.com>
+
+	- finished fixing crash in 3275675 -- REGRESSION: crash when replacing <div> which contains iframe (at www.kbs.co.kr)
+
+        Reviewed by Darin
+
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::resizeWidget):
+	check for nil element() before ref/deref'ing
+
 2003-06-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 608ed85..e8a816f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-06-09  John Sullivan  <sullivan at apple.com>
+
+	- finished fixing crash in 3275675 -- REGRESSION: crash when replacing <div> which contains iframe (at www.kbs.co.kr)
+
+        Reviewed by Darin
+
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::resizeWidget):
+	check for nil element() before ref/deref'ing
+
 2003-06-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index 37cec5f..3be3637 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -164,7 +164,7 @@ void  RenderWidget::resizeWidget( QWidget *widget, int w, int h )
     w = QMIN( w, 2000 );
 #endif
 
-    if (widget->width() != w || widget->height() != h) {
+    if (element() && (widget->width() != w || widget->height() != h)) {
         RenderArena *arena = ref();
         element()->ref();
         widget->resize( w, h );

-- 
WebKit Debian packaging