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

Fix ASAN warnings in XDGForeignV2Interface

Browse source 
Summary:
The current code captures a char* from a wayland event in a lambda.
By creating the QString first when we capture that by value we'll
implicitly shallow copy it.

The other issue was
someHash.erase(it);
*it->foo();

Even though where the iterator points to is still valid, the iterator
itself is an object that gets modified in erase which ASAN didn't like.

Test Plan:
Ran test.
Those particular errors went away
Tests passed

Subscribers: plasma-devel, #frameworks

Tags: #plasma_on_wayland, #frameworks

Differential Revision: https://phabricator.kde.org/D9319
This commit is contained in:
David Edmundson 2017-12-13 22:27:26 +00:00
parent b18f2b2d7a
commit 20c53ee098
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/wayland/xdgforeign_v2_interface.cpp
View file

@ -239,13 +239,14 @@ void XdgImporterUnstableV2Interface::Private::destroyCallback(wl_client *client,
Q_UNUSED(client) Q_UNUSED(client)
} }
void XdgImporterUnstableV2Interface::Private::importCallback(wl_client *client, wl_resource *resource, uint32_t id, const char * handle) void XdgImporterUnstableV2Interface::Private::importCallback(wl_client *client, wl_resource *resource, uint32_t id, const char *h)
{ {
auto s = cast(resource); auto s = cast(resource);
Q_ASSERT(s->foreignInterface); Q_ASSERT(s->foreignInterface);
const QString handle = QString::fromUtf8(h);
XdgExportedUnstableV2Interface *exp = s->foreignInterface->d->exporter->exportedSurface(QString::fromUtf8(handle)); XdgExportedUnstableV2Interface *exp = s->foreignInterface->d->exporter->exportedSurface(handle);
if (!exp) { if (!exp) {
zxdg_imported_v2_send_destroyed(resource); zxdg_imported_v2_send_destroyed(resource);
return; return;
@ -268,8 +269,8 @@ void XdgImporterUnstableV2Interface::Private::importCallback(wl_client *client,
zxdg_imported_v2_send_destroyed(imp->resource()); zxdg_imported_v2_send_destroyed(imp->resource());
imp->deleteLater(); imp->deleteLater();
} }
s->importedSurfaces.remove(QString::fromUtf8(handle)); s->importedSurfaces.remove(handle);
emit s->q->surfaceUnimported(QString::fromUtf8(handle)); emit s->q->surfaceUnimported(handle);
}); });
connect(imp.data(), &XdgImportedUnstableV2Interface::childChanged, connect(imp.data(), &XdgImportedUnstableV2Interface::childChanged,
@ -291,9 +292,10 @@ void XdgImporterUnstableV2Interface::Private::importCallback(wl_client *client,
s->q, [s, child]() { s->q, [s, child]() {
auto it = s->parents.find(child); auto it = s->parents.find(child);
if (it != s->parents.end()) { if (it != s->parents.end()) {
KWayland::Server::XdgImportedUnstableV2Interface* parent = *it;
s->children.remove(*it); s->children.remove(*it);
s->parents.erase(it); s->parents.erase(it);
emit s->q->transientChanged(nullptr, SurfaceInterface::get((*it)->parentResource())); emit s->q->transientChanged(nullptr, SurfaceInterface::get(parent->parentResource()));
} }
}); });
}); });
@ -301,14 +303,15 @@ void XdgImporterUnstableV2Interface::Private::importCallback(wl_client *client,
//surface no longer imported //surface no longer imported
connect(imp.data(), &XdgImportedUnstableV2Interface::unbound, connect(imp.data(), &XdgImportedUnstableV2Interface::unbound,
s->q, [s, handle, imp]() { s->q, [s, handle, imp]() {
s->importedSurfaces.remove(QString::fromUtf8(handle)); s->importedSurfaces.remove(handle);
emit s->q->surfaceUnimported(QString::fromUtf8(handle)); emit s->q->surfaceUnimported(handle);
auto it = s->children.find(imp); auto it = s->children.find(imp);
if (it != s->children.end()) { if (it != s->children.end()) {
KWayland::Server::SurfaceInterface* child = *it;
s->parents.remove(*it); s->parents.remove(*it);
s->children.erase(it); s->children.erase(it);
emit s->q->transientChanged(*it, nullptr); emit s->q->transientChanged(child, nullptr);
} }
}); });
@ -318,8 +321,8 @@ void XdgImporterUnstableV2Interface::Private::importCallback(wl_client *client,
return; return;
} }
s->importedSurfaces[QString::fromUtf8(handle)] = imp; s->importedSurfaces[handle] = imp;
emit s->q->surfaceImported(QString::fromUtf8(handle), imp); emit s->q->surfaceImported(handle, imp);
} }
XdgImporterUnstableV2Interface::Private::Private(XdgImporterUnstableV2Interface *q, Display *d, XdgForeignInterface *foreignInterface) XdgImporterUnstableV2Interface::Private::Private(XdgImporterUnstableV2Interface *q, Display *d, XdgForeignInterface *foreignInterface)