From a6a419573d8792651efe081e766bb36bbdb12ac6 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Mon, 25 Jan 2021 12:02:42 -0500 Subject: dev-qt/qtgui: sync --- .../qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch | 39 ------------ .../files/qtgui-5.15.2-bogus-xcb-util-dep.patch | 72 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 39 deletions(-) delete mode 100644 dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch create mode 100644 dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch (limited to 'dev-qt/qtgui/files') diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch deleted file mode 100644 index cad9aa4..0000000 --- a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Thu, 23 Jul 2020 11:48:48 +0200 -Subject: Fix buffer overflow in XBM parser - -Avoid parsing over the buffer limit, or interpreting non-hex -as hex. - -This still leaves parsing of lines longer than 300 chars -unreliable - -Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb -Reviewed-by: Robert Loehning -Reviewed-by: Eirik Aavitsland -(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211) -Reviewed-by: Qt Cherry-pick Bot ---- - src/gui/image/qxbmhandler.cpp | 4 ++- - .../gui/image/qimagereader/tst_qimagereader.cpp | 38 ++++++++++++++++++++++ - 2 files changed, 41 insertions(+), 1 deletion(-) - -diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp -index f06561690c..72ce7f7ecd 100644 ---- a/src/gui/image/qxbmhandler.cpp -+++ b/src/gui/image/qxbmhandler.cpp -@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage) - 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) { --- -cgit v1.2.1 - diff --git a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch new file mode 100644 index 0000000..b7f6548 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch @@ -0,0 +1,72 @@ +From 61b07d75f96d4dfb07b485b2a9bd7aed099df987 Mon Sep 17 00:00:00 2001 +From: Liang Qi +Date: Tue, 1 Dec 2020 08:43:28 +0100 +Subject: [PATCH] Revert "xcb: add xcb-util dependency for xcb-image" +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +This reverts commit adc42bebcac764ca8de78578e3a4ac39b621bd09. + +adc42beb is wrong, the bug is for static build of qt with static +xcb. It adds the explicit dependency of xcb-util 0.3.9, which is +not available on Debian yet. + +Task-number: QTBUG-86287 +Fixes: QTBUG-88688 +Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266 +Reviewed-by: Thiago Macieira +Reviewed-by: Tor Arne Vestbø +(adapted from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a) +--- + src/gui/configure.json | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index c8c4864eca6..1f08795c57b 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -601,15 +601,6 @@ + ], + "use": "xcb" + }, +- "xcb_util": { +- "label": "XCB Util >= 0.3.9", +- "headers": "xcb/xcb_util.h", +- "sources": [ +- { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" }, +- "-lxcb-util" +- ], +- "use": "xcb" +- }, + "xcb_image": { + "label": "XCB Image >= 0.3.9", + "headers": "xcb/xcb_image.h", +@@ -617,7 +608,7 @@ + { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" }, + "-lxcb-image" + ], +- "use": "xcb_shm xcb_util xcb" ++ "use": "xcb_shm xcb" + }, + "xcb_keysyms": { + "label": "XCB Keysyms >= 0.3.9", +@@ -1065,7 +1056,6 @@ + "tail": "#undef explicit", + "include": [ + "xcb/xcb.h", +- "xcb/xcb_util.h", + "xcb/xcb_image.h", + "xcb/xcb_keysyms.h", + "xcb/randr.h", +@@ -1097,7 +1087,7 @@ + "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);" + ] + }, +- "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" ++ "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" + }, + "x11prefix": { + "label": "X11 prefix", +-- +2.16.3 -- cgit v1.2.3-54-g00ecf