203065 2019-10-16 17:31:37 -0700 [Clipboard API] [iOS] Refactor logic for suppressing URL data when the pasteboard may contain files 2019-10-16 19:59:34 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1580788 0 wenson_hsieh 2019-10-16 17:31:37 -0700 SSIA 1580799 1 381140 wenson_hsieh 2019-10-16 17:54:05 -0700 Created attachment 381140 Patch 1580838 2 381140 commit-queue 2019-10-16 19:59:33 -0700 Comment on attachment 381140 Patch Clearing flags on attachment: 381140 Committed r251224: <https://trac.webkit.org/changeset/251224> 1580839 3 commit-queue 2019-10-16 19:59:34 -0700 All reviewed patches have been landed. Closing bug. 381140 2019-10-16 17:54:05 -0700 2019-10-16 19:59:33 -0700 Patch bug-203065-20191016175404.patch text/plain 9285 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk0ODU1NTEyNjZhOGFm MGVhODcwMmNkYjcwZmU0ZmZmOWMwZDdmYi4uYWVjMmJiMmYxYTBhODhjZTMxMDRmM2RjZTZkMzZj NDNjY2RiNGZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDE5LTEwLTE2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtDbGlwYm9hcmQg QVBJXSBbaU9TXSBSZWZhY3RvciBsb2dpYyBmb3Igc3VwcHJlc3NpbmcgVVJMIGRhdGEgd2hlbiB0 aGUgcGFzdGVib2FyZCBtYXkgY29udGFpbiBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzMDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUGxhdGZvcm0tc3BlY2lmaWMgcGFzdGVib2FyZCByZWZh Y3RvcmluZyBiZWZvcmUgdGFja2xpbmcgd2Via2l0Lm9yZy9iLzIwMzAyMS4gU2VlIGJlbG93IGZv ciBkZXRhaWxzLiBObyBuZXcKKyAgICAgICAgdGVzdHMsIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBp biBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL1Bhc3RlYm9hcmQuaDoKKyAgICAgICAg KFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmNoYW5nZUNvdW50IGNvbnN0KToKKworICAgICAgICBBZGQg YSBzdHViIGZvciBQYXN0ZWJvYXJkOjpjaGFuZ2VDb3VudCgpIG9uIG5vbi1Db2NvYSBwbGF0Zm9y bXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tOgor ICAgICAgICAoV2ViQ29yZTo6c2FmZVR5cGVGb3JET01Ub1JlYWRBbmRXcml0ZUZvclBsYXRmb3Jt VHlwZSk6CisKKyAgICAgICAgTW92ZSB0aGlzIGhlbHBlciBmdW5jdGlvbiBmYXJ0aGVyIHVwIHRo ZSBmaWxlLCBzbyBpdCBjYW4gYmUgdXNlZCBpbiBtb3JlIHBsYWNlcy4KKworICAgICAgICAoV2Vi Q29yZTo6d2ViU2FmZVR5cGVzKToKKworICAgICAgICBBZGQgYSBzZXBhcmF0ZSBoZWxwZXIgdG8g Y29tcHV0ZSB0aGUgbGlzdCBvZiB3ZWItc2FmZSBNSU1FIHR5cGVzIChmb3IgaW5zdGFuY2UsICJ0 ZXh0L3BsYWluIikgZ2l2ZW4gYSBsaXN0IG9mCisgICAgICAgIHBsYXRmb3JtIHR5cGVzLCBhbmQg YSBmdW5jdGlvbiB0byBkZXRlcm1pbmUgd2hldGhlciB0byBhdm9pZCBleHBvc2luZyBhIGdpdmVu IFVSTCB0byB0aGUgRE9NLgorCisgICAgICAgIChXZWJDb3JlOjpzaG91bGRUcmVhdEF0TGVhc3RP bmVUeXBlQXNGaWxlKToKKworICAgICAgICBTcGxpdCB0aGlzIG91dCBpbnRvIGEgc2VwYXJhdGUg aGVscGVyIGZ1bmN0aW9uLCBzbyB0aGF0IGl0IGNhbiBiZSBpbnZva2VkIHdoZW4gZGV0ZXJtaW5p bmcgd2hldGhlciBhIGdpdmVuCisgICAgICAgIE5TSXRlbVByb3ZpZGVyIGlzIHN1c3BlY3RlZCB0 byBjb250YWluIGZpbGUgcGF0aHMuIEluIHRoZSBjYXNlIHdoZXJlIHdlJ3JlIGdldHRpbmcgdGhl IGZ1bGwgbGlzdCBvZiB0eXBlcyB0aGF0CisgICAgICAgIGFyZSBzYWZlIGZvciB0aGUgRE9NIHRv IHJlYWQsIHdlIHdhbnQgdG8gcGFzcyBpbiB0aGUgZW50aXJlIHBhc3RlYm9hcmQgb2JqZWN0IGFu ZCBpdGVyYXRlIHRocm91Z2ggYWxsIG9mIHRoZQorICAgICAgICBhdmFpbGFibGUgdHlwZXMgaW4g c2VhcmNoIGZvciBzb21ldGhpbmcgdGhhdCBjb3VsZCBmZWFzaWJseSBhY2NvbXBhbnkgYSBmaWxl IFVSTC4KKworICAgICAgICBJbiB0aGUgY2FzZSBvZiBjb21wdXRpbmcgdGhlIHdlYi1zYWZlIHR5 cGVzIHBlciBpdGVtLCB3ZSBvbmx5IGhhdmUgYW4gaXRlbSBwcm92aWRlciwgaW4gd2hpY2ggY2Fz ZSB3ZSBvbmx5CisgICAgICAgIGl0ZXJhdGUgdGhyb3VnaCB0aGUgdHlwZXMgaW4gdGhhdCBOU0l0 ZW1Qcm92aWRlci4gU2VlIGNhbGwgc2l0ZXMgYmVsb3cgZm9yIGV4YW1wbGVzLgorCisgICAgICAg IChXZWJDb3JlOjpQbGF0Zm9ybVBhc3RlYm9hcmQ6OmluZm9ybWF0aW9uRm9ySXRlbUF0SW5kZXgp OgorCisgICAgICAgIEludm9rZSB0aGUgbmV3IGB3ZWJTYWZlVHlwZXNgIGhlbHBlciBtZXRob2Qu CisKKyAgICAgICAgKFdlYkNvcmU6OnBhc3RlYm9hcmRNYXlDb250YWluRmlsZVBhdGhzKToKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6dHlwZXNTYWZlRm9yRE9NVG9SZWFk QW5kV3JpdGUgY29uc3QpOgorCisgICAgICAgIEludm9rZSB0aGUgbmV3IGB3ZWJTYWZlVHlwZXNg IGhlbHBlciBtZXRob2QuCisKIDIwMTktMTAtMTYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYkF1ZGlvU291cmNlUHJvdmlkZXJBVkZPYmpDOjpwcm92aWRl SW5wdXQgc2hvdWxkIHNldCBpdHMgV2ViQXVkaW9CdWZmZXJMaXN0IHBhcmFtZXRlcnMgY29ycmVj dGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKaW5kZXggZDM3YzNjNWI2OWQ4NDk2 N2Y1MzVhNWNlOWNkMmE2MzM3ZTBjYTc3Zi4uZDUxOGE5NTlhNzIzMzUyN2QzZWVkZTQyN2YyMTIx MThlMmIxOTZmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2Fy ZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuaApAQCAtMjUzLDYg KzI1Myw4IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgTlNBcnJheSAqc3Vw cG9ydGVkRmlsZVVwbG9hZFBhc3RlYm9hcmRUeXBlcygpOwogICAgIGxvbmcgY2hhbmdlQ291bnQo KSBjb25zdDsKICAgICBjb25zdCBQYXN0ZWJvYXJkQ3VzdG9tRGF0YSYgcmVhZEN1c3RvbURhdGEo KTsKKyNlbHNlCisgICAgbG9uZyBjaGFuZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICNl bmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQppbmRleCAzMWIyMDcwNGRhOWE1MzBl YWYzZDdjMGUxNzRmYmU2Yzk4N2ZkNzMzLi5iMzU2NTI1N2ZhMGU0MmY2NTJmMDcwMzMxNDFkNmVj NzJjZTA1NWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZv cm1QYXN0ZWJvYXJkSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0 Zm9ybVBhc3RlYm9hcmRJT1MubW0KQEAgLTk3LDYgKzk3LDQ1IEBAIGludCBQbGF0Zm9ybVBhc3Rl Ym9hcmQ6Om51bWJlck9mRmlsZXMoKSBjb25zdAogCiAjaWYgUEFTVEVCT0FSRF9TVVBQT1JUU19J VEVNX1BST1ZJREVSUwogCitzdGF0aWMgY29uc3QgY2hhciAqc2FmZVR5cGVGb3JET01Ub1JlYWRB bmRXcml0ZUZvclBsYXRmb3JtVHlwZShjb25zdCBTdHJpbmcmIHBsYXRmb3JtVHlwZSkKK3sKKyAg ICBhdXRvIGNmVHlwZSA9IHBsYXRmb3JtVHlwZS5jcmVhdGVDRlN0cmluZygpOworICAgIGlmIChV VFR5cGVDb25mb3Jtc1RvKGNmVHlwZS5nZXQoKSwga1VUVHlwZVBsYWluVGV4dCkpCisgICAgICAg IHJldHVybiAidGV4dC9wbGFpbiJfczsKKworICAgIGlmIChVVFR5cGVDb25mb3Jtc1RvKGNmVHlw ZS5nZXQoKSwga1VUVHlwZUhUTUwpIHx8IFVUVHlwZUNvbmZvcm1zVG8oY2ZUeXBlLmdldCgpLCAo Q0ZTdHJpbmdSZWYpV2ViQXJjaGl2ZVBib2FyZFR5cGUpCisgICAgICAgIHx8IFVUVHlwZUNvbmZv cm1zVG8oY2ZUeXBlLmdldCgpLCBrVVRUeXBlUlRGKSB8fCBVVFR5cGVDb25mb3Jtc1RvKGNmVHlw ZS5nZXQoKSwga1VUVHlwZUZsYXRSVEZEKSkKKyAgICAgICAgcmV0dXJuICJ0ZXh0L2h0bWwiX3M7 CisKKyAgICBpZiAoVVRUeXBlQ29uZm9ybXNUbyhjZlR5cGUuZ2V0KCksIGtVVFR5cGVVUkwpKQor ICAgICAgICByZXR1cm4gInRleHQvdXJpLWxpc3QiX3M7CisKKyAgICByZXR1cm4gbnVsbHB0cjsK K30KKworc3RhdGljIFZlY3RvcjxTdHJpbmc+IHdlYlNhZmVUeXBlcyhOU0FycmF5PE5TU3RyaW5n ICo+ICpwbGF0Zm9ybVR5cGVzLCBGdW5jdGlvbjxib29sKCk+JiYgc2hvdWxkQXZvaWRFeHBvc2lu Z1VSTFR5cGUpCit7CisgICAgTGlzdEhhc2hTZXQ8U3RyaW5nPiBkb21QYXN0ZWJvYXJkVHlwZXM7 CisgICAgZm9yIChOU1N0cmluZyAqdHlwZSBpbiBwbGF0Zm9ybVR5cGVzKSB7CisgICAgICAgIGlm IChbdHlwZSBpc0VxdWFsVG9TdHJpbmc6QChQYXN0ZWJvYXJkQ3VzdG9tRGF0YTo6Y29jb2FUeXBl KCkpXSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIGlmIChQYXN0ZWJvYXJkOjpp c1NhZmVUeXBlRm9yRE9NVG9SZWFkQW5kV3JpdGUodHlwZSkpIHsKKyAgICAgICAgICAgIGRvbVBh c3RlYm9hcmRUeXBlcy5hZGQodHlwZSk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg fQorCisgICAgICAgIGlmIChhdXRvKiBjb2VyY2VkVHlwZSA9IHNhZmVUeXBlRm9yRE9NVG9SZWFk QW5kV3JpdGVGb3JQbGF0Zm9ybVR5cGUodHlwZSkpIHsKKyAgICAgICAgICAgIGF1dG8gZG9tVHlw ZUFzU3RyaW5nID0gU3RyaW5nOjpmcm9tVVRGOChjb2VyY2VkVHlwZSk7CisgICAgICAgICAgICBp ZiAoZG9tVHlwZUFzU3RyaW5nID09ICJ0ZXh0L3VyaS1saXN0Il9zICYmIChbcGxhdGZvcm1UeXBl cyBjb250YWluc09iamVjdDooX19icmlkZ2UgTlNTdHJpbmcgKilrVVRUeXBlRmlsZVVSTF0gfHwg c2hvdWxkQXZvaWRFeHBvc2luZ1VSTFR5cGUoKSkpCisgICAgICAgICAgICAgICAgY29udGludWU7 CisKKyAgICAgICAgICAgIGRvbVBhc3RlYm9hcmRUeXBlcy5hZGQoV1RGTW92ZShkb21UeXBlQXNT dHJpbmcpKTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gY29weVRvVmVjdG9yKGRvbVBh c3RlYm9hcmRUeXBlcyk7Cit9CisKICNpZiBQQVNURUJPQVJEX1NVUFBPUlRTX1BSRVNFTlRBVElP Tl9TVFlMRV9BTkRfVEVBTV9EQVRBCiAKIHN0YXRpYyBQYXN0ZWJvYXJkSXRlbVByZXNlbnRhdGlv blN0eWxlIHBhc3RlYm9hcmRJdGVtUHJlc2VudGF0aW9uU3R5bGUoVUlQcmVmZXJyZWRQcmVzZW50 YXRpb25TdHlsZSBzdHlsZSkKQEAgLTExNiw2ICsxNTUsMTUgQEAgc3RhdGljIFBhc3RlYm9hcmRJ dGVtUHJlc2VudGF0aW9uU3R5bGUgcGFzdGVib2FyZEl0ZW1QcmVzZW50YXRpb25TdHlsZShVSVBy ZWZlcnIKIAogI2VuZGlmIC8vIFBBU1RFQk9BUkRfU1VQUE9SVFNfUFJFU0VOVEFUSU9OX1NUWUxF X0FORF9URUFNX0RBVEEKIAorc3RhdGljIGJvb2wgc2hvdWxkVHJlYXRBdExlYXN0T25lVHlwZUFz RmlsZShOU0FycmF5IDxOU1N0cmluZyAqPiAqcGxhdGZvcm1UeXBlcykKK3sKKyAgICBmb3IgKE5T U3RyaW5nICp0eXBlIGluIHBsYXRmb3JtVHlwZXMpIHsKKyAgICAgICAgaWYgKFBhc3RlYm9hcmQ6 OnNob3VsZFRyZWF0Q29jb2FUeXBlQXNGaWxlKHR5cGUpKQorICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogUGFzdGVib2FyZEl0ZW1JbmZvIFBs YXRmb3JtUGFzdGVib2FyZDo6aW5mb3JtYXRpb25Gb3JJdGVtQXRJbmRleChzaXplX3QgaW5kZXgp CiB7CiAgICAgaWYgKGluZGV4ID49IHN0YXRpY19jYXN0PE5TVUludGVnZXI+KFttX3Bhc3RlYm9h cmQgbnVtYmVyT2ZJdGVtc10pKQpAQCAtMTgzLDYgKzIzMSw5IEBAIFBhc3RlYm9hcmRJdGVtSW5m byBQbGF0Zm9ybVBhc3RlYm9hcmQ6OmluZm9ybWF0aW9uRm9ySXRlbUF0SW5kZXgoc2l6ZV90IGlu ZGV4KQogICAgIH0KIAogICAgIGluZm8uY2hhbmdlQ291bnQgPSBjaGFuZ2VDb3VudCgpOworICAg IGluZm8ud2ViU2FmZVR5cGVzQnlGaWRlbGl0eSA9IHdlYlNhZmVUeXBlcyhyZWdpc3RlcmVkVHlw ZUlkZW50aWZpZXJzLCBbJl0geworICAgICAgICByZXR1cm4gc2hvdWxkVHJlYXRBdExlYXN0T25l VHlwZUFzRmlsZShyZWdpc3RlcmVkVHlwZUlkZW50aWZpZXJzKSAmJiAhUGFzdGVib2FyZDo6Y2Fu RXhwb3NlVVJMVG9ET01XaGVuUGFzdGVib2FyZENvbnRhaW5zRmlsZXMocmVhZFN0cmluZyhpbmRl eCwga1VUVHlwZVVSTCkpOworICAgIH0pOwogCiAgICAgcmV0dXJuIGluZm87CiB9CkBAIC0yMDIs MTIgKzI1Myw3IEBAIHN0YXRpYyBib29sIHBhc3RlYm9hcmRNYXlDb250YWluRmlsZVBhdGhzKGlk PEFic3RyYWN0UGFzdGVib2FyZD4gcGFzdGVib2FyZCkKICAgICBpZiAoW3Bhc3RlYm9hcmQgaXNL aW5kT2ZDbGFzczpbV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZCBjbGFzc11dKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAjZW5kaWYKLQotICAgIGZvciAoTlNTdHJpbmcgKnR5cGUgaW4gcGFzdGVi b2FyZC5wYXN0ZWJvYXJkVHlwZXMpIHsKLSAgICAgICAgaWYgKFBhc3RlYm9hcmQ6OnNob3VsZFRy ZWF0Q29jb2FUeXBlQXNGaWxlKHR5cGUpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg fQotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gc2hvdWxkVHJlYXRBdExlYXN0T25lVHlw ZUFzRmlsZShwYXN0ZWJvYXJkLnBhc3RlYm9hcmRUeXBlcyk7CiB9CiAKIFN0cmluZyBQbGF0Zm9y bVBhc3RlYm9hcmQ6OnN0cmluZ0ZvclR5cGUoY29uc3QgU3RyaW5nJiB0eXBlKSBjb25zdApAQCAt NDgwLDIyICs1MjYsNiBAQCB2b2lkIFBsYXRmb3JtUGFzdGVib2FyZDo6d3JpdGUoY29uc3QgUGFz dGVib2FyZFVSTCYgdXJsKQogICAgIHJlZ2lzdGVySXRlbVRvUGFzdGVib2FyZChyZXByZXNlbnRh dGlvbnNUb1JlZ2lzdGVyLmdldCgpLCBtX3Bhc3RlYm9hcmQuZ2V0KCkpOwogfQogCi1zdGF0aWMg Y29uc3QgY2hhciAqc2FmZVR5cGVGb3JET01Ub1JlYWRBbmRXcml0ZUZvclBsYXRmb3JtVHlwZShj b25zdCBTdHJpbmcmIHBsYXRmb3JtVHlwZSkKLXsKLSAgICBhdXRvIGNmVHlwZSA9IHBsYXRmb3Jt VHlwZS5jcmVhdGVDRlN0cmluZygpOwotICAgIGlmIChVVFR5cGVDb25mb3Jtc1RvKGNmVHlwZS5n ZXQoKSwga1VUVHlwZVBsYWluVGV4dCkpCi0gICAgICAgIHJldHVybiAidGV4dC9wbGFpbiJfczsK LQotICAgIGlmIChVVFR5cGVDb25mb3Jtc1RvKGNmVHlwZS5nZXQoKSwga1VUVHlwZUhUTUwpIHx8 IFVUVHlwZUNvbmZvcm1zVG8oY2ZUeXBlLmdldCgpLCAoQ0ZTdHJpbmdSZWYpV2ViQXJjaGl2ZVBi b2FyZFR5cGUpCi0gICAgICAgIHx8IFVUVHlwZUNvbmZvcm1zVG8oY2ZUeXBlLmdldCgpLCBrVVRU eXBlUlRGKSB8fCBVVFR5cGVDb25mb3Jtc1RvKGNmVHlwZS5nZXQoKSwga1VUVHlwZUZsYXRSVEZE KSkKLSAgICAgICAgcmV0dXJuICJ0ZXh0L2h0bWwiX3M7Ci0KLSAgICBpZiAoVVRUeXBlQ29uZm9y bXNUbyhjZlR5cGUuZ2V0KCksIGtVVFR5cGVVUkwpKQotICAgICAgICByZXR1cm4gInRleHQvdXJp LWxpc3QiX3M7Ci0KLSAgICByZXR1cm4gbnVsbHB0cjsKLX0KLQogc3RhdGljIGNvbnN0IGNoYXIg b3JpZ2luS2V5Rm9yVGVhbURhdGFbXSA9ICJjb20uYXBwbGUuV2ViS2l0LmRyYWctYW5kLWRyb3At dGVhbS1kYXRhLm9yaWdpbiI7CiBzdGF0aWMgY29uc3QgY2hhciBjdXN0b21UeXBlc0tleUZvclRl YW1EYXRhW10gPSAiY29tLmFwcGxlLldlYktpdC5kcmFnLWFuZC1kcm9wLXRlYW0tZGF0YS5jdXN0 b20tdHlwZXMiOwogCkBAIC01MzQsMjggKzU2NCwxMyBAQCBWZWN0b3I8U3RyaW5nPiBQbGF0Zm9y bVBhc3RlYm9hcmQ6OnR5cGVzU2FmZUZvckRPTVRvUmVhZEFuZFdyaXRlKGNvbnN0IFN0cmluZyYg bwogICAgICAgICB9CiAgICAgfQogCi0gICAgZm9yIChOU1N0cmluZyAqdHlwZSBpbiBbbV9wYXN0 ZWJvYXJkIHBhc3RlYm9hcmRUeXBlc10pIHsKLSAgICAgICAgaWYgKFt0eXBlIGlzRXF1YWxUb1N0 cmluZzpAKFBhc3RlYm9hcmRDdXN0b21EYXRhOjpjb2NvYVR5cGUoKSldKQotICAgICAgICAgICAg Y29udGludWU7Ci0KLSAgICAgICAgaWYgKFBhc3RlYm9hcmQ6OmlzU2FmZVR5cGVGb3JET01Ub1Jl YWRBbmRXcml0ZSh0eXBlKSkgewotICAgICAgICAgICAgZG9tUGFzdGVib2FyZFR5cGVzLmFkZCh0 eXBlKTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CisgICAgYXV0byB3ZWJTYWZl UGFzdGVib2FyZFR5cGVzID0gd2ViU2FmZVR5cGVzKFttX3Bhc3RlYm9hcmQgcGFzdGVib2FyZFR5 cGVzXSwgWyZdIHsKKyAgICAgICAgQk9PTCBhYmxlVG9EZXRlcm1pbmVQcm90b2NvbE9mUGFzdGVi b2FyZFVSTCA9ICFbbV9wYXN0ZWJvYXJkIGlzS2luZE9mQ2xhc3M6W1dlYkl0ZW1Qcm92aWRlclBh c3RlYm9hcmQgY2xhc3NdXTsKKyAgICAgICAgcmV0dXJuIGFibGVUb0RldGVybWluZVByb3RvY29s T2ZQYXN0ZWJvYXJkVVJMICYmIHN0cmluZ0ZvclR5cGUoa1VUVHlwZVVSTCkuaXNFbXB0eSgpOwor ICAgIH0pOwogCi0gICAgICAgIGlmIChhdXRvKiBjb2VyY2VkVHlwZSA9IHNhZmVUeXBlRm9yRE9N VG9SZWFkQW5kV3JpdGVGb3JQbGF0Zm9ybVR5cGUodHlwZSkpIHsKLSAgICAgICAgICAgIGF1dG8g ZG9tVHlwZUFzU3RyaW5nID0gU3RyaW5nOjpmcm9tVVRGOChjb2VyY2VkVHlwZSk7Ci0gICAgICAg ICAgICBpZiAoZG9tVHlwZUFzU3RyaW5nID09ICJ0ZXh0L3VyaS1saXN0IikgewotICAgICAgICAg ICAgICAgIEJPT0wgYWJsZVRvRGV0ZXJtaW5lUHJvdG9jb2xPZlBhc3RlYm9hcmRVUkwgPSAhW21f cGFzdGVib2FyZCBpc0tpbmRPZkNsYXNzOltXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIGNsYXNz XV07Ci0gICAgICAgICAgICAgICAgaWYgKGFibGVUb0RldGVybWluZVByb3RvY29sT2ZQYXN0ZWJv YXJkVVJMICYmIHN0cmluZ0ZvclR5cGUoa1VUVHlwZVVSTCkuaXNFbXB0eSgpKQotICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgICAgIGlmIChbW21fcGFzdGVib2Fy ZCBwYXN0ZWJvYXJkVHlwZXNdIGNvbnRhaW5zT2JqZWN0OihfX2JyaWRnZSBOU1N0cmluZyAqKWtV VFR5cGVGaWxlVVJMXSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICBkb21QYXN0ZWJvYXJkVHlwZXMuYWRkKFdURk1vdmUoZG9tVHlwZUFz U3RyaW5nKSk7Ci0gICAgICAgIH0KLSAgICB9CisgICAgZm9yIChhdXRvJiB0eXBlIDogd2ViU2Fm ZVBhc3RlYm9hcmRUeXBlcykKKyAgICAgICAgZG9tUGFzdGVib2FyZFR5cGVzLmFkZCh0eXBlKTsK IAogICAgIHJldHVybiBjb3B5VG9WZWN0b3IoZG9tUGFzdGVib2FyZFR5cGVzKTsKIH0K