[neon/qt/qtsvg/Neon/unstable] debian: Refresh debian/patches/CVE-2021-45930.diff.
Dmitry Shachnev
null at kde.org
Tue Jul 23 15:14:26 BST 2024
Git commit d7c4c7b57109b14e04aef73e73e87b515798f6a4 by Dmitry Shachnev.
Committed on 11/09/2022 at 09:03.
Pushed by jriddell into branch 'Neon/unstable'.
Refresh debian/patches/CVE-2021-45930.diff.
M +1 -0 debian/changelog
M +18 -18 debian/patches/CVE-2021-45930.diff
https://invent.kde.org/neon/qt/qtsvg/-/commit/d7c4c7b57109b14e04aef73e73e87b515798f6a4
diff --git a/debian/changelog b/debian/changelog
index 7c9f69f..fc0be03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtsvg-opensource-src (5.15.6-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
+ * Refresh debian/patches/CVE-2021-45930.diff.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 10 Sep 2022 21:35:10 +0300
diff --git a/debian/patches/CVE-2021-45930.diff b/debian/patches/CVE-2021-45930.diff
index deae622..efc14a6 100644
--- a/debian/patches/CVE-2021-45930.diff
+++ b/debian/patches/CVE-2021-45930.diff
@@ -8,7 +8,7 @@ Last-Update: 2022-01-07
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
-@@ -1615,6 +1615,7 @@ static void pathArc(QPainterPath &path,
+@@ -1626,6 +1626,7 @@ static void pathArc(QPainterPath &path,
static bool parsePathDataFast(const QStringRef &dataStr, QPainterPath &path)
{
@@ -16,7 +16,7 @@ Last-Update: 2022-01-07
qreal x0 = 0, y0 = 0; // starting point
qreal x = 0, y = 0; // current point
char lastMode = 0;
-@@ -1622,7 +1623,8 @@ static bool parsePathDataFast(const QStr
+@@ -1633,7 +1634,8 @@ static bool parsePathDataFast(const QStr
const QChar *str = dataStr.constData();
const QChar *end = str + dataStr.size();
@@ -26,7 +26,7 @@ Last-Update: 2022-01-07
while (str->isSpace() && (str + 1) != end)
++str;
QChar pathElem = *str;
-@@ -1636,14 +1638,13 @@ static bool parsePathDataFast(const QStr
+@@ -1650,14 +1652,13 @@ static bool parsePathDataFast(const QStr
arg.append(0);//dummy
const qreal *num = arg.constData();
int count = arg.count();
@@ -43,7 +43,7 @@ Last-Update: 2022-01-07
break;
}
x = x0 = num[0] + offsetX;
-@@ -1660,8 +1661,7 @@ static bool parsePathDataFast(const QStr
+@@ -1674,8 +1675,7 @@ static bool parsePathDataFast(const QStr
break;
case 'M': {
if (count < 2) {
@@ -53,7 +53,7 @@ Last-Update: 2022-01-07
break;
}
x = x0 = num[0];
-@@ -1687,8 +1687,7 @@ static bool parsePathDataFast(const QStr
+@@ -1701,8 +1701,7 @@ static bool parsePathDataFast(const QStr
break;
case 'l': {
if (count < 2) {
@@ -63,7 +63,7 @@ Last-Update: 2022-01-07
break;
}
x = num[0] + offsetX;
-@@ -1701,8 +1700,7 @@ static bool parsePathDataFast(const QStr
+@@ -1715,8 +1714,7 @@ static bool parsePathDataFast(const QStr
break;
case 'L': {
if (count < 2) {
@@ -73,7 +73,7 @@ Last-Update: 2022-01-07
break;
}
x = num[0];
-@@ -1742,8 +1740,7 @@ static bool parsePathDataFast(const QStr
+@@ -1756,8 +1754,7 @@ static bool parsePathDataFast(const QStr
break;
case 'c': {
if (count < 6) {
@@ -83,7 +83,7 @@ Last-Update: 2022-01-07
break;
}
QPointF c1(num[0] + offsetX, num[1] + offsetY);
-@@ -1759,8 +1756,7 @@ static bool parsePathDataFast(const QStr
+@@ -1773,8 +1770,7 @@ static bool parsePathDataFast(const QStr
}
case 'C': {
if (count < 6) {
@@ -93,7 +93,7 @@ Last-Update: 2022-01-07
break;
}
QPointF c1(num[0], num[1]);
-@@ -1776,8 +1772,7 @@ static bool parsePathDataFast(const QStr
+@@ -1790,8 +1786,7 @@ static bool parsePathDataFast(const QStr
}
case 's': {
if (count < 4) {
@@ -103,7 +103,7 @@ Last-Update: 2022-01-07
break;
}
QPointF c1;
-@@ -1798,8 +1793,7 @@ static bool parsePathDataFast(const QStr
+@@ -1812,8 +1807,7 @@ static bool parsePathDataFast(const QStr
}
case 'S': {
if (count < 4) {
@@ -113,7 +113,7 @@ Last-Update: 2022-01-07
break;
}
QPointF c1;
-@@ -1820,8 +1814,7 @@ static bool parsePathDataFast(const QStr
+@@ -1834,8 +1828,7 @@ static bool parsePathDataFast(const QStr
}
case 'q': {
if (count < 4) {
@@ -123,7 +123,7 @@ Last-Update: 2022-01-07
break;
}
QPointF c(num[0] + offsetX, num[1] + offsetY);
-@@ -1836,8 +1829,7 @@ static bool parsePathDataFast(const QStr
+@@ -1850,8 +1843,7 @@ static bool parsePathDataFast(const QStr
}
case 'Q': {
if (count < 4) {
@@ -133,7 +133,7 @@ Last-Update: 2022-01-07
break;
}
QPointF c(num[0], num[1]);
-@@ -1852,8 +1844,7 @@ static bool parsePathDataFast(const QStr
+@@ -1866,8 +1858,7 @@ static bool parsePathDataFast(const QStr
}
case 't': {
if (count < 2) {
@@ -143,7 +143,7 @@ Last-Update: 2022-01-07
break;
}
QPointF e(num[0] + offsetX, num[1] + offsetY);
-@@ -1873,8 +1864,7 @@ static bool parsePathDataFast(const QStr
+@@ -1887,8 +1878,7 @@ static bool parsePathDataFast(const QStr
}
case 'T': {
if (count < 2) {
@@ -153,7 +153,7 @@ Last-Update: 2022-01-07
break;
}
QPointF e(num[0], num[1]);
-@@ -1894,8 +1884,7 @@ static bool parsePathDataFast(const QStr
+@@ -1908,8 +1898,7 @@ static bool parsePathDataFast(const QStr
}
case 'a': {
if (count < 7) {
@@ -163,7 +163,7 @@ Last-Update: 2022-01-07
break;
}
qreal rx = (*num++);
-@@ -1917,8 +1906,7 @@ static bool parsePathDataFast(const QStr
+@@ -1931,8 +1920,7 @@ static bool parsePathDataFast(const QStr
break;
case 'A': {
if (count < 7) {
@@ -173,7 +173,7 @@ Last-Update: 2022-01-07
break;
}
qreal rx = (*num++);
-@@ -1939,12 +1927,15 @@ static bool parsePathDataFast(const QStr
+@@ -1953,12 +1941,15 @@ static bool parsePathDataFast(const QStr
}
break;
default:
@@ -191,7 +191,7 @@ Last-Update: 2022-01-07
}
static bool parseStyle(QSvgNode *node,
-@@ -2980,8 +2971,8 @@ static QSvgNode *createPathNode(QSvgNode
+@@ -2995,8 +2986,8 @@ static QSvgNode *createPathNode(QSvgNode
QPainterPath qpath;
qpath.setFillRule(Qt::WindingFill);
More information about the Neon-commits
mailing list