200739 2019-08-14 15:39:38 -0700 ProxyObject should not be allow to access its target's private properties. 2019-08-16 14:04:42 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=200788 InRadar P2 Normal --- 200829 1 mark.lam mark.lam ews-watchlist fpizlo keith_miller msaboff rmorisset ryanhaddad saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1561360 0 mark.lam 2019-08-14 15:39:38 -0700 <rdar://problem/53972768> 1561363 1 376324 mark.lam 2019-08-14 15:50:09 -0700 Created attachment 376324 proposed patch. 1561364 2 376324 ysuzuki 2019-08-14 15:54:03 -0700 Comment on attachment 376324 proposed patch. r=me 1561417 3 376324 ews-watchlist 2019-08-14 18:56:53 -0700 Comment on attachment 376324 proposed patch. Attachment 376324 did not pass jsc-ews (mac): Output: https://webkit-queues.webkit.org/results/12914309 New failing tests: stress/proxy-with-private-symbols.js.ftl-no-cjit-no-inline-validate stress/proxy-with-private-symbols.js.dfg-eager-no-cjit-validate stress/proxy-with-private-symbols.js.ftl-no-cjit-no-put-stack-validate stress/proxy-with-private-symbols.js.no-ftl stress/proxy-with-private-symbols.js.ftl-no-cjit-validate-sampling-profiler stress/proxy-with-private-symbols.js.no-cjit-validate-phases stress/proxy-with-private-symbols.js.ftl-no-cjit-small-pool stress/proxy-with-private-symbols.js.dfg-maximal-flush-validate-no-cjit stress/proxy-with-private-symbols.js.default stress/proxy-with-private-symbols.js.ftl-eager-no-cjit stress/proxy-with-private-symbols.js.mini-mode stress/proxy-with-private-symbols.js.bytecode-cache stress/proxy-with-private-symbols.js.ftl-eager stress/proxy-with-private-symbols.js.dfg-eager stress/proxy-with-private-symbols.js.ftl-no-cjit-b3o0 stress/proxy-with-private-symbols.js.ftl-eager-no-cjit-b3o1 stress/proxy-with-private-symbols.js.no-cjit-collect-continuously stress/proxy-with-private-symbols.js.no-llint 1561444 4 376346 mark.lam 2019-08-14 20:26:17 -0700 Created attachment 376346 patch for landing. 1561483 5 mark.lam 2019-08-14 23:20:56 -0700 Thanks for the review. Landed in r248709: <http://trac.webkit.org/r248709>. 1562152 6 ryanhaddad 2019-08-16 13:09:21 -0700 Reverted r248709 for reason: Caused test/built-ins/Promise/prototype/finally/this-value-non-promise.js to fail on test262 bot Committed r248786: <https://trac.webkit.org/changeset/248786> 1562153 7 ryanhaddad 2019-08-16 13:09:35 -0700 (In reply to Ryan Haddad from comment #6) > Reverted r248709 for reason: > > Caused test/built-ins/Promise/prototype/finally/this-value-non-promise.js to > fail on test262 bot > > Committed r248786: <https://trac.webkit.org/changeset/248786> Details in https://bugs.webkit.org/show_bug.cgi?id=200788 1562209 8 mark.lam 2019-08-16 14:04:23 -0700 Re-landed in r248796: <http://trac.webkit.org/r248796>. 376324 2019-08-14 15:50:09 -0700 2019-08-14 20:26:17 -0700 proposed patch. bug-200739.patch text/plain 4506 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDg2OTEpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDE5LTA4LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBQcm94eU9iamVjdCBzaG91bGQgbm90IGJlIGFsbG93IHRvIGFjY2VzcyBp dHMgdGFyZ2V0J3MgcHJpdmF0ZSBwcm9wZXJ0aWVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNzM5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 Mzk3Mjc2OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHN0cmVzcy9wcm94eS1zaG91bGQtbm90LWJlLWFsbG93ZWQtdG8tYWNjZXNzLXByaXZhdGUt cHJvcGVydGllcy1vZi10YXJnZXQuanM6IEFkZGVkLgorCiAyMDE5LTA4LTA4ICBSb3NzIEtpcnNs aW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4KIAogICAgICAgICBbSlNDXSBBZGQgImp1bXAg aWYgKG5vdCkgdW5kZWZpbmVkIG9yIG51bGwiIGJ5dGVjb2RlIG9wcwpJbmRleDogSlNUZXN0cy9z dHJlc3MvcHJveHktc2hvdWxkLW5vdC1iZS1hbGxvd2VkLXRvLWFjY2Vzcy1wcml2YXRlLXByb3Bl cnRpZXMtb2YtdGFyZ2V0LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL3Byb3h5LXNo b3VsZC1ub3QtYmUtYWxsb3dlZC10by1hY2Nlc3MtcHJpdmF0ZS1wcm9wZXJ0aWVzLW9mLXRhcmdl dC5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9wcm94eS1zaG91bGQtbm90LWJl LWFsbG93ZWQtdG8tYWNjZXNzLXByaXZhdGUtcHJvcGVydGllcy1vZi10YXJnZXQuanMJKHdvcmtp bmcgY29weSkKQEAgLTAsMCArMSwyMSBAQAordmFyIGZvbyA9IChmdW5jdGlvbiogYmFyKCkgewor ICAgIHRyeSB7CisgICAgICAgIHlpZWxkKiB4OworICAgIH0gZmluYWxseSB7CisgICAgICAgIHRy eSB7CisgICAgICAgICAgICB5OworICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisgICAgfQorfSkgKCk7CisKK3ZhciB4ID0gbmV3IFByb3h5KGZvbywg e30pOwordHJ5IHsKKyAgICB4Lm5leHQoKTsKK30gY2F0Y2ggKGUpIHsKKyAgICBleGNlcHRpb24g PSBlOworfQorCitpZiAoZXhjZXB0aW9uICE9ICdUeXBlRXJyb3I6IHx0aGlzfCBzaG91bGQgYmUg YSBnZW5lcmF0b3InKQorICAgIHRocm93ICJGQUlMRUQiOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNDg2OTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDgtMTQgIE1hcmsgTGFt ICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIFByb3h5T2JqZWN0IHNob3VsZCBub3Qg YmUgYWxsb3cgdG8gYWNjZXNzIGl0cyB0YXJnZXQncyBwcml2YXRlIHByb3BlcnRpZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA3MzkKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzUzOTcyNzY4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9Qcm94eU9iamVjdC5jcHA6CisgICAgICAg IChKU0M6OnBlcmZvcm1Qcm94eUdldCk6CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpwZXJm b3JtSW50ZXJuYWxNZXRob2RHZXRPd25Qcm9wZXJ0eSk6CisgICAgICAgIChKU0M6OlByb3h5T2Jq ZWN0OjpwZXJmb3JtSGFzUHJvcGVydHkpOgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6cGVy Zm9ybVB1dCk6CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpwZXJmb3JtRGVsZXRlKToKKyAg ICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OnBlcmZvcm1EZWZpbmVPd25Qcm9wZXJ0eSk6CisKIDIw MTktMDgtMTQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCBidWlsZCBmaXggZm9yIE1hY3JvQXNzZW1ibGVyQVJNNjRFIGNoYW5nZQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAkocmV2 aXNpb24gMjQ4NjQxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmpl Y3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo QykgMjAxNi0yMDE3IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxNi0yMDE5IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTQzLDcgKzE0Myw3IEBAIHN0YXRpYyBKU1ZhbHVl IHBlcmZvcm1Qcm94eUdldChFeGVjU3RhdGUKICAgICB9OwogCiAgICAgaWYgKHByb3BlcnR5TmFt ZS5pc1ByaXZhdGVOYW1lKCkpCi0gICAgICAgIHJldHVybiBwZXJmb3JtRGVmYXVsdEdldCgpOwor ICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKIAogICAgIEpTVmFsdWUgaGFuZGxlclZhbHVl ID0gcHJveHlPYmplY3QtPmhhbmRsZXIoKTsKICAgICBpZiAoaGFuZGxlclZhbHVlLmlzTnVsbCgp KQpAQCAtMjE0LDcgKzIxNCw3IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1JbnRlcm5hbE1l dGhvZEcKICAgICB9OwogCiAgICAgaWYgKHByb3BlcnR5TmFtZS5pc1ByaXZhdGVOYW1lKCkpCi0g ICAgICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29wZSwgcGVyZm9ybURlZmF1bHRHZXRPd25Qcm9w ZXJ0eSgpKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFs dWUgPSB0aGlzLT5oYW5kbGVyKCk7CiAgICAgaWYgKGhhbmRsZXJWYWx1ZS5pc051bGwoKSkgewpA QCAtMzIzLDcgKzMyMyw3IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1IYXNQcm9wZXJ0eShF eGUKICAgICB9OwogCiAgICAgaWYgKHByb3BlcnR5TmFtZS5pc1ByaXZhdGVOYW1lKCkpCi0gICAg ICAgIFJFTEVBU0VfQU5EX1JFVFVSTihzY29wZSwgcGVyZm9ybURlZmF1bHRIYXNQcm9wZXJ0eSgp KTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUgPSB0 aGlzLT5oYW5kbGVyKCk7CiAgICAgaWYgKGhhbmRsZXJWYWx1ZS5pc051bGwoKSkgewpAQCAtNDI1 LDcgKzQyNSw3IEBAIGJvb2wgUHJveHlPYmplY3Q6OnBlcmZvcm1QdXQoRXhlY1N0YXRlKiAKICAg ICB9CiAKICAgICBpZiAocHJvcGVydHlOYW1lLmlzUHJpdmF0ZU5hbWUoKSkKLSAgICAgICAgUkVM RUFTRV9BTkRfUkVUVVJOKHNjb3BlLCBwZXJmb3JtRGVmYXVsdFB1dCgpKTsKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUgPSB0aGlzLT5oYW5kbGVyKCk7 CiAgICAgaWYgKGhhbmRsZXJWYWx1ZS5pc051bGwoKSkgewpAQCAtNjI4LDcgKzYyOCw3IEBAIGJv b2wgUHJveHlPYmplY3Q6OnBlcmZvcm1EZWxldGUoRXhlY1N0YXQKICAgICB9CiAKICAgICBpZiAo cHJvcGVydHlOYW1lLmlzUHJpdmF0ZU5hbWUoKSkKLSAgICAgICAgUkVMRUFTRV9BTkRfUkVUVVJO KHNjb3BlLCBwZXJmb3JtRGVmYXVsdERlbGV0ZSgpKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUgPSB0aGlzLT5oYW5kbGVyKCk7CiAgICAgaWYgKGhh bmRsZXJWYWx1ZS5pc051bGwoKSkgewpAQCAtODI3LDcgKzgyNyw3IEBAIGJvb2wgUHJveHlPYmpl Y3Q6OnBlcmZvcm1EZWZpbmVPd25Qcm9wZXIKICAgICB9OwogCiAgICAgaWYgKHByb3BlcnR5TmFt ZS5pc1ByaXZhdGVOYW1lKCkpCi0gICAgICAgIHJldHVybiBwZXJmb3JtRGVmYXVsdERlZmluZU93 blByb3BlcnR5KCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEpTVmFsdWUgaGFuZGxl clZhbHVlID0gdGhpcy0+aGFuZGxlcigpOwogICAgIGlmIChoYW5kbGVyVmFsdWUuaXNOdWxsKCkp IHsK 376346 2019-08-14 20:26:17 -0700 2019-08-14 20:26:17 -0700 patch for landing. bug-200739.patch text/plain 5114 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDg3MDUpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE5LTA4LTE0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBQcm94eU9iamVjdCBzaG91bGQgbm90IGJlIGFsbG93IHRvIGFjY2VzcyBp dHMgdGFyZ2V0J3MgcHJpdmF0ZSBwcm9wZXJ0aWVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNzM5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 Mzk3Mjc2OD4KKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAg ICogc3RyZXNzL3Byb3h5LXNob3VsZC1ub3QtYmUtYWxsb3dlZC10by1hY2Nlc3MtcHJpdmF0ZS1w cm9wZXJ0aWVzLW9mLXRhcmdldC5qczogQWRkZWQuCisgICAgICAgICogc3RyZXNzL3Byb3h5LXdp dGgtcHJpdmF0ZS1zeW1ib2xzLmpzOiBSZWJhc2VkLgorCiAyMDE5LTA4LTE0ICBNYXJrIExhbSAg PG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNaXNzaW5nIGV4Y2VwdGlvbiBjaGVjayBp biBzdHJpbmcgY29tcGFyZS4KSW5kZXg6IEpTVGVzdHMvc3RyZXNzL3Byb3h5LXNob3VsZC1ub3Qt YmUtYWxsb3dlZC10by1hY2Nlc3MtcHJpdmF0ZS1wcm9wZXJ0aWVzLW9mLXRhcmdldC5qcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBKU1Rlc3RzL3N0cmVzcy9wcm94eS1zaG91bGQtbm90LWJlLWFsbG93ZWQtdG8t YWNjZXNzLXByaXZhdGUtcHJvcGVydGllcy1vZi10YXJnZXQuanMJKG5vbmV4aXN0ZW50KQorKysg SlNUZXN0cy9zdHJlc3MvcHJveHktc2hvdWxkLW5vdC1iZS1hbGxvd2VkLXRvLWFjY2Vzcy1wcml2 YXRlLXByb3BlcnRpZXMtb2YtdGFyZ2V0LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjEg QEAKK3ZhciBmb28gPSAoZnVuY3Rpb24qIGJhcigpIHsKKyAgICB0cnkgeworICAgICAgICB5aWVs ZCogeDsKKyAgICB9IGZpbmFsbHkgeworICAgICAgICB0cnkgeworICAgICAgICAgICAgeTsKKyAg ICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgIH0K K30pICgpOworCit2YXIgeCA9IG5ldyBQcm94eShmb28sIHt9KTsKK3RyeSB7CisgICAgeC5uZXh0 KCk7Cit9IGNhdGNoIChlKSB7CisgICAgZXhjZXB0aW9uID0gZTsKK30KKworaWYgKGV4Y2VwdGlv biAhPSAnVHlwZUVycm9yOiB8dGhpc3wgc2hvdWxkIGJlIGEgZ2VuZXJhdG9yJykKKyAgICB0aHJv dyAiRkFJTEVEIjsKSW5kZXg6IEpTVGVzdHMvc3RyZXNzL3Byb3h5LXdpdGgtcHJpdmF0ZS1zeW1i b2xzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL3Byb3h5LXdpdGgtcHJpdmF0ZS1z eW1ib2xzLmpzCShyZXZpc2lvbiAyNDg2OTMpCisrKyBKU1Rlc3RzL3N0cmVzcy9wcm94eS13aXRo LXByaXZhdGUtc3ltYm9scy5qcwkod29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsNyBAQCBmdW5j dGlvbiBhc3NlcnQoYikgewogICAgICAgICAgICAgYXNzZXJ0KGUubWVzc2FnZSA9PT0gIiVBcnJh eUl0ZXJhdG9yUHJvdG90eXBlJS5uZXh0IHJlcXVpcmVzIHRoYXQgfHRoaXN8IGJlIGFuIEFycmF5 IEl0ZXJhdG9yIGluc3RhbmNlIik7CiAgICAgICAgICAgICB0aHJldyA9IHRydWU7CiAgICAgICAg IH0KLSAgICAgICAgYXNzZXJ0KCF0aHJldyk7CisgICAgICAgIGFzc2VydCh0aHJldyk7CiAgICAg ICAgIGFzc2VydCghc2F3UHJpdmF0ZVN5bWJvbEFzU3RyaW5nKTsKICAgICAgICAgc2F3UHJpdmF0 ZVN5bWJvbEFzU3RyaW5nID0gZmFsc2U7CiAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCShyZXZpc2lvbiAyNDg2OTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMDgtMTQgIE1hcmsgTGFtICA8 bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIFByb3h5T2JqZWN0IHNob3VsZCBub3QgYmUg YWxsb3cgdG8gYWNjZXNzIGl0cyB0YXJnZXQncyBwcml2YXRlIHByb3BlcnRpZXMuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA3MzkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzUzOTcyNzY4PgorCisgICAgICAgIFJldmlld2VkIGJ5IFl1c3VrZSBT dXp1a2kuCisKKyAgICAgICAgKiBydW50aW1lL1Byb3h5T2JqZWN0LmNwcDoKKyAgICAgICAgKEpT Qzo6cGVyZm9ybVByb3h5R2V0KToKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OnBlcmZvcm1J bnRlcm5hbE1ldGhvZEdldE93blByb3BlcnR5KToKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6 OnBlcmZvcm1IYXNQcm9wZXJ0eSk6CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpwZXJmb3Jt UHV0KToKKyAgICAgICAgKEpTQzo6UHJveHlPYmplY3Q6OnBlcmZvcm1EZWxldGUpOgorICAgICAg ICAoSlNDOjpQcm94eU9iamVjdDo6cGVyZm9ybURlZmluZU93blByb3BlcnR5KToKKwogMjAxOS0w OC0xNCAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgTWlzc2luZyBl eGNlcHRpb24gY2hlY2sgaW4gc3RyaW5nIGNvbXBhcmUuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCShyZXZpc2lvbiAyNDg2OTMpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTcgQXBwbGUg SW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE2LTIwMTkgQXBw bGUgSW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0xNDMsNyArMTQzLDcgQEAgc3RhdGljIEpTVmFsdWUgcGVyZm9ybVByb3h5R2V0KEV4 ZWNTdGF0ZQogICAgIH07CiAKICAgICBpZiAocHJvcGVydHlOYW1lLmlzUHJpdmF0ZU5hbWUoKSkK LSAgICAgICAgcmV0dXJuIHBlcmZvcm1EZWZhdWx0R2V0KCk7CisgICAgICAgIHJldHVybiBqc1Vu ZGVmaW5lZCgpOwogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUgPSBwcm94eU9iamVjdC0+aGFu ZGxlcigpOwogICAgIGlmIChoYW5kbGVyVmFsdWUuaXNOdWxsKCkpCkBAIC0yMTQsNyArMjE0LDcg QEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybUludGVybmFsTWV0aG9kRwogICAgIH07CiAKICAg ICBpZiAocHJvcGVydHlOYW1lLmlzUHJpdmF0ZU5hbWUoKSkKLSAgICAgICAgUkVMRUFTRV9BTkRf UkVUVVJOKHNjb3BlLCBwZXJmb3JtRGVmYXVsdEdldE93blByb3BlcnR5KCkpOworICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBKU1ZhbHVlIGhhbmRsZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIo KTsKICAgICBpZiAoaGFuZGxlclZhbHVlLmlzTnVsbCgpKSB7CkBAIC0zMjMsNyArMzIzLDcgQEAg Ym9vbCBQcm94eU9iamVjdDo6cGVyZm9ybUhhc1Byb3BlcnR5KEV4ZQogICAgIH07CiAKICAgICBp ZiAocHJvcGVydHlOYW1lLmlzUHJpdmF0ZU5hbWUoKSkKLSAgICAgICAgUkVMRUFTRV9BTkRfUkVU VVJOKHNjb3BlLCBwZXJmb3JtRGVmYXVsdEhhc1Byb3BlcnR5KCkpOworICAgICAgICByZXR1cm4g ZmFsc2U7CiAKICAgICBKU1ZhbHVlIGhhbmRsZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIoKTsKICAg ICBpZiAoaGFuZGxlclZhbHVlLmlzTnVsbCgpKSB7CkBAIC00MjUsNyArNDI1LDcgQEAgYm9vbCBQ cm94eU9iamVjdDo6cGVyZm9ybVB1dChFeGVjU3RhdGUqIAogICAgIH0KIAogICAgIGlmIChwcm9w ZXJ0eU5hbWUuaXNQcml2YXRlTmFtZSgpKQotICAgICAgICBSRUxFQVNFX0FORF9SRVRVUk4oc2Nv cGUsIHBlcmZvcm1EZWZhdWx0UHV0KCkpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBK U1ZhbHVlIGhhbmRsZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIoKTsKICAgICBpZiAoaGFuZGxlclZh bHVlLmlzTnVsbCgpKSB7CkBAIC02MjgsNyArNjI4LDcgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVy Zm9ybURlbGV0ZShFeGVjU3RhdAogICAgIH0KIAogICAgIGlmIChwcm9wZXJ0eU5hbWUuaXNQcml2 YXRlTmFtZSgpKQotICAgICAgICBSRUxFQVNFX0FORF9SRVRVUk4oc2NvcGUsIHBlcmZvcm1EZWZh dWx0RGVsZXRlKCkpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBKU1ZhbHVlIGhhbmRs ZXJWYWx1ZSA9IHRoaXMtPmhhbmRsZXIoKTsKICAgICBpZiAoaGFuZGxlclZhbHVlLmlzTnVsbCgp KSB7CkBAIC04MjcsNyArODI3LDcgQEAgYm9vbCBQcm94eU9iamVjdDo6cGVyZm9ybURlZmluZU93 blByb3BlcgogICAgIH07CiAKICAgICBpZiAocHJvcGVydHlOYW1lLmlzUHJpdmF0ZU5hbWUoKSkK LSAgICAgICAgcmV0dXJuIHBlcmZvcm1EZWZhdWx0RGVmaW5lT3duUHJvcGVydHkoKTsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgSlNWYWx1ZSBoYW5kbGVyVmFsdWUgPSB0aGlzLT5oYW5k bGVyKCk7CiAgICAgaWYgKGhhbmRsZXJWYWx1ZS5pc051bGwoKSkgewo=