From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Mon, 9 Jul 2018 08:45:22 +0000 (+0200)
Subject: [PATCH] Fix crash when parsing malformed url reference
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-18+rpi1+deb10u1^2~55
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bbde603f0493ebe8f5425a475d053fd7a8355c33;p=qt4-x11.git

[PATCH] Fix crash when parsing malformed url reference

The parsing did not check for end of input.

Change-Id: I56a478877d242146395977b767511425d2b8ced1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

Gbp-Pq: Name CVE-2018-19869.patch
---

diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 77af81611..7378e9628 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -746,16 +746,17 @@ static QVector<qreal> parsePercentageList(const QChar *&str)
 static QString idFromUrl(const QString &url)
 {
     QString::const_iterator itr = url.constBegin();
-    while ((*itr).isSpace())
+    QString::const_iterator end = url.constEnd();
+    while (itr != end && (*itr).isSpace())
         ++itr;
-    if ((*itr) == QLatin1Char('('))
+    if (itr != end && (*itr) == QLatin1Char('('))
         ++itr;
-    while ((*itr).isSpace())
+    while (itr != end && (*itr).isSpace())
         ++itr;
-    if ((*itr) == QLatin1Char('#'))
+    if (itr != end && (*itr) == QLatin1Char('#'))
         ++itr;
     QString id;
-    while ((*itr) != QLatin1Char(')')) {
+    while (itr != end && (*itr) != QLatin1Char(')')) {
         id += *itr;
         ++itr;
     }