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

Avoid dangling d-pointer deref in QWidgetWindow::handleMouseEvent

Browse Source 
If you drag-and-drop a OpenGLWidget in Designer, the main window gets
re-created when the OpenGLWidget is instantiated. So in general (in
rare cases), at the end of QWidgetWindow::handleMouseEvent() we might
have a different window, and therefore can't reliably call
QWindowPrivate::maybeSynthesizeContextMenuEvent() without checking for
a valid pointer.

Amends 84a5f50c7766c99f62b22bb4388137e0aa8dd13d

Fixes: QTBUG-132912
Change-Id: I7b220b4daceab988aadabf9427ef6b2d5624e00d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 1accd2421686b387daa115b3a46974fce0fdb118)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Shawn Rutledge 2025-01-20 10:20:48 +01:00 committed by Qt Cherry-pick Bot
parent cfe906856b
commit 3bcc785d0c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/kernel/qwidgetwindow.cpp
View File

@ -506,6 +506,11 @@ void QWidgetWindow::handleNonClientAreaMouseEvent(QMouseEvent *e)
void QWidgetWindow::handleMouseEvent(QMouseEvent *event) void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
{ {
Q_D(QWidgetWindow); Q_D(QWidgetWindow);
// Event delivery can potentially result in window re-creation (QTBUG-132912)
// so we need QPointer to avoid a dangling d below
QPointer<QWidgetWindow> self = this;
if (auto *activePopupWidget = QApplication::activePopupWidget()) { if (auto *activePopupWidget = QApplication::activePopupWidget()) {
QPointF mapped = event->position(); QPointF mapped = event->position();
if (activePopupWidget != m_widget) if (activePopupWidget != m_widget)
@ -666,6 +671,9 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
event->setAccepted(translated.isAccepted()); event->setAccepted(translated.isAccepted());
} }
if (self.isNull())
return;
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
if ( if (
#else #else