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

QTextHtmlParserNode: Avoid invalid enum values

Browse Source 
Fixes oss-fuzz issue 31027

Fixes: QTBUG-93072
Change-Id: I8c7fa31bae79221fbeaf84db7c839fc61c93d48e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Robert Löhning 2021-04-23 16:33:01 +02:00
parent 11a40defff
commit 8862685805
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1168,6 +1168,44 @@ void QTextHtmlParserNode::setListStyle(const QList<QCss::Value> &cssValues)
blockFormat.setProperty(QTextFormat::ListStyle, listStyle);
}
static QTextFrameFormat::BorderStyle toQTextFrameFormat(QCss::BorderStyle cssStyle)
{
switch (cssStyle) {
case QCss::BorderStyle::BorderStyle_Dotted:
return QTextFrameFormat::BorderStyle::BorderStyle_Dotted;
case QCss::BorderStyle::BorderStyle_Dashed:
return QTextFrameFormat::BorderStyle::BorderStyle_Dashed;
case QCss::BorderStyle::BorderStyle_Solid:
return QTextFrameFormat::BorderStyle::BorderStyle_Solid;
case QCss::BorderStyle::BorderStyle_Double:
return QTextFrameFormat::BorderStyle::BorderStyle_Double;
case QCss::BorderStyle::BorderStyle_DotDash:
return QTextFrameFormat::BorderStyle::BorderStyle_DotDash;
case QCss::BorderStyle::BorderStyle_DotDotDash:
return QTextFrameFormat::BorderStyle::BorderStyle_DotDotDash;
case QCss::BorderStyle::BorderStyle_Groove:
return QTextFrameFormat::BorderStyle::BorderStyle_Groove;
case QCss::BorderStyle::BorderStyle_Ridge:
return QTextFrameFormat::BorderStyle::BorderStyle_Ridge;
case QCss::BorderStyle::BorderStyle_Inset:
return QTextFrameFormat::BorderStyle::BorderStyle_Inset;
case QCss::BorderStyle::BorderStyle_Outset:
return QTextFrameFormat::BorderStyle::BorderStyle_Outset;
case QCss::BorderStyle::BorderStyle_Unknown:
case QCss::BorderStyle::BorderStyle_None:
case QCss::BorderStyle::BorderStyle_Native:
return QTextFrameFormat::BorderStyle::BorderStyle_None;
case QCss::BorderStyle::NumKnownBorderStyles:
break;
// Intentionally no "default" to allow a compiler warning when extending the enum
// without updating this here. clang gives such a warning.
}
// Must not happen, intentionally trigger undefined behavior which sanitizers will detect.
// Having all cases covered in switch is not sufficient:
// MSVC would warn when there is no "default".
return static_cast<QTextFrameFormat::BorderStyle>(-1);
}
void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &declarations, const QTextDocument *resourceProvider)
{
QCss::ValueExtractor extractor(declarations);
@ -1187,7 +1225,7 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
// because tableBorder is not relevant for cells.
extractor.extractBorder(cssBorder, tableCellBorderBrush, cssStyles, cssRadii);
for (int i = 0; i < 4; ++i) {
tableCellBorderStyle[i] = static_cast<QTextFrameFormat::BorderStyle>(cssStyles[i] - 1);
tableCellBorderStyle[i] = toQTextFrameFormat(cssStyles[i]);
tableCellBorder[i] = static_cast<qreal>(cssBorder[i]);
}
}