184405 2018-04-08 18:36:04 -0700 [WPE][GTK] Remove WlUniquePtr<wl_display> footgun 2018-04-23 18:08:25 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=176490 InRadar P2 Normal --- 1 mcatanzaro mcatanzaro bugs-noreply cgarcia commit-queue mcatanzaro webkit-bug-importer oldest_to_newest 1412781 0 mcatanzaro 2018-04-08 18:36:04 -0700 WlUniquePtr<wl_display> is a pretty big footgun because there are two different destruction functions -- wl_display_disconnect() and wl_display_destroy() -- and which one you need to use depends on how the wl_display() was created, and WebKit uses both in different places. So WlUniquePtr<wl_display> is pretty unsafe. See bug #176490 for an example of fun caused by using it incorrectly. Let's use std::unique_ptr with custom deleter functors instead. Suggestions for how to do this better (without giving up RAII) are quite welcome. 1412785 1 337474 mcatanzaro 2018-04-08 18:52:01 -0700 Created attachment 337474 Patch 1416880 2 337474 cgarcia 2018-04-23 07:18:12 -0700 Comment on attachment 337474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337474&action=review > Source/WebKit/UIProcess/gtk/WaylandCompositor.h:129 > + void operator() (struct wl_display* display) { wl_display_destroy(display); } const 1417039 3 337474 mcatanzaro 2018-04-23 17:40:43 -0700 Comment on attachment 337474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337474&action=review >> Source/WebKit/UIProcess/gtk/WaylandCompositor.h:129 >> + void operator() (struct wl_display* display) { wl_display_destroy(display); } > > const const seems pretty overkill for a function object with no member variables :) 1417046 4 337474 commit-queue 2018-04-23 18:07:11 -0700 Comment on attachment 337474 Patch Clearing flags on attachment: 337474 Committed r230936: <https://trac.webkit.org/changeset/230936> 1417047 5 commit-queue 2018-04-23 18:07:13 -0700 All reviewed patches have been landed. Closing bug. 1417050 6 webkit-bug-importer 2018-04-23 18:08:25 -0700 <rdar://problem/39668727> 337474 2018-04-08 18:52:01 -0700 2018-04-23 18:07:11 -0700 Patch bug-184405-20180408205200.patch text/plain 4801 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTE1ZjdhOTc5MmRiODE2 NDhjZGQxMDFhMjBkOWVjMjVmMGM5NGUyMS4uYzcxZjc3OWMyM2RjNWUyYWE0ODBkMzIwOTIwZDIy MDhkYjJjMjNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA0LTA4ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbV1BFXVtH VEtdIFJlbW92ZSBXbFVuaXF1ZVB0cjx3bF9kaXNwbGF5PiBmb290Z3VuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ0MDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXbFVuaXF1ZVB0cjx3bF9kaXNwbGF5 PiBpcyBhIHByZXR0eSBiaWcgZm9vdGd1biBiZWNhdXNlIHRoZXJlIGFyZSB0d28gZGlmZmVyZW50 IGRlc3RydWN0aW9uCisgICAgICAgIGZ1bmN0aW9ucyAtLSB3bF9kaXNwbGF5X2Rpc2Nvbm5lY3Qo KSBhbmQgd2xfZGlzcGxheV9kZXN0cm95KCkgLS0gYW5kIHdoaWNoIG9uZSB5b3UgbmVlZCB0bwor ICAgICAgICB1c2UgZGVwZW5kcyBvbiBob3cgdGhlIHdsX2Rpc3BsYXkoKSB3YXMgY3JlYXRlZCwg YW5kIFdlYktpdCB1c2VzIGJvdGggaW4gZGlmZmVyZW50IHBsYWNlcy4KKyAgICAgICAgU28gV2xV bmlxdWVQdHI8d2xfZGlzcGxheT4gaXMgcHJldHR5IHVuc2FmZS4gU2VlIGJ1ZyAjMTc2NDkwIGZv ciBhbiBleGFtcGxlIG9mIGZ1biBjYXVzZWQKKyAgICAgICAgYnkgdXNpbmcgaXQgaW5jb3JyZWN0 bHkuCisKKyAgICAgICAgTGV0J3MgdXNlIHN0ZDo6dW5pcXVlX3B0ciB3aXRoIGN1c3RvbSBkZWxl dGVyIGZ1bmN0b3JzIGluc3RlYWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93YXls YW5kL1dsVW5pcXVlUHRyLmg6CisKIDIwMTgtMDQtMDcgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90 aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSB0aGUgc3lzdGVtJ3MgbGluayBjb2xvciB3aGVu IHN5c3RlbSBhcHBlYXJhbmNlIGlzIGRlc2lyZWQgZm9yIGEgV2ViVmlldy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg MmM5Yzc0ZWNjY2Y4MmUzOWM0ZDMzNzFhNjZiYzMyMTFhMjhkYTFkOS4uZGE5YmNiNjE4NTViOThj MzVhMjY1YmNkNzA5YjEyOTA3MjRjYjE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx OC0wNC0wOCAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW1dQRV1bR1RLXSBSZW1vdmUgV2xVbmlxdWVQdHI8d2xfZGlzcGxheT4gZm9vdGd1bgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NDA1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3dpdGNoIHRv IHN0ZDo6dW5pcXVlX3B0ci4KKworICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBv c2l0b3IuY3BwOgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9zaXRvcjo6V2F5bGFuZENv bXBvc2l0b3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuaDoK KyAgICAgICAgKFdlYktpdDo6V2F5bGFuZENvbXBvc2l0b3I6OkRpc3BsYXlEZWxldGVyOjpvcGVy YXRvcigpKToKKwogMjAxOC0wNC0wNiAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OKHIyMjgzNzEpOiBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6ZGVsZXRl QWxsQ29va2llcyBkb2Vzbid0IGRlbGV0ZSBzb21lIGNvb2tpZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dheWxhbmQvV2xVbmlxdWVQdHIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dheWxhbmQvV2xVbmlxdWVQdHIuaAppbmRleCAw M2QyZGFiNTk5YTAzZTZlZTcyYTFlNjc5ODU2NDA2OWU5ZmM2NDJmLi41MDZjNzdkNmU2MzE3YTM4 Yjk3YmRlMDJhN2Q4MDU5MjVkNmMxMDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93YXlsYW5kL1dsVW5pcXVlUHRyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9XbFVuaXF1ZVB0ci5oCkBAIC0zOCw4ICszOCwxMSBA QCBzdHJ1Y3QgV2xQdHJEZWxldGVyIHsKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB1c2luZyBXbFVu aXF1ZVB0ciA9IHN0ZDo6dW5pcXVlX3B0cjxULCBXbFB0ckRlbGV0ZXI8VD4+OwogCisvLyB3bF9k aXNwbGF5IGlzIG9taXR0ZWQgYmVjYXVzZSB0aGVyZSBhcmUgdHdvIGRpZmZlcmVudCBkZXN0cnVj dGlvbiBmdW5jdGlvbnMsCisvLyB3bF9kaXNwbGF5X2Rpc2Nvbm5lY3QoKSBmb3IgdGhlIGNsaWVu dCBwcm9jZXNzIEFQSSBhbmQgd2xfZGlzcGxheV9kZXN0cm95KCkKKy8vIGZvciB0aGUgc2VydmVy IHByb2Nlc3MgQVBJLiBXZWJLaXQgdXNlcyBib3RoLCBzbyBzcGVjaWFsaXppbmcgYSBkZWxldGVy IGhlcmUKKy8vIHdvdWxkIGJlIGEgZm9vdGd1bi4KICNkZWZpbmUgRk9SX0VBQ0hfV0FZTEFORF9E RUxFVEVSKG1hY3JvKSBcCi0gICAgbWFjcm8oc3RydWN0IHdsX2Rpc3BsYXksIHdsX2Rpc3BsYXlf ZGVzdHJveSkgXAogICAgIG1hY3JvKHN0cnVjdCB3bF9nbG9iYWwsIHdsX2dsb2JhbF9kZXN0cm95 KSBcCiAgICAgbWFjcm8oc3RydWN0IHdsX3N1cmZhY2UsIHdsX3N1cmZhY2VfZGVzdHJveSkgXAog ICAgIG1hY3JvKHN0cnVjdCB3bF9jb21wb3NpdG9yLCB3bF9jb21wb3NpdG9yX2Rlc3Ryb3kpIFwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5kQ29tcG9zaXRv ci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuY3Bw CmluZGV4IDBkYzdmMDQxNjdmMDQ1YTA2ODZiNTM1YzFjOTIxMzMxNmNhYTk1NWQuLjZiMzM5ZTAw OTE0MDY5Yzk3OTBhOThjZmNmNTNkMzFiZTY3YTk2ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5kQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmNwcApAQCAtNDc2LDcgKzQ3Niw3IEBA IHN0YXRpYyBHUmVmUHRyPEdTb3VyY2U+IGNyZWF0ZVdheWxhbmRMb29wU291cmNlKHN0cnVjdCB3 bF9kaXNwbGF5KiBkaXNwbGF5KQogCiBXYXlsYW5kQ29tcG9zaXRvcjo6V2F5bGFuZENvbXBvc2l0 b3IoKQogewotICAgIFdsVW5pcXVlUHRyPHN0cnVjdCB3bF9kaXNwbGF5PiBkaXNwbGF5KHdsX2Rp c3BsYXlfY3JlYXRlKCkpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxzdHJ1Y3Qgd2xfZGlzcGxheSwg RGlzcGxheURlbGV0ZXI+IGRpc3BsYXkod2xfZGlzcGxheV9jcmVhdGUoKSk7CiAgICAgaWYgKCFk aXNwbGF5KSB7CiAgICAgICAgIFdURkxvZ0Fsd2F5cygiTmVzdGVkIFdheWxhbmQgY29tcG9zaXRv ciBjb3VsZCBub3QgY3JlYXRlIGRpc3BsYXkgb2JqZWN0Iik7CiAgICAgICAgIHJldHVybjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5kQ29tcG9zaXRvci5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmgKaW5kZXgg MGZiYTFhMjY2MGFiY2UxODYzYTk2NWIxODU0ODk5N2MxYWFhZDM3Ni4uYWE5MzMzNDNlYzgxNzIy ODAwMGEwNjVhY2YzMzM2ZjE2MjZjNTNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDxX ZWJDb3JlL1JlZlB0ckNhaXJvLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XbFVuaXF1ZVB0ci5oPgog I2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDx3YXlsYW5kLXNlcnZlci5oPgogI2luY2x1 ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5j bHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CkBAIC0xMjMsNyArMTI0LDEyIEBAIHByaXZhdGU6CiAg ICAgYm9vbCBpbml0aWFsaXplRUdMKCk7CiAKICAgICBTdHJpbmcgbV9kaXNwbGF5TmFtZTsKLSAg ICBXZWJDb3JlOjpXbFVuaXF1ZVB0cjxzdHJ1Y3Qgd2xfZGlzcGxheT4gbV9kaXNwbGF5OworCisg ICAgc3RydWN0IERpc3BsYXlEZWxldGVyIHsKKyAgICAgICAgdm9pZCBvcGVyYXRvcigpIChzdHJ1 Y3Qgd2xfZGlzcGxheSogZGlzcGxheSkgeyB3bF9kaXNwbGF5X2Rlc3Ryb3koZGlzcGxheSk7IH0K KyAgICB9OworICAgIHN0ZDo6dW5pcXVlX3B0cjxzdHJ1Y3Qgd2xfZGlzcGxheSwgRGlzcGxheURl bGV0ZXI+IG1fZGlzcGxheTsKKwogICAgIFdlYkNvcmU6OldsVW5pcXVlUHRyPHN0cnVjdCB3bF9n bG9iYWw+IG1fY29tcG9zaXRvckdsb2JhbDsKICAgICBXZWJDb3JlOjpXbFVuaXF1ZVB0cjxzdHJ1 Y3Qgd2xfZ2xvYmFsPiBtX3dlYmtpdGd0a0dsb2JhbDsKICAgICBHUmVmUHRyPEdTb3VyY2U+IG1f ZXZlbnRTb3VyY2U7Cg==