164103 2016-10-27 19:08:31 -0700 PluginInfoStore::loadPluginsIfNecessary can still load plugins multiple times 2016-11-02 02:52:02 -0700 1 1 1 Unclassified WebKit Plug-ins Other PC Linux RESOLVED FIXED https://bugzilla.gnome.org/show_bug.cgi?id=756334 https://bugs.webkit.org/show_bug.cgi?id=47677 P2 Normal --- 1 mcatanzaro webkit-unassigned bugs-noreply cgarcia commit-queue mcatanzaro oldest_to_newest 1245397 0 mcatanzaro 2016-10-27 19:08:31 -0700 PluginInfoStore::loadPluginsIfNecessary is trying hard to make sure plugin paths are unique, but it's possible for two unique paths to refer to the same directory. For instance, on Arch, /usr/lib64 is a symlink to /usr/lib. So all plugins that we find when scanning /usr/lib64/mozilla/plugins/ get found again when scanning /usr/lib/mozilla/plugins/ because it's the same directory. 1246414 1 cgarcia 2016-10-31 07:20:44 -0700 I guess we could follow symlinks when adding paths to uniquePluginPaths 1246415 2 cgarcia 2016-10-31 07:33:24 -0700 Looking at about:plugins in firefox, it seems they follow symlinks, because the plugin path they show is always the symlink destination. 1246459 3 293429 cgarcia 2016-10-31 09:39:03 -0700 Created attachment 293429 Patch 1246463 4 commit-queue 2016-10-31 09:41:13 -0700 This patch modifies one of the wasm.json files. Please ensure that any changes in one have been mirrored to the other. You can find the wasm.json files at "Source/JavaScriptCore/wasm/wasm.json" and "JSTests/wasm/wasm.json". 1246481 5 293429 mcatanzaro 2016-10-31 10:42:28 -0700 Comment on attachment 293429 Patch Wow, the readlink API is terrible. 1246482 6 mcatanzaro 2016-10-31 10:44:22 -0700 Don't break EFL, looks like a missing #include: ../../Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: In function 'WTF::String WebKit::followSymlink(const WTF::String&)': ../../Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:69:50: error: 'filenameToString' was not declared in this scope return filenameToString(buffer.data()); ^ Also a question: this works not only when the last component of the pathname is not a symlink, but also when an intermediate component is a symlink, right? Since that's the case we're trying to fix. 1246875 7 293429 cgarcia 2016-11-01 04:34:15 -0700 Comment on attachment 293429 Patch Good point, we readlink only works if the given path is a link, we need realpath instead. 1246876 8 293548 cgarcia 2016-11-01 04:47:08 -0700 Created attachment 293548 Updated patch using realpath The patch is indeed simpler now :-) 1246877 9 293549 cgarcia 2016-11-01 04:55:07 -0700 Created attachment 293549 Fix EFL build filenameToString is GTK+ specific. 1246880 10 293549 mcatanzaro 2016-11-01 05:17:54 -0700 Comment on attachment 293549 Fix EFL build View in context: https://bugs.webkit.org/attachment.cgi?id=293549&action=review Bonus points if you tested this manually. > Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:64 > + String pluginPath = String::fromUTF8(normalizedPath); Looking at the comment above the definition of filenameToString, I think it'd be better to copy that function into FileSystemEfl and use it here unconditionally. 1247266 11 cgarcia 2016-11-02 02:47:41 -0700 (In reply to comment #10) > Comment on attachment 293549 [details] > Fix EFL build > > View in context: > https://bugs.webkit.org/attachment.cgi?id=293549&action=review > > Bonus points if you tested this manually. > > > Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:64 > > + String pluginPath = String::fromUTF8(normalizedPath); > > Looking at the comment above the definition of filenameToString, I think > it'd be better to copy that function into FileSystemEfl and use it here > unconditionally. We already have that :-P stringFromFileSystemRepresentation() 1247267 12 cgarcia 2016-11-02 02:52:02 -0700 Committed r208273: <http://trac.webkit.org/changeset/208273> 293429 2016-10-31 09:39:03 -0700 2016-11-01 04:47:08 -0700 Patch wk2-plugins-duplicated.diff text/plain 3363 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0YTY4OTEwLi4wZWY1OTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTYtMTAtMzEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbnNJZk5lY2Vzc2FyeSBjYW4g c3RpbGwgbG9hZCBwbHVnaW5zIG11bHRpcGxlIHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQxMDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3cgc3ltbGlua3Mgd2hlbiBzY2FubmluZyBw bHVnaW5zIHRvIGF2b2lkIGR1cGxpY2F0ZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lu cy9ndGsvUGx1Z2luSW5mb0NhY2hlLmNwcDogQnVtcCB0aGUgY2FjaGUgdmVyc2lvbiB0byBlbnN1 cmUgZHVwbGljYXRlZCBwbHVnaW5zIGFyZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hl LgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3JlVW5peC5j cHA6CisgICAgICAgIChXZWJLaXQ6OmZvbGxvd1N5bWxpbmspOiBIZWxwZXIgZnVuY3Rpb24gdG8g cmVhZCB0aGUgbGluay4KKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpwbHVnaW5Q YXRoc0luRGlyZWN0b3J5KTogQ2FsbCBmb2xsb3dTeW1saW5rIHRoYXQgYWx3YXlzIHJldHVybiB0 aGUgYWN0dWFsIGZpbGUgcGF0aC4KKworMjAxNi0xMC0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgTmV0d29ya1Nlc3Npb246IE5ldHdvcmsg cHJvY2VzcyBjcmFzaCB3aGVuIGNvbnZlcnRpbmcgbWFpbiByZXNvdXJjZSB0byBkb3dubG9hZAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY0MjIwCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL2d0ay9QbHVnaW5J bmZvQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdp bkluZm9DYWNoZS5jcHAKaW5kZXggNjRiNGNhYy4uMjI3MGNiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAK QEAgLTM1LDcgKzM1LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0YXRpYyBjb25zdCB1 bnNpZ25lZCBnU2NoZW1hVmVyc2lvbiA9IDI7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgZ1NjaGVt YVZlcnNpb24gPSAzOwogCiBQbHVnaW5JbmZvQ2FjaGUmIFBsdWdpbkluZm9DYWNoZTo6c2luZ2xl dG9uKCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3Vu aXgvUGx1Z2luSW5mb1N0b3JlVW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1 Z2lucy91bml4L1BsdWdpbkluZm9TdG9yZVVuaXguY3BwCmluZGV4IDM1YWZlOWYuLjk3ODA5NTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2lu SW5mb1N0b3JlVW5peC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv dW5peC9QbHVnaW5JbmZvU3RvcmVVbml4LmNwcApAQCAtNDksMTQgKzQ5LDQwIEBAIFZlY3RvcjxT dHJpbmc+IFBsdWdpbkluZm9TdG9yZTo6cGx1Z2luc0RpcmVjdG9yaWVzKCkKICAgICByZXR1cm4g V2ViS2l0OjpwbHVnaW5zRGlyZWN0b3JpZXMoKTsKIH0KIAorc3RhdGljIFN0cmluZyBmb2xsb3dT eW1saW5rKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBDU3RyaW5nIGZpbGVuYW1lID0gZmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhdGgpOworICAgIFZlY3RvcjxjaGFyPiBidWZmZXIoMjU2 KTsKKyAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICBzc2l6ZV90IHJlc3VsdCA9IHJlYWRsaW5r KGZpbGVuYW1lLmRhdGEoKSwgYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7CisgICAgICAg IGlmIChyZXN1bHQgPT0gLTEpIHsKKyAgICAgICAgICAgIGlmIChlcnJubyA9PSBFSU5WQUwpIHsK KyAgICAgICAgICAgICAgICAvLyBOb3QgYSBzeW1saW5rLCBqdXN0IHJldHVybiB0aGUgcGF0aC4K KyAgICAgICAgICAgICAgICByZXR1cm4gcGF0aDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKHN0YXRpY19jYXN0 PHNpemVfdD4ocmVzdWx0KSA8IGJ1ZmZlci5zaXplKCkpIHsKKyAgICAgICAgICAgIGJ1ZmZlclty ZXN1bHRdID0gJ1wwJzsKKyAgICAgICAgICAgIHJldHVybiBmaWxlbmFtZVRvU3RyaW5nKGJ1ZmZl ci5kYXRhKCkpOworICAgICAgICB9CisKKyAgICAgICAgLy8gQnVmZmVyIHdhcyB0cnVuY2F0ZWQs IHRyeSBhZ2FpbiB3aXRoIGEgbGFyZ2VyIG9uZS4KKyAgICAgICAgYnVmZmVyLmdyb3coYnVmZmVy LnNpemUoKSAqIDIpOworICAgIH0KKworICAgIHJldHVybiBTdHJpbmcoKTsKK30KKwogVmVjdG9y PFN0cmluZz4gUGx1Z2luSW5mb1N0b3JlOjpwbHVnaW5QYXRoc0luRGlyZWN0b3J5KGNvbnN0IFN0 cmluZyYgZGlyZWN0b3J5KQogewogICAgIFZlY3RvcjxTdHJpbmc+IHJlc3VsdDsKLSAgICBWZWN0 b3I8U3RyaW5nPiBwbHVnaW5QYXRocyA9IGxpc3REaXJlY3RvcnkoZGlyZWN0b3J5LCBTdHJpbmco Iiouc28iKSk7Ci0gICAgVmVjdG9yPFN0cmluZz46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHBsdWdp blBhdGhzLmVuZCgpOwotICAgIGZvciAoVmVjdG9yPFN0cmluZz46OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gcGx1Z2luUGF0aHMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGlmIChm aWxlRXhpc3RzKCppdCkpCi0gICAgICAgICAgICByZXN1bHQuYXBwZW5kKCppdCk7CisgICAgZm9y IChjb25zdCBhdXRvJiBwYXRoIDogbGlzdERpcmVjdG9yeShkaXJlY3RvcnksIFN0cmluZygiKi5z byIpKSkgeworICAgICAgICBTdHJpbmcgcGx1Z2luUGF0aCA9IGZvbGxvd1N5bWxpbmsocGF0aCk7 CisgICAgICAgIGlmICghcGx1Z2luUGF0aC5pc051bGwoKSkKKyAgICAgICAgICAgIHJlc3VsdC5h cHBlbmQoV1RGTW92ZShwbHVnaW5QYXRoKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIHJlc3VsdDsK 293548 2016-11-01 04:47:08 -0700 2016-11-01 04:55:07 -0700 Updated patch using realpath wk2-duplicated-plugins.diff text/plain 2719 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNDgzNjU5Li4xNTMzNDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTYtMTAtMzEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbnNJZk5lY2Vzc2FyeSBjYW4g c3RpbGwgbG9hZCBwbHVnaW5zIG11bHRpcGxlIHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQxMDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3cgc3ltbGlua3Mgd2hlbiBzY2FubmluZyBw bHVnaW5zIHRvIGF2b2lkIGR1cGxpY2F0ZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lu cy9ndGsvUGx1Z2luSW5mb0NhY2hlLmNwcDogQnVtcCB0aGUgY2FjaGUgdmVyc2lvbiB0byBlbnN1 cmUgZHVwbGljYXRlZCBwbHVnaW5zIGFyZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hl LgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3JlVW5peC5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6cGx1Z2luUGF0aHNJbkRpcmVj dG9yeSk6IFVzZSByZWFscGF0aCgpIHRvIGFsd2F5cyByZXR1cm4gdGhlIGFjdHVhbCBmaWxlIHBh dGguCisKIDIwMTYtMTEtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIE5ldHdvcmtTZXNzaW9uOiBOZXR3b3JrIHByb2Nlc3MgY3Jhc2ggd2hl biBjb252ZXJ0aW5nIG1haW4gcmVzb3VyY2UgdG8gZG93bmxvYWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL2d0ay9QbHVnaW5JbmZvQ2FjaGUuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKaW5k ZXggNjRiNGNhYy4uMjI3MGNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKQEAgLTM1LDcgKzM1LDcgQEAK IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBnU2NoZW1hVmVy c2lvbiA9IDI7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgZ1NjaGVtYVZlcnNpb24gPSAzOwogCiBQ bHVnaW5JbmZvQ2FjaGUmIFBsdWdpbkluZm9DYWNoZTo6c2luZ2xldG9uKCkKIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3Jl VW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy91bml4L1BsdWdpbklu Zm9TdG9yZVVuaXguY3BwCmluZGV4IDM1YWZlOWYuLjBhOTVjZGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3JlVW5peC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvdW5peC9QbHVnaW5JbmZvU3Rv cmVVbml4LmNwcApAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgIlBsdWdpblNlYXJjaFBhdGgu aCIKICNpbmNsdWRlICJQcm9jZXNzRXhlY3V0YWJsZVBhdGguaCIKICNpbmNsdWRlIDxXZWJDb3Jl L0ZpbGVTeXN0ZW0uaD4KKyNpbmNsdWRlIDxsaW1pdHMuaD4KKyNpbmNsdWRlIDxzdGRsaWIuaD4K IAogI2lmIFBMQVRGT1JNKEdUSykKICNpbmNsdWRlICJQbHVnaW5JbmZvQ2FjaGUuaCIKQEAgLTUy LDExICs1NCwxMSBAQCBWZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbnNEaXJl Y3RvcmllcygpCiBWZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpblBhdGhzSW5E aXJlY3RvcnkoY29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpCiB7CiAgICAgVmVjdG9yPFN0cmluZz4g cmVzdWx0OwotICAgIFZlY3RvcjxTdHJpbmc+IHBsdWdpblBhdGhzID0gbGlzdERpcmVjdG9yeShk aXJlY3RvcnksIFN0cmluZygiKi5zbyIpKTsKLSAgICBWZWN0b3I8U3RyaW5nPjo6Y29uc3RfaXRl cmF0b3IgZW5kID0gcGx1Z2luUGF0aHMuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8U3RyaW5nPjo6 Y29uc3RfaXRlcmF0b3IgaXQgPSBwbHVnaW5QYXRocy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQp IHsKLSAgICAgICAgaWYgKGZpbGVFeGlzdHMoKml0KSkKLSAgICAgICAgICAgIHJlc3VsdC5hcHBl bmQoKml0KTsKKyAgICBjaGFyIG5vcm1hbGl6ZWRQYXRoW1BBVEhfTUFYXTsKKyAgICBmb3IgKGNv bnN0IGF1dG8mIHBhdGggOiBsaXN0RGlyZWN0b3J5KGRpcmVjdG9yeSwgU3RyaW5nKCIqLnNvIikp KSB7CisgICAgICAgIENTdHJpbmcgZmlsZW5hbWUgPSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o cGF0aCk7CisgICAgICAgIGlmIChyZWFscGF0aChmaWxlbmFtZS5kYXRhKCksIG5vcm1hbGl6ZWRQ YXRoKSkKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoZmlsZW5hbWVUb1N0cmluZyhub3JtYWxp emVkUGF0aCkpOwogICAgIH0KIAogICAgIHJldHVybiByZXN1bHQ7Cg== 293549 2016-11-01 04:55:07 -0700 2016-11-01 05:17:54 -0700 Fix EFL build wk2-duplicated-plugins.diff text/plain 2887 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNDgzNjU5Li4xNTMzNDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTYtMTAtMzEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbnNJZk5lY2Vzc2FyeSBjYW4g c3RpbGwgbG9hZCBwbHVnaW5zIG11bHRpcGxlIHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQxMDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3cgc3ltbGlua3Mgd2hlbiBzY2FubmluZyBw bHVnaW5zIHRvIGF2b2lkIGR1cGxpY2F0ZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lu cy9ndGsvUGx1Z2luSW5mb0NhY2hlLmNwcDogQnVtcCB0aGUgY2FjaGUgdmVyc2lvbiB0byBlbnN1 cmUgZHVwbGljYXRlZCBwbHVnaW5zIGFyZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hl LgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3JlVW5peC5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6cGx1Z2luUGF0aHNJbkRpcmVj dG9yeSk6IFVzZSByZWFscGF0aCgpIHRvIGFsd2F5cyByZXR1cm4gdGhlIGFjdHVhbCBmaWxlIHBh dGguCisKIDIwMTYtMTEtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIE5ldHdvcmtTZXNzaW9uOiBOZXR3b3JrIHByb2Nlc3MgY3Jhc2ggd2hl biBjb252ZXJ0aW5nIG1haW4gcmVzb3VyY2UgdG8gZG93bmxvYWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL2d0ay9QbHVnaW5JbmZvQ2FjaGUuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKaW5k ZXggNjRiNGNhYy4uMjI3MGNiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKQEAgLTM1LDcgKzM1LDcgQEAK IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBnU2NoZW1hVmVy c2lvbiA9IDI7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgZ1NjaGVtYVZlcnNpb24gPSAzOwogCiBQ bHVnaW5JbmZvQ2FjaGUmIFBsdWdpbkluZm9DYWNoZTo6c2luZ2xldG9uKCkKIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3Jl VW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy91bml4L1BsdWdpbklu Zm9TdG9yZVVuaXguY3BwCmluZGV4IDM1YWZlOWYuLjI1NWY3ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3VuaXgvUGx1Z2luSW5mb1N0b3JlVW5peC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvdW5peC9QbHVnaW5JbmZvU3Rv cmVVbml4LmNwcApAQCAtMzUsNiArMzUsOCBAQAogI2luY2x1ZGUgIlBsdWdpblNlYXJjaFBhdGgu aCIKICNpbmNsdWRlICJQcm9jZXNzRXhlY3V0YWJsZVBhdGguaCIKICNpbmNsdWRlIDxXZWJDb3Jl L0ZpbGVTeXN0ZW0uaD4KKyNpbmNsdWRlIDxsaW1pdHMuaD4KKyNpbmNsdWRlIDxzdGRsaWIuaD4K IAogI2lmIFBMQVRGT1JNKEdUSykKICNpbmNsdWRlICJQbHVnaW5JbmZvQ2FjaGUuaCIKQEAgLTUy LDExICs1NCwxNyBAQCBWZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbnNEaXJl Y3RvcmllcygpCiBWZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpblBhdGhzSW5E aXJlY3RvcnkoY29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpCiB7CiAgICAgVmVjdG9yPFN0cmluZz4g cmVzdWx0OwotICAgIFZlY3RvcjxTdHJpbmc+IHBsdWdpblBhdGhzID0gbGlzdERpcmVjdG9yeShk aXJlY3RvcnksIFN0cmluZygiKi5zbyIpKTsKLSAgICBWZWN0b3I8U3RyaW5nPjo6Y29uc3RfaXRl cmF0b3IgZW5kID0gcGx1Z2luUGF0aHMuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8U3RyaW5nPjo6 Y29uc3RfaXRlcmF0b3IgaXQgPSBwbHVnaW5QYXRocy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQp IHsKLSAgICAgICAgaWYgKGZpbGVFeGlzdHMoKml0KSkKLSAgICAgICAgICAgIHJlc3VsdC5hcHBl bmQoKml0KTsKKyAgICBjaGFyIG5vcm1hbGl6ZWRQYXRoW1BBVEhfTUFYXTsKKyAgICBmb3IgKGNv bnN0IGF1dG8mIHBhdGggOiBsaXN0RGlyZWN0b3J5KGRpcmVjdG9yeSwgU3RyaW5nKCIqLnNvIikp KSB7CisgICAgICAgIENTdHJpbmcgZmlsZW5hbWUgPSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24o cGF0aCk7CisgICAgICAgIGlmIChyZWFscGF0aChmaWxlbmFtZS5kYXRhKCksIG5vcm1hbGl6ZWRQ YXRoKSkgeworI2lmIFBMQVRGT1JNKEdUSykKKyAgICAgICAgICAgIFN0cmluZyBwbHVnaW5QYXRo ID0gZmlsZW5hbWVUb1N0cmluZyhub3JtYWxpemVkUGF0aCk7CisjZWxzZQorICAgICAgICAgICAg U3RyaW5nIHBsdWdpblBhdGggPSBTdHJpbmc6OmZyb21VVEY4KG5vcm1hbGl6ZWRQYXRoKTsKKyNl bmRpZgorICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChXVEZNb3ZlKHBsdWdpblBhdGgpKTsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIHJldHVybiByZXN1bHQ7Cg==