[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-03-29 22:04:24
Message-ID: 20050329220424.3D390491 () office ! kde ! org
[Download RAW message or body]

CVS commit by ggarand: 

fix logic error in removeFromObjectLists leading to crash

BUG: 99854


  M +7 -4      render_object.cpp   1.286


--- kdelibs/khtml/rendering/render_object.cpp  #1.285:1.286
@@ -1484,8 +1484,11 @@ void RenderObject::removeFromObjectLists
     if (isFloating()) {
         RenderBlock* outermostBlock = containingBlock();
-        for (RenderBlock* p = outermostBlock;
-             p && !p->isCanvas() && p->containsFloat(this) && !p->isFloatingOrPositioned();
-             outermostBlock = p, p = p->containingBlock())
-            ;
+        for (RenderBlock* p = outermostBlock; p && !p->isCanvas() && p->containsFloat(this);) {
+            outermostBlock = p;
+            if (p->isFloatingOrPositioned())
+                break;
+            p = p->containingBlock();
+        }
+
         if (outermostBlock)
             outermostBlock->markAllDescendantsWithFloatsForLayout(this);


[prev in list] [next in list] [prev in thread] [next in thread]