diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-12-06 19:57:39 +0200 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-12-06 22:56:12 +0100 |
commit | 26ec3626f1088c272e3232f0341781bb38f518f3 (patch) | |
tree | 6190a6dc490522899dfafd95a280b107bf7b0214 /src | |
parent | 8ed59f12ed21e69113a85851732d64b6de1de0c3 (diff) |
Fix possible double free when hiding a window
There was a race condition between the gui and the wayland event thread
which could lead to double freeing the QWaylandShmBackingStore's frame
callback. Protect the wl_callback_destroy calls using a mutex.
Change-Id: Ia70ebac208a6d4450328ba5254a850be26d84d6d
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/client/qwaylandshmbackingstore.cpp | 3 | ||||
-rw-r--r-- | src/client/qwaylandshmbackingstore_p.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp index d407335d3..6ca65f053 100644 --- a/src/client/qwaylandshmbackingstore.cpp +++ b/src/client/qwaylandshmbackingstore.cpp @@ -46,6 +46,7 @@ #include <QtCore/qdebug.h> #include <QtGui/QPainter> +#include <QMutexLocker> #include <wayland-client.h> #include <unistd.h> @@ -180,6 +181,7 @@ void QWaylandShmBackingStore::endPaint() void QWaylandShmBackingStore::hidden() { + QMutexLocker lock(&mMutex); if (mFrameCallback) { wl_callback_destroy(mFrameCallback); mFrameCallback = Q_NULLPTR; @@ -341,6 +343,7 @@ void QWaylandShmBackingStore::done(void *data, wl_callback *callback, uint32_t t static_cast<QWaylandShmBackingStore *>(data); if (callback != self->mFrameCallback) // others, like QWaylandWindow, may trigger callbacks too return; + QMutexLocker lock(&self->mMutex); QWaylandWindow *window = self->waylandWindow(); wl_callback_destroy(self->mFrameCallback); self->mFrameCallback = 0; diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h index 1212e52fe..c0d730dee 100644 --- a/src/client/qwaylandshmbackingstore_p.h +++ b/src/client/qwaylandshmbackingstore_p.h @@ -47,6 +47,7 @@ #include <qpa/qplatformbackingstore.h> #include <QtGui/QImage> #include <qpa/qplatformwindow.h> +#include <QMutex> QT_BEGIN_NAMESPACE @@ -106,6 +107,7 @@ private: QWaylandShmBuffer *mBackBuffer; bool mFrontBufferIsDirty; bool mPainting; + QMutex mMutex; QSize mRequestedSize; Qt::WindowFlags mCurrentWindowFlags; |