summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Volkov <avolkov@astralinux.ru>2020-11-16 00:50:35 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2021-02-10 15:33:01 +0200
commit9b6c9469add587e9ad50a85024eeb8287dad7af5 (patch)
tree23a1101764228ec9605a5a4bb6e957a835c42cd7
parenta9a1ac7d5d6f92e19aff3041cc54c55548445972 (diff)
xcb: Avoid use-after-free in QXcbConnection::initializeScreens()
Extend the scope of the resources variable to avoid its destruction while it's still in use. Fixes: QTBUG-88512 Change-Id: I3298aabc871ff455bd1203ec276e7600d3e151ef Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 86b8c5c3f32c245795e9eab2a74e4b6982e5a496)
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_screens.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
index f7538d6b20..9bb74609f4 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
@@ -290,6 +290,8 @@ void QXcbConnection::initializeScreens()
// RRGetScreenResources in this case.
auto resources_current = Q_XCB_REPLY(xcb_randr_get_screen_resources_current,
xcb_connection(), xcbScreen->root);
+ decltype(Q_XCB_REPLY(xcb_randr_get_screen_resources,
+ xcb_connection(), xcbScreen->root)) resources;
if (!resources_current) {
qWarning("failed to get the current screen resources");
} else {
@@ -300,8 +302,8 @@ void QXcbConnection::initializeScreens()
timestamp = resources_current->config_timestamp;
outputs = xcb_randr_get_screen_resources_current_outputs(resources_current.get());
} else {
- auto resources = Q_XCB_REPLY(xcb_randr_get_screen_resources,
- xcb_connection(), xcbScreen->root);
+ resources = Q_XCB_REPLY(xcb_randr_get_screen_resources,
+ xcb_connection(), xcbScreen->root);
if (!resources) {
qWarning("failed to get the screen resources");
} else {