X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebCore%2FChangeLog;h=1ae95aef050604c27b87667ad90a885c26da6c1c;hp=6971c95a5d14f25a4b9a58c7a2cce5b66e2d0653;hb=370c9a83b118b7ecbcf077dce2ffdf17bdccf759;hpb=52d3e8c5c35b12f667c77450c524eea560f4165d

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6971c95a5d14..1ae95aef0506 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-21  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/9768483> REGRESSION: Crash in RenderBlock::removeFloatingObjectsBelow()
+        https://bugs.webkit.org/show_bug.cgi?id=68550
+
+        Reviewed by Darin Adler.
+
+        Test: fast/multicol/null-lastFloat-in-removeFloatingObjectsBelow.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removeFloatingObjectsBelow): Break out of the while() loop when the
+        floating object set is empty, which can happen if there were no floats on previous lines
+        (in which case, lastFloat is 0).
+
 2011-09-21  ChangSeok Oh  <shivamidow@gmail.com>
 
         [GTK] Fix build break when enabling webgl on r95593