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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit b77384a976b8eaf15a9c88b6ab6c7fa7ea750fbe
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 2 22:06:13 2003 +0000

    	Fix for 3495746, nil deref of containing block (frame inside frameset).
    
            Reviewed by kocienda
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::containingBlockWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3639c9f..9f77964 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-12-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3495746, nil deref of containing block (frame inside frameset).
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::containingBlockWidth):
+
 2003-12-02  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index ff1bd7e..7efb484 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -510,6 +510,8 @@ QRect RenderBox::getClipRect(int tx, int ty)
 short RenderBox::containingBlockWidth() const
 {
     RenderBlock* cb = containingBlock();
+    if (!cb)
+        return 0;
     if (usesLineWidth())
         return cb->lineWidth(m_y);
     else

-- 
WebKit Debian packaging