1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Destroy frame queue before display

Browse Source 
wl_event_queue_destroy accesses the display.
Found by running a test under valgrind.

Pick-to: 6.5
Change-Id: Ic89cbd3b6e98b4fc9561b0e63b5fab4886a1ec50
Reviewed-by: David Edmundson <davidedmundson@kde.org>
This commit is contained in:
David Redondo 2023-04-11 14:27:27 +02:00
parent f820a71a50
commit 531ac86e95
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -370,11 +370,12 @@ QWaylandDisplay::~QWaylandDisplay(void)
#if QT_CONFIG(cursor) #if QT_CONFIG(cursor)
mCursorThemes.clear(); mCursorThemes.clear();
#endif #endif
if (mDisplay)
wl_display_disconnect(mDisplay);
if (m_frameEventQueue) if (m_frameEventQueue)
wl_event_queue_destroy(m_frameEventQueue); wl_event_queue_destroy(m_frameEventQueue);
if (mDisplay)
wl_display_disconnect(mDisplay);
} }
// Steps which is called just after constructor. This separates registry_global() out of the constructor // Steps which is called just after constructor. This separates registry_global() out of the constructor