diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-01-07 15:15:25 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-11 09:50:57 (GMT) |
| commit | 497cd0564b2471354b1ac86f00c5ba90845aa2e1 (patch) | |
| tree | 57c1bb693b2d1896be59de3670e50bae66a01c2f /src/gui | |
| parent | 414b50fa6f436d04e5d709d337c04a380662bf40 (diff) | |
| download | Qt-497cd0564b2471354b1ac86f00c5ba90845aa2e1.zip Qt-497cd0564b2471354b1ac86f00c5ba90845aa2e1.tar.gz Qt-497cd0564b2471354b1ac86f00c5ba90845aa2e1.tar.bz2 | |
Fix crash in QTextBlock::next()/previous()
We should check not just p but also n in next()/previous(),
which is what isValid() does. Otherwise n == 0 will cause
crash in QFragmentMap.
Task-number: QTBUG-16279
Reviewed-by: Eskil
(cherry picked from commit 64852122ba71bbb297b4f1e440f6fabee16ca2fe)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index ea2ef2d..4b92379 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1488,7 +1488,7 @@ QTextBlock::iterator QTextBlock::end() const */ QTextBlock QTextBlock::next() const { - if (!p) + if (!isValid()) return QTextBlock(); return QTextBlock(p, p->blockMap().next(n)); @@ -1504,7 +1504,7 @@ QTextBlock QTextBlock::next() const */ QTextBlock QTextBlock::previous() const { - if (!p) + if (!isValid()) return QTextBlock(); return QTextBlock(p, p->blockMap().previous(n)); |