AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assert in QTextDocument CSS parser on "border-width: 1pt"

Browse Source 
The code was assuming that if the parsing of the value worked,
then it must be a list of 4 variants. But in this case it's just
a single length.

This came from <td> using 4 values for border-width
while other elements use a single value. But the storage
is shared. So the fix is to use 4 values everywhere.
When reading 4 and there's only one, it gets duplicated,
so the caller can just use the first one in that case.

Task-number: QTBUG-80496
Change-Id: I682244b6e3781c4d673a62d5e6511dac263c58e8
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
David Faure 2019-03-03 14:55:20 +01:00
parent e4d1a03df0
commit 9f79ab360f
4 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/qcssparser.cpp
View File

@ -443,6 +443,7 @@ void ValueExtractor::lengthValues(const Declaration &decl, int *m)
{ {
if (decl.d->parsed.isValid()) { if (decl.d->parsed.isValid()) {
QList<QVariant> v = decl.d->parsed.toList(); QList<QVariant> v = decl.d->parsed.toList();
Q_ASSERT(v.size() == 4);
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
m[i] = lengthValueFromData(qvariant_cast<LengthData>(v.at(i)), f); m[i] = lengthValueFromData(qvariant_cast<LengthData>(v.at(i)), f);
return; return;

4
src/gui/text/qcssparser_p.h
View File

@ -856,13 +856,13 @@ struct Q_GUI_EXPORT ValueExtractor
int extractStyleFeatures(); int extractStyleFeatures();
bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size); bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size);
int lengthValue(const Declaration &decl); void lengthValues(const Declaration &decl, int *m);
private: private:
void extractFont(); void extractFont();
void borderValue(const Declaration &decl, int *width, QCss::BorderStyle *style, QBrush *color); void borderValue(const Declaration &decl, int *width, QCss::BorderStyle *style, QBrush *color);
LengthData lengthValue(const Value& v); LengthData lengthValue(const Value& v);
void lengthValues(const Declaration &decl, int *m); int lengthValue(const Declaration &decl);
QSize sizeValue(const Declaration &decl); QSize sizeValue(const Declaration &decl);
void sizeValues(const Declaration &decl, QSize *radii); void sizeValues(const Declaration &decl, QSize *radii);

7
src/gui/text/qtexthtmlparser.cpp
View File

@ -1209,8 +1209,11 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
if (decl.styleValue() != QCss::BorderStyle_Unknown && decl.styleValue() != QCss::BorderStyle_Native) if (decl.styleValue() != QCss::BorderStyle_Unknown && decl.styleValue() != QCss::BorderStyle_Native)
borderStyle = static_cast<QTextFrameFormat::BorderStyle>(decl.styleValue() - 1); borderStyle = static_cast<QTextFrameFormat::BorderStyle>(decl.styleValue() - 1);
break; break;
case QCss::BorderWidth: case QCss::BorderWidth: {
tableBorder = extractor.lengthValue(decl); int borders[4];
extractor.lengthValues(decl, borders);
tableBorder = borders[0];
}
break; break;
case QCss::BorderCollapse: case QCss::BorderCollapse:
borderCollapse = decl.borderCollapseValue(); borderCollapse = decl.borderCollapseValue();

38
tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
View File

@ -182,6 +182,8 @@ private slots:
void css_bodyBackground(); void css_bodyBackground();
void css_tableCellBackground(); void css_tableCellBackground();
void css_tableCellBorder(); void css_tableCellBorder();
void css_tableCellBorderWidthOneValue();
void css_tableCellBorderWidthTwoValues();
void css_tableCellBorderShorthand(); void css_tableCellBorderShorthand();
void css_tableCellAllBordersShorthand(); void css_tableCellAllBordersShorthand();
void css_tableCellOverrideOneBorder(); void css_tableCellOverrideOneBorder();
@ -1787,6 +1789,42 @@ void tst_QTextDocumentFragment::css_tableCellBorder()
QCOMPARE(cellFormat.topBorderStyle(), QTextFrameFormat::BorderStyle_Groove); QCOMPARE(cellFormat.topBorderStyle(), QTextFrameFormat::BorderStyle_Groove);
} }
void tst_QTextDocumentFragment::css_tableCellBorderWidthOneValue() // QTBUG-80496
{
const char html[] = "<head><style type=\"text/css\"> body, td { border-width: 2px; }</style></head> <body> <table> <tr> <td></td> </tr> </table> </body> </html>";
doc->setHtml(html);
cursor.movePosition(QTextCursor::Start);
cursor.movePosition(QTextCursor::NextBlock);
QTextTable *table = cursor.currentTable();
QVERIFY(table);
QTextTableCell cell = table->cellAt(0, 0);
QTextTableCellFormat cellFormat = cell.format().toTableCellFormat();
QCOMPARE(cellFormat.leftBorder(), qreal(2));
QCOMPARE(cellFormat.rightBorder(), qreal(2));
QCOMPARE(cellFormat.bottomBorder(), qreal(2));
QCOMPARE(cellFormat.topBorder(), qreal(2));
}
void tst_QTextDocumentFragment::css_tableCellBorderWidthTwoValues() // QTBUG-80496
{
const char html[] = "<head><style type=\"text/css\"> body, td { border-width: 2px 3px; }</style></head> <body> <table> <tr> <td></td> </tr> </table> </body> </html>";
doc->setHtml(html);
cursor.movePosition(QTextCursor::Start);
cursor.movePosition(QTextCursor::NextBlock);
QTextTable *table = cursor.currentTable();
QVERIFY(table);
QTextTableCell cell = table->cellAt(0, 0);
QTextTableCellFormat cellFormat = cell.format().toTableCellFormat();
QCOMPARE(cellFormat.leftBorder(), qreal(3));
QCOMPARE(cellFormat.rightBorder(), qreal(3));
QCOMPARE(cellFormat.bottomBorder(), qreal(2));
QCOMPARE(cellFormat.topBorder(), qreal(2));
}
void tst_QTextDocumentFragment::css_tableCellBorderShorthand() void tst_QTextDocumentFragment::css_tableCellBorderShorthand()
{ {
const char html[] = "<body><table><tr><td style=\"border-left:1px solid green;border-right:2px dashed red;border-bottom:3px dotted yellow;border-top:4px dot-dash blue\">Foo</td></tr></table></body>"; const char html[] = "<body><table><tr><td style=\"border-left:1px solid green;border-right:2px dashed red;border-bottom:3px dotted yellow;border-top:4px dot-dash blue\">Foo</td></tr></table></body>";