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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_khtml/rendering=3A_Check_for_parent=28?=
From:       Andrea Iacovitti <aiacovitti () libero ! it>
Date:       2011-02-07 21:08:12
Message-ID: 20110207210812.5109FA609B () git ! kde ! org
[Download RAW message or body]

Git commit cf1739172ae2f1ed58e0204b0041393de990ea15 by Andrea Iacovitti.
Committed on 07/02/11 at 21:57.
Pushed by aiacovitti into branch 'master'.

Check for parent() to avoid crash

BUG: 264985

M  +2    -2    khtml/rendering/render_block.cpp     

http://commits.kde.org/kdelibs/cf1739172ae2f1ed58e0204b0041393de990ea15

diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp
index 39981d9..f9c718e 100644
--- a/khtml/rendering/render_block.cpp
+++ b/khtml/rendering/render_block.cpp
@@ -1667,7 +1667,7 @@ void RenderBlock::clearChildOfPageBreaks(RenderObject *child, \
PageBreakInfo &pag  bool doBreak = true;
             // don't break before the first child or when page-break-inside is avoid
             if (!forcePageBreak && (!style()->pageBreakInside() || m_avoidPageBreak \
                || child == firstChild())) {
-                if (parent()->canClear(this, (m_avoidPageBreak) ? PageBreakHarder : \
PageBreakNormal )) { +                if (parent() && parent()->canClear(this, \
(m_avoidPageBreak) ? PageBreakHarder : PageBreakNormal )) {  #ifdef PAGE_DEBUG
                     kDebug(6040) << renderName() << "Avoid page-break inside";
 #endif
@@ -1699,7 +1699,7 @@ void RenderBlock::clearChildOfPageBreaks(RenderObject *child, \
PageBreakInfo &pag  kDebug(6040) << "Page-break between children";
 #endif
         if (!style()->pageBreakInside() || m_avoidPageBreak) {
-            if(parent()->canClear(this, (m_avoidPageBreak) ? PageBreakHarder : \
PageBreakNormal )) { +            if (parent() && parent()->canClear(this, \
(m_avoidPageBreak) ? PageBreakHarder : PageBreakNormal )) {  #ifdef PAGE_DEBUG
                 kDebug(6040) << "Avoid page-break inside";
 #endif


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