diff options
| author | Siyeon Seo <[email protected]> | 2021-03-10 17:14:08 +0900 |
|---|---|---|
| committer | Jaeyoon Jung <[email protected]> | 2021-03-17 06:53:37 +0900 |
| commit | 447831e6e0fcc37e8617430827702b59856d5edb (patch) | |
| tree | c2e4c80188e6270fe73b81182117185787267cc9 | |
| parent | 0aad1a6c3cb6e1e1e9892a328c0aa84814d94a5a (diff) | |
Avoid crash when accessing an empty QTextLine
In any case an empty QTextLine should not be used. Q_ASSERT doesn't help
in non-debug build.
Change-Id: I10b7895bc9b4cfd061aea086f810a9f8bf6d301a
Reviewed-by: Shawn Rutledge <[email protected]>
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 10399b4e27..0a023023d4 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1181,8 +1181,8 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) QTextLine firstLine = visibleCount == 1 && elideLayout ? elideLayout->lineAt(0) : layout.lineAt(0); - Q_ASSERT(firstLine.isValid()); - *baseline = firstLine.y() + firstLine.ascent(); + if (firstLine.isValid()) + *baseline = firstLine.y() + firstLine.ascent(); if (!customLayout) br.setHeight(height); |