Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a sanity check for AdjustPagebreak() implementation

Browse Source 
Verify that this function never adjusts page break so far back that it
comes before the previous one (or even at the same position).

This avoids infinite loops in CountPages() even if a custom cell class
implements its overridden AdjustPagebreak() incorrectly.
This commit is contained in:
Vadim Zeitlin
2018-05-24 17:51:40 +02:00
parent 63add2cd19
commit 71948018f4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/html/htmprint.cpp
View File

@@ -151,9 +151,16 @@ int wxHtmlDCRenderer::FindNextPageBreak(const wxArrayInt& known_pagebreaks,
if ( pos != 0 && pos >= GetTotalHeight() ) if ( pos != 0 && pos >= GetTotalHeight() )
return wxNOT_FOUND; return wxNOT_FOUND;
pos += m_Height; int posNext = pos + m_Height;
m_Cells->AdjustPagebreak(&pos, known_pagebreaks, m_Height); if ( m_Cells->AdjustPagebreak(&posNext, known_pagebreaks, m_Height) )
return pos; {
// Check that AdjustPagebreak() returns the page break at a strictly
// greater position than that of the previous page, otherwise
// CountPages() would enter into an infinite loop.
wxCHECK_MSG( posNext > pos, wxNOT_FOUND, "Bug in AdjustPagebreak()" );
}
return posNext;
} }
void wxHtmlDCRenderer::Render(int x, int y, int from, int to) void wxHtmlDCRenderer::Render(int x, int y, int from, int to)