-
Notifications
You must be signed in to change notification settings - Fork 324
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix hooks in glib2 and add two patches for qt4
- Loading branch information
Showing
6 changed files
with
72 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| [Trigger] | ||
| Type = Path | ||
| Type = File | ||
| Operation = Install | ||
| Operation = Upgrade | ||
| Operation = Remove | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
tools/MINGW-packages/mingw-w64-glib2/glib-compile-schemas.hook.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| [Trigger] | ||
| Type = Path | ||
| Type = File | ||
| Operation = Install | ||
| Operation = Upgrade | ||
| Operation = Remove | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
tools/MINGW-packages/mingw-w64-qt4/qt-CVE-2020-17507.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff -up qt-everywhere-opensource-src-4.8.7/src/gui/image/qxbmhandler.cpp.me qt-everywhere-opensource-src-4.8.7/src/gui/image/qxbmhandler.cpp | ||
| --- qt-everywhere-opensource-src-4.8.7/src/gui/image/qxbmhandler.cpp.me 2020-08-13 11:20:45.943402169 +0200 | ||
| +++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qxbmhandler.cpp 2020-08-13 11:21:26.025976881 +0200 | ||
| @@ -154,7 +154,9 @@ static bool read_xbm_body(QIODevice *dev | ||
| w = (w+7)/8; // byte width | ||
|
|
||
| while (y < h) { // for all encoded bytes... | ||
| - if (p) { // p = "0x.." | ||
| + if (p && p < (buf + readBytes - 3)) { // p = "0x.." | ||
| + if (!isxdigit(p[2]) || !isxdigit(p[3])) | ||
| + return false; | ||
| *b++ = hex2byte(p+2); | ||
| p += 2; | ||
| if (++x == w && ++y < h) { |
40 changes: 40 additions & 0 deletions
40
...everywhere-opensource-src-4.8.7-clamp-parsed-doubles-to-float-representtable-values.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| diff -up qt-everywhere-opensource-src-4.8.7/src/svg/qsvghandler.cpp.me qt-everywhere-opensource-src-4.8.7/src/svg/qsvghandler.cpp | ||
| --- qt-everywhere-opensource-src-4.8.7/src/svg/qsvghandler.cpp.me 2021-03-09 14:23:00.636840796 +0100 | ||
| +++ qt-everywhere-opensource-src-4.8.7/src/svg/qsvghandler.cpp 2021-03-09 21:34:46.240482104 +0100 | ||
| @@ -68,6 +68,7 @@ | ||
| #include "private/qmath_p.h" | ||
|
|
||
| #include "float.h" | ||
| +#include <cmath> | ||
|
|
||
| QT_BEGIN_NAMESPACE | ||
|
|
||
| @@ -630,15 +631,10 @@ static qreal toDouble(const QChar *&str) | ||
| if (neg) | ||
| val = -val; | ||
| } else { | ||
| -#if defined(Q_WS_QWS) && !defined(Q_OS_VXWORKS) | ||
| - if(sizeof(qreal) == sizeof(float)) | ||
| - val = strtof(temp, 0); | ||
| - else | ||
| -#endif | ||
| - { | ||
| - bool ok = false; | ||
| - val = qstrtod(temp, 0, &ok); | ||
| - } | ||
| + val = QByteArray::fromRawData(temp, pos).toDouble(); | ||
| + // Do not tolerate values too wild to be represented normally by floats | ||
| + if (std::fpclassify(float(val)) != FP_NORMAL) | ||
| + val = 0; | ||
| } | ||
| return val; | ||
|
|
||
| @@ -2945,6 +2941,8 @@ static QSvgStyleProperty *createRadialGr | ||
| ncy = toDouble(cy); | ||
| if (!r.isEmpty()) | ||
| nr = toDouble(r); | ||
| + if (nr < 0.5) | ||
| + nr = 0.5; | ||
|
|
||
| qreal nfx = ncx; | ||
| if (!fx.isEmpty()) |