yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[DataOffer] Avoid calls on null DataSource

Browse source 
A DataOffer can slightly outlive a DataSource; a client will still be
told it's deleted but could call a method in a race.

DataOfferInterface correctly checks for source being still valid, but
nothing updates it when it gets deleted.

BUG: 396308
This commit is contained in:
David Edmundson 2020-09-18 16:48:16 +01:00
parent 456106d749
commit 0b3cca4ae0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wayland/server/dataoffer_interface_p.h
View file

@ -8,6 +8,9 @@
#include "dataoffer_interface.h" #include "dataoffer_interface.h"
#include "datasource_interface.h" #include "datasource_interface.h"
#include "resource_p.h" #include "resource_p.h"
#include <QPointer>
#include <wayland-server.h> #include <wayland-server.h>
namespace KWaylandServer namespace KWaylandServer
@ -18,7 +21,7 @@ class Q_DECL_HIDDEN DataOfferInterface::Private : public Resource::Private
public: public:
Private(AbstractDataSource *source, DataDeviceInterface *parentInterface, DataOfferInterface *q, wl_resource *parentResource); Private(AbstractDataSource *source, DataDeviceInterface *parentInterface, DataOfferInterface *q, wl_resource *parentResource);
~Private(); ~Private();
AbstractDataSource *source; QPointer<AbstractDataSource> source;
DataDeviceInterface *dataDevice; DataDeviceInterface *dataDevice;
// defaults are set to sensible values for < version 3 interfaces // defaults are set to sensible values for < version 3 interfaces
DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move; DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move;