[webkit-changes] cvs commit: WebCore/khtml/rendering render_block.cpp

Thu Nov 3 22:05:04 PST 2005

thatcher    05/11/03 22:05:03

  Modified:    khtml/rendering Tag: Safari-1-3-branch render_block.cpp
  Added:       .        Tag: Safari-1-3-branch ChangeLog
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      2005-10-06  Beth Dakin  <bdakin at apple.com>
  
          Reviewed by Vicki.
  
          Fix for <rdar://problem/4145535> Crash in khtml::RenderBlock::addOverhangingFloats
          with simple HTML test file.
  
          * khtml/rendering/render_block.cpp: Added nil check
          (khtml::RenderBlock::addOverhangingFloats):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.335.2.2 +13 -0     WebCore/ChangeLog
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.179.6.2 +1 -1      WebCore/khtml/rendering/render_block.cpp
  
  Index: render_block.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
  retrieving revision 1.179.6.1
  retrieving revision 1.179.6.2
  diff -u -r1.179.6.1 -r1.179.6.2
  --- render_block.cpp	12 Jul 2005 21:04:48 -0000	1.179.6.1
  +++ render_block.cpp	4 Nov 2005 06:05:01 -0000	1.179.6.2
  @@ -2252,7 +2252,7 @@
   void RenderBlock::addOverhangingFloats(RenderBlock* child, int xoff, int yoff)
   {
       // Prevent floats from being added to the canvas by the root element, e.g., <html>.
  -    if (child->hasOverflowClip() || !child->hasOverhangingFloats() || child->isRoot())
  +    if (child->hasOverflowClip() || !child->hasOverhangingFloats() || !child->m_floatingObjects || child->isRoot())
           return;
   
       QPtrListIterator<FloatingObject> it(*child->m_floatingObjects);