From 7c1f94f387ade061eae46e549e1f04a70234b68e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 10 Sep 2020 13:05:02 +0200 Subject: Fix Qt6 todo in qcssparser Colors with wrong number of elements are now invalid. Change-Id: I32c934894de86095d9790baa5f0d2001d76bcd3c Reviewed-by: Christian Ehrlicher Reviewed-by: Lars Knoll --- src/gui/text/qcssparser.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index f67c0f485a..24ad9d5092 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -770,11 +770,14 @@ static ColorData parseColorValue(QCss::Value v) if (tokenCount < 5) return ColorData(); - // ### Qt6: replace this with a check and return invalid color when token count does not match - if (hasAlpha && tokenCount != 7) + if (hasAlpha && tokenCount != 7) { qWarning("QCssParser::parseColorValue: Specified color with alpha value but no alpha given: '%s'", qPrintable(lst.join(QLatin1Char(' ')))); - if (!hasAlpha && tokenCount != 5) + return ColorData(); + } + if (!hasAlpha && tokenCount != 5) { qWarning("QCssParser::parseColorValue: Specified color without alpha value but alpha given: '%s'", qPrintable(lst.join(QLatin1Char(' ')))); + return ColorData(); + } int v1 = colorDigits.at(0).variant.toInt(); int v2 = colorDigits.at(2).variant.toInt(); -- cgit v1.2.3