217706 2020-10-14 07:03:54 -0700 [macOS] Issue sandbox extension to additional icon service when attachment element is enabled. 2020-10-14 15:19:25 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan webkit-unassigned bfulgham webkit-bug-importer oldest_to_newest 1697700 0 pvollan 2020-10-14 07:03:54 -0700 Issue sandbox extension to 'com.apple.iconservices.store' when attachment element is enabled on macOS. 1697702 1 webkit-bug-importer 2020-10-14 07:04:16 -0700 <rdar://problem/70291100> 1697705 2 411319 pvollan 2020-10-14 07:12:14 -0700 Created attachment 411319 Patch 1697890 3 411319 bfulgham 2020-10-14 14:42:36 -0700 Comment on attachment 411319 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411319&action=review r=me > Source/WebKit/UIProcess/WebPageProxy.cpp:7843 > + parameters.attachmentElementExtensionHandles = SandboxExtension::createHandlesForMachLookup(attachmentElementServices(), WTF::nullopt); Much tidier! 1697891 4 411375 pvollan 2020-10-14 14:44:52 -0700 Created attachment 411375 Patch 1697892 5 411375 pvollan 2020-10-14 14:46:04 -0700 Comment on attachment 411375 Patch Thanks for reviewing! 1697913 6 ews-feeder 2020-10-14 15:19:24 -0700 Committed r268492: <https://trac.webkit.org/changeset/268492> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411375. 411319 2020-10-14 07:12:14 -0700 2020-10-14 14:42:36 -0700 Patch 217706.patch text/plain 6221 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjg0NTYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDIwLTEwLTE0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi b3ggZXh0ZW5zaW9uIHRvIGFkZGl0aW9uYWwgaWNvbiBzZXJ2aWNlIHdoZW4gYXR0YWNobWVudCBl bGVtZW50IGlzIGVuYWJsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTc3MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMjkxMTAwPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElzc3VlIHNhbmRi b3ggZXh0ZW5zaW9uIHRvICdjb20uYXBwbGUuaWNvbnNlcnZpY2VzLnN0b3JlJyB3aGVuIGF0dGFj aG1lbnQgZWxlbWVudCBpcyBlbmFibGVkIG9uIG1hY09TLgorCisgICAgICAgICogU2hhcmVkL1dl YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OmF0dGFjaG1lbnRFbGVtZW50U2VydmljZXMpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmNyZWF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29tLmFwcGxlLldl YlByb2Nlc3Muc2IuaW46CisKIDIwMjAtMTAtMTQgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJr QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCB0aGUgYnVpbGQgd2Fybmlu ZyBiZWxvdyBzaW5jZSByMjY4MzEyLgpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHJldmlzaW9uIDI2ODQ1NCkKKysrIFNv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC05Nyw4ICs5Nyw3IEBACiAjZW5kaWYKIAogI2lmIEVOQUJMRShBVFRBQ0hNRU5U X0VMRU1FTlQpCi0gICAgZW5jb2RlciA8PCBmcm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlOwotICAg IGVuY29kZXIgPDwgaWNvblNlcnZpY2VzRXh0ZW5zaW9uSGFuZGxlOworICAgIGVuY29kZXIgPDwg YXR0YWNobWVudEVsZW1lbnRFeHRlbnNpb25IYW5kbGVzOwogI2VuZGlmCiAKICNpZiBQTEFURk9S TShJT1NfRkFNSUxZKQpAQCAtMzI4LDE3ICszMjcsMTEgQEAKICNlbmRpZgogCiAjaWYgRU5BQkxF KEFUVEFDSE1FTlRfRUxFTUVOVCkKLSAgICBPcHRpb25hbDxPcHRpb25hbDxTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGU+PiBmcm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlOwotICAgIGRlY29kZXIgPj4g ZnJvbnRib2FyZEV4dGVuc2lvbkhhbmRsZTsKLSAgICBpZiAoIWZyb250Ym9hcmRFeHRlbnNpb25I YW5kbGUpCisgICAgT3B0aW9uYWw8T3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlQXJy YXk+PiBhdHRhY2htZW50RWxlbWVudEV4dGVuc2lvbkhhbmRsZXM7CisgICAgZGVjb2RlciA+PiBh dHRhY2htZW50RWxlbWVudEV4dGVuc2lvbkhhbmRsZXM7CisgICAgaWYgKCFhdHRhY2htZW50RWxl bWVudEV4dGVuc2lvbkhhbmRsZXMpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAg cGFyYW1ldGVycy5mcm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZSgqZnJvbnRib2Fy ZEV4dGVuc2lvbkhhbmRsZSk7Ci0KLSAgICBPcHRpb25hbDxPcHRpb25hbDxTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGU+PiBpY29uU2VydmljZXNFeHRlbnNpb25IYW5kbGU7Ci0gICAgZGVjb2RlciA+ PiBpY29uU2VydmljZXNFeHRlbnNpb25IYW5kbGU7Ci0gICAgaWYgKCFpY29uU2VydmljZXNFeHRl bnNpb25IYW5kbGUpCi0gICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgcGFyYW1ldGVy cy5pY29uU2VydmljZXNFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKCppY29uU2VydmljZXNFeHRl bnNpb25IYW5kbGUpOworICAgIHBhcmFtZXRlcnMuYXR0YWNobWVudEVsZW1lbnRFeHRlbnNpb25I YW5kbGVzID0gV1RGTW92ZSgqYXR0YWNobWVudEVsZW1lbnRFeHRlbnNpb25IYW5kbGVzKTsKICNl bmRpZgogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHJldmlzaW9uIDI2ODQ1NCkK KysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAkod29y a2luZyBjb3B5KQpAQCAtMTU4LDggKzE1OCw3IEBACiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6Vmll d3BvcnRBcmd1bWVudHM+IG92ZXJyaWRlVmlld3BvcnRBcmd1bWVudHM7CiAjZW5kaWYKICNpZiBF TkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQotICAgIE9wdGlvbmFsPFNhbmRib3hFeHRlbnNpb246 OkhhbmRsZT4gZnJvbnRib2FyZEV4dGVuc2lvbkhhbmRsZTsKLSAgICBPcHRpb25hbDxTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGU+IGljb25TZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZTsKKyAgICBPcHRp b25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheT4gYXR0YWNobWVudEVsZW1lbnRFeHRl bnNpb25IYW5kbGVzOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBXZWJD b3JlOjpGbG9hdFNpemUgc2NyZWVuU2l6ZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMjY4NDU0KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzY1Nyw2ICs3NjU3LDIy IEBACiAgICAgbV9wcm9jZXNzLT5wcm9jZXNzVGVybWluYXRlZCgpOwogfQogCisjaWYgRU5BQkxF KEFUVEFDSE1FTlRfRUxFTUVOVCkgJiYgUExBVEZPUk0oQ09DT0EpCitzdGF0aWMgY29uc3QgVmVj dG9yPEFTQ0lJTGl0ZXJhbD4mIGF0dGFjaG1lbnRFbGVtZW50U2VydmljZXMoKQoreworICAgIHN0 YXRpYyBjb25zdCBhdXRvIHNlcnZpY2VzID0gbWFrZU5ldmVyRGVzdHJveWVkKFZlY3RvcjxBU0NJ SUxpdGVyYWw+IHsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAiY29tLmFwcGxl LmZyb250Ym9hcmQuc3lzdGVtYXBwc2VydmljZXMiX3MsCisjZW5kaWYKKyAgICAgICAgImNvbS5h cHBsZS5pY29uc2VydmljZXMiX3MsCisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICAiY29tLmFw cGxlLmljb25zZXJ2aWNlcy5zdG9yZSJfcywKKyNlbmRpZgorICAgIH0pOworICAgIHJldHVybiBz ZXJ2aWNlczsKK30KKyNlbmRpZgorCiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQ cm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJvY2VzcywgRHJhd2lu Z0FyZWFQcm94eSYgZHJhd2luZ0FyZWEsIFJlZlB0cjxBUEk6OldlYnNpdGVQb2xpY2llcz4mJiB3 ZWJzaXRlUG9saWNpZXMpCiB7CiAgICAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBwYXJhbWV0 ZXJzOwpAQCAtNzgyNCwxMyArNzg0MCw3IEBACiAKICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVN RU5UKSAmJiBQTEFURk9STShDT0NPQSkKICAgICBpZiAobV9wcmVmZXJlbmNlcy0+YXR0YWNobWVu dEVsZW1lbnRFbmFibGVkKCkgJiYgIW1fcHJvY2Vzcy0+aGFzSXNzdWVkQXR0YWNobWVudEVsZW1l bnRSZWxhdGVkU2FuZGJveEV4dGVuc2lvbnMoKSkgewotICAgICAgICBTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGUgaGFuZGxlOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgICAgIFNhbmRi b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAoImNvbS5hcHBsZS5mcm9udGJv YXJkLnN5c3RlbWFwcHNlcnZpY2VzIl9zLCBXVEY6Om51bGxvcHQsIGhhbmRsZSk7Ci0gICAgICAg IHBhcmFtZXRlcnMuZnJvbnRib2FyZEV4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUoaGFuZGxlKTsK LSNlbmRpZgotICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9v a3VwKCJjb20uYXBwbGUuaWNvbnNlcnZpY2VzIl9zLCBXVEY6Om51bGxvcHQsIGhhbmRsZSk7Ci0g ICAgICAgIHBhcmFtZXRlcnMuaWNvblNlcnZpY2VzRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZSho YW5kbGUpOworICAgICAgICBwYXJhbWV0ZXJzLmF0dGFjaG1lbnRFbGVtZW50RXh0ZW5zaW9uSGFu ZGxlcyA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZXNGb3JNYWNoTG9va3VwKGF0dGFj aG1lbnRFbGVtZW50U2VydmljZXMoKSwgV1RGOjpudWxsb3B0KTsKICAgICAgICAgbV9wcm9jZXNz LT5zZXRIYXNJc3N1ZWRBdHRhY2htZW50RWxlbWVudFJlbGF0ZWRTYW5kYm94RXh0ZW5zaW9ucygp OwogICAgIH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDI2ODQ1NCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzEsMTAgKzU3MSw4 IEBACiAgICAgICAgIENyb3NzT3JpZ2luQWNjZXNzQ29udHJvbENoZWNrRGlzYWJsZXI6OnNpbmds ZXRvbigpLnNldENyb3NzT3JpZ2luQWNjZXNzQ29udHJvbENoZWNrRW5hYmxlZChmYWxzZSk7CiAK ICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQotICAgIGlmIChwYXJhbWV0ZXJzLmZyb250 Ym9hcmRFeHRlbnNpb25IYW5kbGUpCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNvbnN1bWVQ ZXJtYW5lbnRseSgqcGFyYW1ldGVycy5mcm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlKTsKLSAgICBp ZiAocGFyYW1ldGVycy5pY29uU2VydmljZXNFeHRlbnNpb25IYW5kbGUpCi0gICAgICAgIFNhbmRi b3hFeHRlbnNpb246OmNvbnN1bWVQZXJtYW5lbnRseSgqcGFyYW1ldGVycy5pY29uU2VydmljZXNF eHRlbnNpb25IYW5kbGUpOworICAgIGlmIChwYXJhbWV0ZXJzLmF0dGFjaG1lbnRFbGVtZW50RXh0 ZW5zaW9uSGFuZGxlcykKKyAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVu dGx5KCpwYXJhbWV0ZXJzLmF0dGFjaG1lbnRFbGVtZW50RXh0ZW5zaW9uSGFuZGxlcyk7CiAjZW5k aWYKIAogICAgIG1fcGFnZSA9IG1ha2VVbmlxdWU8UGFnZT4oV1RGTW92ZShwYWdlQ29uZmlndXJh dGlvbikpOwo= 411375 2020-10-14 14:44:52 -0700 2020-10-14 15:19:24 -0700 Patch 217706.patch text/plain 6749 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjg0NTYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDIwLTEwLTE0ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIElzc3VlIHNhbmRi b3ggZXh0ZW5zaW9uIHRvIGFkZGl0aW9uYWwgaWNvbiBzZXJ2aWNlIHdoZW4gYXR0YWNobWVudCBl bGVtZW50IGlzIGVuYWJsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTc3MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMjkxMTAwPgorCisg ICAgICAgIFJldmlld2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgSXNzdWUgc2FuZGJv eCBleHRlbnNpb24gdG8gJ2NvbS5hcHBsZS5pY29uc2VydmljZXMuc3RvcmUnIHdoZW4gYXR0YWNo bWVudCBlbGVtZW50IGlzIGVuYWJsZWQgb24gbWFjT1MuCisKKyAgICAgICAgKiBTaGFyZWQvV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRl cnM6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6YXR0YWNobWVudEVsZW1lbnRTZXJ2aWNlcyk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb20uYXBwbGUuV2Vi UHJvY2Vzcy5zYi5pbjoKKwogMjAyMC0xMC0xNCAgSm9vbmdodW4gUGFyayAgPGpoNzE4LnBhcmtA c2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IHRoZSBidWlsZCB3YXJuaW5n IGJlbG93IHNpbmNlIHIyNjgzMTIuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjY4NDU0KQorKysgU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTk3LDggKzk3LDcgQEAKICNlbmRpZgogCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRf RUxFTUVOVCkKLSAgICBlbmNvZGVyIDw8IGZyb250Ym9hcmRFeHRlbnNpb25IYW5kbGU7Ci0gICAg ZW5jb2RlciA8PCBpY29uU2VydmljZXNFeHRlbnNpb25IYW5kbGU7CisgICAgZW5jb2RlciA8PCBh dHRhY2htZW50RWxlbWVudEV4dGVuc2lvbkhhbmRsZXM7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCkBAIC0zMjgsMTcgKzMyNywxMSBAQAogI2VuZGlmCiAKICNpZiBFTkFCTEUo QVRUQUNITUVOVF9FTEVNRU5UKQotICAgIE9wdGlvbmFsPE9wdGlvbmFsPFNhbmRib3hFeHRlbnNp b246OkhhbmRsZT4+IGZyb250Ym9hcmRFeHRlbnNpb25IYW5kbGU7Ci0gICAgZGVjb2RlciA+PiBm cm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlOwotICAgIGlmICghZnJvbnRib2FyZEV4dGVuc2lvbkhh bmRsZSkKKyAgICBPcHRpb25hbDxPcHRpb25hbDxTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJh eT4+IGF0dGFjaG1lbnRFbGVtZW50RXh0ZW5zaW9uSGFuZGxlczsKKyAgICBkZWNvZGVyID4+IGF0 dGFjaG1lbnRFbGVtZW50RXh0ZW5zaW9uSGFuZGxlczsKKyAgICBpZiAoIWF0dGFjaG1lbnRFbGVt ZW50RXh0ZW5zaW9uSGFuZGxlcykKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICBw YXJhbWV0ZXJzLmZyb250Ym9hcmRFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKCpmcm9udGJvYXJk RXh0ZW5zaW9uSGFuZGxlKTsKLQotICAgIE9wdGlvbmFsPE9wdGlvbmFsPFNhbmRib3hFeHRlbnNp b246OkhhbmRsZT4+IGljb25TZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZTsKLSAgICBkZWNvZGVyID4+ IGljb25TZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZTsKLSAgICBpZiAoIWljb25TZXJ2aWNlc0V4dGVu c2lvbkhhbmRsZSkKLSAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKLSAgICBwYXJhbWV0ZXJz Lmljb25TZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZSA9IFdURk1vdmUoKmljb25TZXJ2aWNlc0V4dGVu c2lvbkhhbmRsZSk7CisgICAgcGFyYW1ldGVycy5hdHRhY2htZW50RWxlbWVudEV4dGVuc2lvbkhh bmRsZXMgPSBXVEZNb3ZlKCphdHRhY2htZW50RWxlbWVudEV4dGVuc2lvbkhhbmRsZXMpOwogI2Vu ZGlmCiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQpJbmRleDogU291cmNlL1dlYktpdC9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAkocmV2aXNpb24gMjY4NDU0KQor KysgU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNTgsOCArMTU4LDcgQEAKICAgICBPcHRpb25hbDxXZWJDb3JlOjpWaWV3 cG9ydEFyZ3VtZW50cz4gb3ZlcnJpZGVWaWV3cG9ydEFyZ3VtZW50czsKICNlbmRpZgogI2lmIEVO QUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCi0gICAgT3B0aW9uYWw8U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlPiBmcm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlOwotICAgIE9wdGlvbmFsPFNhbmRib3hF eHRlbnNpb246OkhhbmRsZT4gaWNvblNlcnZpY2VzRXh0ZW5zaW9uSGFuZGxlOworICAgIE9wdGlv bmFsPFNhbmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5PiBhdHRhY2htZW50RWxlbWVudEV4dGVu c2lvbkhhbmRsZXM7CiAjZW5kaWYKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIFdlYkNv cmU6OkZsb2F0U2l6ZSBzY3JlZW5TaXplOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyNjg0NTQpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NjU3LDYgKzc2NTcsMjIg QEAKICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NUZXJtaW5hdGVkKCk7CiB9CiAKKyNpZiBFTkFCTEUo QVRUQUNITUVOVF9FTEVNRU5UKSAmJiBQTEFURk9STShDT0NPQSkKK3N0YXRpYyBjb25zdCBWZWN0 b3I8QVNDSUlMaXRlcmFsPiYgYXR0YWNobWVudEVsZW1lbnRTZXJ2aWNlcygpCit7CisgICAgc3Rh dGljIGNvbnN0IGF1dG8gc2VydmljZXMgPSBtYWtlTmV2ZXJEZXN0cm95ZWQoVmVjdG9yPEFTQ0lJ TGl0ZXJhbD4geworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgICAgICJjb20uYXBwbGUu ZnJvbnRib2FyZC5zeXN0ZW1hcHBzZXJ2aWNlcyJfcywKKyNlbmRpZgorICAgICAgICAiY29tLmFw cGxlLmljb25zZXJ2aWNlcyJfcywKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgICJjb20uYXBw bGUuaWNvbnNlcnZpY2VzLnN0b3JlIl9zLAorI2VuZGlmCisgICAgfSk7CisgICAgcmV0dXJuIHNl cnZpY2VzOworfQorI2VuZGlmCisKIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVBy b3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCBEcmF3aW5n QXJlYVByb3h5JiBkcmF3aW5nQXJlYSwgUmVmUHRyPEFQSTo6V2Vic2l0ZVBvbGljaWVzPiYmIHdl YnNpdGVQb2xpY2llcykKIHsKICAgICBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRl cnM7CkBAIC03ODI0LDEzICs3ODQwLDcgQEAKIAogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1F TlQpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX3ByZWZlcmVuY2VzLT5hdHRhY2htZW50 RWxlbWVudEVuYWJsZWQoKSAmJiAhbV9wcm9jZXNzLT5oYXNJc3N1ZWRBdHRhY2htZW50RWxlbWVu dFJlbGF0ZWRTYW5kYm94RXh0ZW5zaW9ucygpKSB7Ci0gICAgICAgIFNhbmRib3hFeHRlbnNpb246 OkhhbmRsZSBoYW5kbGU7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgU2FuZGJv eEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9yTWFjaExvb2t1cCgiY29tLmFwcGxlLmZyb250Ym9h cmQuc3lzdGVtYXBwc2VydmljZXMiX3MsIFdURjo6bnVsbG9wdCwgaGFuZGxlKTsKLSAgICAgICAg cGFyYW1ldGVycy5mcm9udGJvYXJkRXh0ZW5zaW9uSGFuZGxlID0gV1RGTW92ZShoYW5kbGUpOwot I2VuZGlmCi0gICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29r dXAoImNvbS5hcHBsZS5pY29uc2VydmljZXMiX3MsIFdURjo6bnVsbG9wdCwgaGFuZGxlKTsKLSAg ICAgICAgcGFyYW1ldGVycy5pY29uU2VydmljZXNFeHRlbnNpb25IYW5kbGUgPSBXVEZNb3ZlKGhh bmRsZSk7CisgICAgICAgIHBhcmFtZXRlcnMuYXR0YWNobWVudEVsZW1lbnRFeHRlbnNpb25IYW5k bGVzID0gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlc0Zvck1hY2hMb29rdXAoYXR0YWNo bWVudEVsZW1lbnRTZXJ2aWNlcygpLCBXVEY6Om51bGxvcHQpOwogICAgICAgICBtX3Byb2Nlc3Mt PnNldEhhc0lzc3VlZEF0dGFjaG1lbnRFbGVtZW50UmVsYXRlZFNhbmRib3hFeHRlbnNpb25zKCk7 CiAgICAgfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMjY4NDU0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3MSwxMCArNTcxLDgg QEAKICAgICAgICAgQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9sQ2hlY2tEaXNhYmxlcjo6c2luZ2xl dG9uKCkuc2V0Q3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9sQ2hlY2tFbmFibGVkKGZhbHNlKTsKIAog I2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCi0gICAgaWYgKHBhcmFtZXRlcnMuZnJvbnRi b2FyZEV4dGVuc2lvbkhhbmRsZSkKLSAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBl cm1hbmVudGx5KCpwYXJhbWV0ZXJzLmZyb250Ym9hcmRFeHRlbnNpb25IYW5kbGUpOwotICAgIGlm IChwYXJhbWV0ZXJzLmljb25TZXJ2aWNlc0V4dGVuc2lvbkhhbmRsZSkKLSAgICAgICAgU2FuZGJv eEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KCpwYXJhbWV0ZXJzLmljb25TZXJ2aWNlc0V4 dGVuc2lvbkhhbmRsZSk7CisgICAgaWYgKHBhcmFtZXRlcnMuYXR0YWNobWVudEVsZW1lbnRFeHRl bnNpb25IYW5kbGVzKQorICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50 bHkoKnBhcmFtZXRlcnMuYXR0YWNobWVudEVsZW1lbnRFeHRlbnNpb25IYW5kbGVzKTsKICNlbmRp ZgogCiAgICAgbV9wYWdlID0gbWFrZVVuaXF1ZTxQYWdlPihXVEZNb3ZlKHBhZ2VDb25maWd1cmF0 aW9uKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nl c3Muc2IuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvbS5hcHBs ZS5XZWJQcm9jZXNzLnNiLmluCShyZXZpc2lvbiAyNjg0NTQpCisrKyBTb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvY29tLmFwcGxlLldlYlByb2Nlc3Muc2IuaW4JKHdvcmtpbmcgY29weSkKQEAgLTk5 OSw2ICs5OTksNyBAQAogICAgICAgICAgICAgImNvbS5hcHBsZS5jb250YWluZXJtYW5hZ2VyZCIK ICAgICAgICAgICAgICJjb20uYXBwbGUuZGlhZ25vc3RpY2QiCiAgICAgICAgICAgICAiY29tLmFw cGxlLmljb25zZXJ2aWNlcyIKKyAgICAgICAgICAgICJjb20uYXBwbGUuaWNvbnNlcnZpY2VzLnN0 b3JlIgogICAgICAgICAgICAgImNvbS5hcHBsZS50Y2NkIgogICAgICAgICAgICAgImNvbS5hcHBs ZS5CbHVldG9vdGhTZXJ2aWNlcyIKIAo=