207297 2020-02-05 14:43:25 -0800 [JSC] Computed function properties compute their keys twice 2020-02-18 12:02:21 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=170934 InRadar P2 Normal --- 1 ross.kirsling ross.kirsling commit-queue ews-watchlist keith_miller mark.lam msaboff saam ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1615291 0 ross.kirsling 2020-02-05 14:43:25 -0800 Basic repro: ``` let count1 = 0; let key1 = { toString() { count1++; return 'foo'; } }; ({ [key1]: 'bar' }); let count2 = 0; let key2 = { toString() { count2++; return 'foo'; } }; ({ [key2]() { return 'bar'; } }); print(count1, count2); ``` λ eshost -s test.js #### ch, sm, v8, xs 1 1 #### jsc 1 2 Notes: - This also reproes if: - we write the function property as `[key]: function () { return 'bar'; }` or `[key]: () => 'bar'` instead - we set toString to null and use valueOf instead - Relevant test262 failures: https://github.com/tc39/test262/blob/master/test/language/computed-property-names/to-name-side-effects/class.js https://github.com/tc39/test262/blob/master/test/language/computed-property-names/to-name-side-effects/numbers-class.js https://github.com/tc39/test262/blob/master/test/language/computed-property-names/to-name-side-effects/object.js - Bug 170934 seems related but separate. 1616621 1 390185 ross.kirsling 2020-02-08 16:10:42 -0800 Created attachment 390185 Patch 1616998 2 390185 ross.kirsling 2020-02-10 11:33:15 -0800 Comment on attachment 390185 Patch The current approach is very simple but incurs a ToPropertyKey instruction even for non-function computed properties. I suppose it would be better to split emitSetFunctionNameIfNeeded into needsSetFunctionName and emitSetFunctionName so that this can be avoided. 1617087 3 390291 ross.kirsling 2020-02-10 13:53:24 -0800 Created attachment 390291 Patch 1620213 4 ross.kirsling 2020-02-18 10:28:54 -0800 Ping? 1620237 5 390291 keith_miller 2020-02-18 11:11:11 -0800 Comment on attachment 390291 Patch r=me. 1620261 6 390291 commit-queue 2020-02-18 12:01:26 -0800 Comment on attachment 390291 Patch Clearing flags on attachment: 390291 Committed r256846: <https://trac.webkit.org/changeset/256846> 1620262 7 commit-queue 2020-02-18 12:01:27 -0800 All reviewed patches have been landed. Closing bug. 1620266 8 webkit-bug-importer 2020-02-18 12:02:21 -0800 <rdar://problem/59559881> 390185 2020-02-08 16:10:42 -0800 2020-02-10 13:53:22 -0800 Patch bug-207297-20200208161041.patch text/plain 8390 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MWIxOTMyMjJlODU2NzYzZTU0YzdiMjYzNzdhOWYzM2IzMWZiMjAyLi5hMzM2OTZkMzNmY2I3OWM3 ODExMzg4YzdiNDY0MDQ5MTViM2MyMGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAyMC0wMi0wOCAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgW0pTQ10gQ29tcHV0ZWQgZnVuY3Rpb24gcHJvcGVydGllcyBjb21w dXRlIHRoZWlyIGtleXMgdHdpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNzI5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIElmIGEgcHNldWRvLVN0cmluZyBpcyB1c2VkIGFzIHRoZSBrZXkgb2YgYSBj b21wdXRlZCBmdW5jdGlvbiBwcm9wZXJ0eSwKKyAgICAgICAgYW55IHNpZGUgZWZmZWN0cyBmcm9t IHJlc29sdmluZyB0aGUgc3RyaW5nIHZhbHVlIG9jY3VyIGluIGR1cGxpY2F0ZS4KKworICAgICAg ICBUaGUgY2F1c2UgaGFzIHR3byBwYXJ0czoKKyAgICAgICAgICAtIFdlIGFyZW4ndCBlbnN1cmlu ZyB0aGF0IHRoZSBzdHJpbmcgdmFsdWUgaXMgcmVzb2x2ZWQgYmVmb3JlIGRvaW5nIFNldEZ1bmN0 aW9uTmFtZSBhbmQgUHV0QnlWYWwuCisgICAgICAgICAgLSBPdXIgaW1wbGVtZW50YXRpb24gb2Yg U2V0RnVuY3Rpb25OYW1lIChodHRwczovL3RjMzkuZXMvZWNtYTI2Mi8jc2VjLXNldGZ1bmN0aW9u bmFtZSkKKyAgICAgICAgICAgIGNhbGxzIHRvU3RyaW5nIG9uIGEgbm9uLXN5bWJvbCBhcmd1bWVu dCwgaW5zdGVhZCBvZiBhc3N1bWluZyB0aGUgdHlwZSBpcyBhIHN0cmluZy4KKworICAgICAgICAq IGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eUxp c3ROb2RlOjplbWl0Qnl0ZWNvZGUpOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eUxpc3ROb2RlOjpl bWl0UHV0Q29uc3RhbnRQcm9wZXJ0eSk6CisgICAgICAgIE5ldmVyIGVtaXQgT3BTZXRGdW5jdGlv bk5hbWUgZm9yIGEgbmFtZSBvZiB1bmtub3duIHR5cGUuCisKKyAgICAgICAgKiBydW50aW1lL0pT RnVuY3Rpb24uY3BwOgorICAgICAgICAoSlNDOjpKU0Z1bmN0aW9uOjpzZXRGdW5jdGlvbk5hbWUp OgorICAgICAgICBEb24ndCBjYWxsIHRvU3RyaW5nLCBhc3NlcnQgaXNTdHJpbmcuCisKIDIwMjAt MDItMDggIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgdHJp dmlhbCBkZWZpbml0aW9ucyBmcm9tIEZlYXR1cmVEZWZpbmVzLnhjY29uZmlnIHRvIFBsYXRmb3Jt RW5hYmxlQ29jb2EuaApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21w aWxlci9Ob2Rlc0NvZGVnZW4uY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9Ob2Rlc0NvZGVnZW4uY3BwCmluZGV4IDgyNTYzMThjMWUzN2Y0M2YyZWE0NTUzMTQ5MzhlMGY1 OGVhYTE0OWEuLmQ0OTJjNTUzNTc0YmJkM2Q0ZWNmNmZhOGY1YTFkNDY5YmNhMGI2MDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5j cHAKQEAgLTY0Myw3ICs2NDMsNyBAQCBSZWdpc3RlcklEKiBQcm9wZXJ0eUxpc3ROb2RlOjplbWl0 Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZQogICAgICAgICAg ICAgaWYgKGNhbk92ZXJyaWRlUHJvcGVydGllcykgewogICAgICAgICAgICAgICAgIC8vIENvbXB1 dGVkIGFjY2Vzc29ycy4KICAgICAgICAgICAgICAgICBpZiAobm9kZS0+bV90eXBlICYgUHJvcGVy dHlOb2RlOjpDb21wdXRlZCkgewotICAgICAgICAgICAgICAgICAgICBSZWZQdHI8UmVnaXN0ZXJJ RD4gcHJvcGVydHlOYW1lID0gZ2VuZXJhdG9yLmVtaXROb2RlKG5vZGUtPm1fZXhwcmVzc2lvbik7 CisgICAgICAgICAgICAgICAgICAgIFJlZlB0cjxSZWdpc3RlcklEPiBwcm9wZXJ0eU5hbWUgPSBn ZW5lcmF0b3IuZW1pdFRvUHJvcGVydHlLZXkoZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpLCBnZW5l cmF0b3IuZW1pdE5vZGUobm9kZS0+bV9leHByZXNzaW9uKSk7CiAgICAgICAgICAgICAgICAgICAg IGdlbmVyYXRvci5lbWl0U2V0RnVuY3Rpb25OYW1lSWZOZWVkZWQobm9kZS0+bV9hc3NpZ24sIHZh bHVlLmdldCgpLCBwcm9wZXJ0eU5hbWUuZ2V0KCkpOwogICAgICAgICAgICAgICAgICAgICBpZiAo bm9kZS0+bV90eXBlICYgUHJvcGVydHlOb2RlOjpHZXR0ZXIpCiAgICAgICAgICAgICAgICAgICAg ICAgICBnZW5lcmF0b3IuZW1pdFB1dEdldHRlckJ5VmFsKGRzdCwgcHJvcGVydHlOYW1lLmdldCgp LCBhdHRyaWJ1dGVzLCB2YWx1ZS5nZXQoKSk7CkBAIC03MjAsNyArNzIwLDcgQEAgdm9pZCBQcm9w ZXJ0eUxpc3ROb2RlOjplbWl0UHV0Q29uc3RhbnRQcm9wZXJ0eShCeXRlY29kZUdlbmVyYXRvciYg Z2VuZXJhdG9yLCBSZWcKICAgICAgICAgaWYgKG5vZGUubmFtZSgpKQogICAgICAgICAgICAgcHJv cGVydHlOYW1lUmVnaXN0ZXIgPSBnZW5lcmF0b3IuZW1pdExvYWQobnVsbHB0ciwgKm5vZGUubmFt ZSgpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcHJvcGVydHlOYW1lUmVnaXN0ZXIgPSBn ZW5lcmF0b3IuZW1pdE5vZGUobm9kZS5tX2V4cHJlc3Npb24pOworICAgICAgICAgICAgcHJvcGVy dHlOYW1lUmVnaXN0ZXIgPSBnZW5lcmF0b3IuZW1pdFRvUHJvcGVydHlLZXkoZ2VuZXJhdG9yLm5l d1RlbXBvcmFyeSgpLCBnZW5lcmF0b3IuZW1pdE5vZGUobm9kZS5tX2V4cHJlc3Npb24pKTsKIAog ICAgICAgICBnZW5lcmF0b3IuZW1pdFNldEZ1bmN0aW9uTmFtZUlmTmVlZGVkKG5vZGUubV9hc3Np Z24sIHZhbHVlLmdldCgpLCBwcm9wZXJ0eU5hbWVSZWdpc3Rlci5nZXQoKSk7CiAgICAgICAgIGdl bmVyYXRvci5lbWl0Q2FsbERlZmluZVByb3BlcnR5KG5ld09iaiwgcHJvcGVydHlOYW1lUmVnaXN0 ZXIuZ2V0KCksIHZhbHVlLmdldCgpLCBudWxscHRyLCBudWxscHRyLCBCeXRlY29kZUdlbmVyYXRv cjo6UHJvcGVydHlDb25maWd1cmFibGUgfCBCeXRlY29kZUdlbmVyYXRvcjo6UHJvcGVydHlXcml0 YWJsZSwgbV9wb3NpdGlvbik7CkBAIC03MzcsNyArNzM3LDcgQEAgdm9pZCBQcm9wZXJ0eUxpc3RO b2RlOjplbWl0UHV0Q29uc3RhbnRQcm9wZXJ0eShCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9y LCBSZWcKICAgICAgICAgZ2VuZXJhdG9yLmVtaXREaXJlY3RQdXRCeVZhbChuZXdPYmosIGluZGV4 LmdldCgpLCB2YWx1ZS5nZXQoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgUmVmUHRy PFJlZ2lzdGVySUQ+IHByb3BlcnR5TmFtZSA9IGdlbmVyYXRvci5lbWl0Tm9kZShub2RlLm1fZXhw cmVzc2lvbik7CisgICAgUmVmUHRyPFJlZ2lzdGVySUQ+IHByb3BlcnR5TmFtZSA9IGdlbmVyYXRv ci5lbWl0VG9Qcm9wZXJ0eUtleShnZW5lcmF0b3IubmV3VGVtcG9yYXJ5KCksIGdlbmVyYXRvci5l bWl0Tm9kZShub2RlLm1fZXhwcmVzc2lvbikpOwogICAgIGdlbmVyYXRvci5lbWl0U2V0RnVuY3Rp b25OYW1lSWZOZWVkZWQobm9kZS5tX2Fzc2lnbiwgdmFsdWUuZ2V0KCksIHByb3BlcnR5TmFtZS5n ZXQoKSk7CiAgICAgZ2VuZXJhdG9yLmVtaXREaXJlY3RQdXRCeVZhbChuZXdPYmosIHByb3BlcnR5 TmFtZS5nZXQoKSwgdmFsdWUuZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNGdW5jdGlvbi5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU0Z1bmN0aW9uLmNwcAppbmRleCBjZDZlYzE1ZWUwOWE5ZjM0Y2FmMmYyOTQwMGZjOTZk OWE1OWQ0ZGJjLi5lZTg1ZWUwNjQ2YzlkZGFmOWU2ZTk3YWYxN2I5ZjljMDM3N2QxOGUwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNwcApAQCAtNzY2LDkg Kzc2Niw4IEBAIHZvaWQgSlNGdW5jdGlvbjo6c2V0RnVuY3Rpb25OYW1lKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIEpTVmFsdWUgdmFsdWUpCiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IG5hbWUgPSBtYWtlU3RyaW5nKCdbJywgU3RyaW5nKCZ1aWQpLCAnXScpOwogICAgIH0gZWxzZSB7 Ci0gICAgICAgIEpTU3RyaW5nKiBqc1N0ciA9IHZhbHVlLnRvU3RyaW5nKGdsb2JhbE9iamVjdCk7 Ci0gICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7Ci0gICAgICAgIG5h bWUgPSBqc1N0ci0+dmFsdWUoZ2xvYmFsT2JqZWN0KTsKKyAgICAgICAgQVNTRVJUKHZhbHVlLmlz U3RyaW5nKCkpOworICAgICAgICBuYW1lID0gYXNTdHJpbmcodmFsdWUpLT52YWx1ZShnbG9iYWxP YmplY3QpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwogICAg IH0KICAgICByZWlmeU5hbWUodm0sIGdsb2JhbE9iamVjdCwgbmFtZSk7CmRpZmYgLS1naXQgYS9K U1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE3YjQxMmVjNWVkMjdi Y2U1OWY4N2QwNTBiOWZlYTQwNzU3YmY0OTEuLjI1NjgzZWJkMmNjNzYzZDA3MWJmNWUzNjE3N2Y5 MGZhYmYzYTBlZWQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDItMDggIFJvc3MgS2lyc2xpbmcgIDxy b3NzLmtpcnNsaW5nQHNvbnkuY29tPgorCisgICAgICAgIFtKU0NdIENvbXB1dGVkIGZ1bmN0aW9u IHByb3BlcnRpZXMgY29tcHV0ZSB0aGVpciBrZXlzIHR3aWNlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDcyOTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9jb21wdXRlZC1wcm9wZXJ0eS1r ZXktc2lkZS1lZmZlY3RzLmpzOiBBZGRlZC4KKyAgICAgICAgKiB0ZXN0MjYyL2V4cGVjdGF0aW9u cy55YW1sOiBNYXJrIDYgdGVzdCBjYXNlcyBhcyBwYXNzaW5nLgorCiAyMDIwLTAyLTA2ICBTdWtv bHNhayBTYWtzaHV3b25nICA8c3Vrb2xzYWtAZ21haWwuY29tPiBhbmQgQWxleGV5IFNodmF5a2Eg IDxzaHZhaWthbGVzaEBnbWFpbC5jb20+CiAKICAgICAgICAgSmF2YVNjcmlwdCBzdHJpbmcgY29y cnVwdGlvbiB1c2luZyBSZWdFeHAgd2l0aCB1bmljb2RlIGNoYXJhY3RlcgpkaWZmIC0tZ2l0IGEv SlNUZXN0cy9zdHJlc3MvY29tcHV0ZWQtcHJvcGVydHkta2V5LXNpZGUtZWZmZWN0cy5qcyBiL0pT VGVzdHMvc3RyZXNzL2NvbXB1dGVkLXByb3BlcnR5LWtleS1zaWRlLWVmZmVjdHMuanMKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uMDhkMWNmZGY2OTlhOTE3NTk3YjUxNzU3MTNjMmNmNTUxMmQ5NGRkZQotLS0gL2Rldi9u dWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL2NvbXB1dGVkLXByb3BlcnR5LWtleS1zaWRlLWVmZmVj dHMuanMKQEAgLTAsMCArMSwzOCBAQAorZnVuY3Rpb24gc2hvdWxkQmUoYWN0dWFsLCBleHBlY3Rl ZCkgeworICAgIGlmIChhY3R1YWwgIT09IGV4cGVjdGVkKQorICAgICAgICB0aHJvdyBuZXcgRXJy b3IoYGV4cGVjdGVkICR7ZXhwZWN0ZWR9IGJ1dCBnb3QgJHthY3R1YWx9YCk7Cit9CisKK2xldCBj b3VudDsKK2NvbnN0IGtleTEgPSB7IHRvU3RyaW5nKCkgeyBjb3VudCsrOyByZXR1cm4gJ2Zvbyc7 IH0gfTsKK2NvbnN0IGtleTIgPSB7IHRvU3RyaW5nOiBudWxsLCB2YWx1ZU9mKCkgeyBjb3VudCsr OyByZXR1cm4gJ2Zvbyc7IH0gfTsKKworZnVuY3Rpb24gdGVzdCgpIHsKKyAgY291bnQgPSAwOwor CisgICh7IFtrZXkxXSgpIHsgcmV0dXJuICdiYXInOyB9IH0pOworICBzaG91bGRCZShjb3VudCwg MSk7CisgICh7IFtrZXkxXTogZnVuY3Rpb24gKCkgeyByZXR1cm4gJ2Jhcic7IH0gfSk7CisgIHNo b3VsZEJlKGNvdW50LCAyKTsKKyAgKHsgW2tleTFdOiAoKSA9PiAnYmFyJyB9KTsKKyAgc2hvdWxk QmUoY291bnQsIDMpOworICAoeyBnZXQgW2tleTFdKCkgeyByZXR1cm4gJ2Jhcic7IH0gfSk7Cisg IHNob3VsZEJlKGNvdW50LCA0KTsKKyAgKHsgc2V0IFtrZXkxXShfKSB7fSB9KTsKKyAgc2hvdWxk QmUoY291bnQsIDUpOworCisgICh7IFtrZXkyXSgpIHsgcmV0dXJuICdiYXInOyB9IH0pOworICBz aG91bGRCZShjb3VudCwgNik7CisgICh7IFtrZXkyXTogZnVuY3Rpb24gKCkgeyByZXR1cm4gJ2Jh cic7IH0gfSk7CisgIHNob3VsZEJlKGNvdW50LCA3KTsKKyAgKHsgW2tleTJdOiAoKSA9PiAnYmFy JyB9KTsKKyAgc2hvdWxkQmUoY291bnQsIDgpOworICAoeyBnZXQgW2tleTJdKCkgeyByZXR1cm4g J2Jhcic7IH0gfSk7CisgIHNob3VsZEJlKGNvdW50LCA5KTsKKyAgKHsgc2V0IFtrZXkyXShfKSB7 fSB9KTsKKyAgc2hvdWxkQmUoY291bnQsIDEwKTsKK30KK25vSW5saW5lKHRlc3QpOworCitmb3Ig KGxldCBpID0gMDsgaSA8IDFlNTsgaSsrKQorICB0ZXN0KCk7CmRpZmYgLS1naXQgYS9KU1Rlc3Rz L3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwgYi9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25z LnlhbWwKaW5kZXggMGM1YmExZGZlMWUwMGVhNjVhY2U0ZGE0MjRjODA1NzdhZDc4MGI5Zi4uZmI4 Y2FhZmQ5ZmI0MGFiY2NiMGQ2Y2Q4MjI4ZDYyNmI3MTcwZDA5MSAxMDA2NDQKLS0tIGEvSlNUZXN0 cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCisrKyBiL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3Rh dGlvbnMueWFtbApAQCAtMjIwMywxNSArMjIwMyw2IEBAIHRlc3QvbGFuZ3VhZ2UvYmxvY2stc2Nv cGUvc3ludGF4L3JlZGVjbGFyYXRpb24vdmFyLXJlZGVjbGFyYXRpb24tYXR0ZW1wdC1hZnRlci1m CiAgIGRlZmF1bHQ6ICdUZXN0MjYyOiBUaGlzIHN0YXRlbWVudCBzaG91bGQgbm90IGJlIGV2YWx1 YXRlZC4nCiB0ZXN0L2xhbmd1YWdlL2Jsb2NrLXNjb3BlL3N5bnRheC9yZWRlY2xhcmF0aW9uL3Zh ci1yZWRlY2xhcmF0aW9uLWF0dGVtcHQtYWZ0ZXItZ2VuZXJhdG9yLmpzOgogICBkZWZhdWx0OiAn VGVzdDI2MjogVGhpcyBzdGF0ZW1lbnQgc2hvdWxkIG5vdCBiZSBldmFsdWF0ZWQuJwotdGVzdC9s YW5ndWFnZS9jb21wdXRlZC1wcm9wZXJ0eS1uYW1lcy90by1uYW1lLXNpZGUtZWZmZWN0cy9jbGFz cy5qczoKLSAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgWzAsIDFdIGFuZCBbMF0g dG8gaGF2ZSB0aGUgc2FtZSBjb250ZW50cy4gb3JkZXIgc2V0IGZvciBrZXkxJwotICBzdHJpY3Qg bW9kZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgWzAsIDFdIGFuZCBbMF0gdG8gaGF2ZSB0aGUg c2FtZSBjb250ZW50cy4gb3JkZXIgc2V0IGZvciBrZXkxJwotdGVzdC9sYW5ndWFnZS9jb21wdXRl ZC1wcm9wZXJ0eS1uYW1lcy90by1uYW1lLXNpZGUtZWZmZWN0cy9udW1iZXJzLWNsYXNzLmpzOgot ICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBbMCwgMV0gYW5kIFswXSB0byBoYXZl IHRoZSBzYW1lIGNvbnRlbnRzLiBvcmRlciBzZXQgZm9yIGtleTEnCi0gIHN0cmljdCBtb2RlOiAn VGVzdDI2MkVycm9yOiBFeHBlY3RlZCBbMCwgMV0gYW5kIFswXSB0byBoYXZlIHRoZSBzYW1lIGNv bnRlbnRzLiBvcmRlciBzZXQgZm9yIGtleTEnCi10ZXN0L2xhbmd1YWdlL2NvbXB1dGVkLXByb3Bl cnR5LW5hbWVzL3RvLW5hbWUtc2lkZS1lZmZlY3RzL29iamVjdC5qczoKLSAgZGVmYXVsdDogJ1Rl c3QyNjJFcnJvcjogVGhlIHJlc3VsdCBvZiBgY291bnRlcisrYCBpcyBgMGAgRXhwZWN0ZWQgU2Ft ZVZhbHVlKMKrMcK7LCDCqzDCuykgdG8gYmUgdHJ1ZScKLSAgc3RyaWN0IG1vZGU6ICdUZXN0MjYy RXJyb3I6IFRoZSByZXN1bHQgb2YgYGNvdW50ZXIrK2AgaXMgYDBgIEV4cGVjdGVkIFNhbWVWYWx1 ZSjCqzHCuywgwqswwrspIHRvIGJlIHRydWUnCiB0ZXN0L2xhbmd1YWdlL2V2YWwtY29kZS9kaXJl Y3QvbmV3LnRhcmdldC1hcnJvdy5qczoKICAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0 ZWQgU2FtZVZhbHVlKMKrZnVuY3Rpb24gUmVmZXJlbmNlRXJyb3IoKSB7JwogICBzdHJpY3QgbW9k ZTogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgU2FtZVZhbHVlKMKrZnVuY3Rpb24gUmVmZXJlbmNl RXJyb3IoKSB7Jwo= 390291 2020-02-10 13:53:24 -0800 2020-02-18 12:01:26 -0800 Patch bug-207297-20200210135323.patch text/plain 14203 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MDFhYTg5ZjgyNWM2MTViY2UyYmRiY2VkMTMyNjliNGM5ZTc5YTc4Li4zOTliY2U4MzgyOWNjMDc1 Y2M3MWEzNzlkZDM0Njg2N2EyMGE3MjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNyBAQAorMjAyMC0wMi0xMCAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgW0pTQ10gQ29tcHV0ZWQgZnVuY3Rpb24gcHJvcGVydGllcyBjb21w dXRlIHRoZWlyIGtleXMgdHdpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwNzI5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIElmIGEgcHNldWRvLVN0cmluZyBpcyB1c2VkIGFzIHRoZSBrZXkgb2YgYSBj b21wdXRlZCBmdW5jdGlvbiBwcm9wZXJ0eSwKKyAgICAgICAgYW55IHNpZGUgZWZmZWN0cyBmcm9t IHJlc29sdmluZyB0aGUgc3RyaW5nIHZhbHVlIG9jY3VyIGluIGR1cGxpY2F0ZS4KKworICAgICAg ICBUaGUgY2F1c2UgaGFzIHR3byBwYXJ0czoKKyAgICAgICAgICAtIFdlIGFyZW4ndCBlbnN1cmlu ZyB0aGF0IHRoZSBzdHJpbmcgdmFsdWUgaXMgcmVzb2x2ZWQgYmVmb3JlIGRvaW5nIFNldEZ1bmN0 aW9uTmFtZSBhbmQgUHV0QnlWYWwuCisgICAgICAgICAgLSBPdXIgaW1wbGVtZW50YXRpb24gb2Yg U2V0RnVuY3Rpb25OYW1lIChodHRwczovL3RjMzkuZXMvZWNtYTI2Mi8jc2VjLXNldGZ1bmN0aW9u bmFtZSkKKyAgICAgICAgICAgIGNhbGxzIHRvU3RyaW5nIG9uIGEgbm9uLXN5bWJvbCBhcmd1bWVu dCwgaW5zdGVhZCBvZiBhc3N1bWluZyB0aGUgdHlwZSBpcyBhIHN0cmluZy4KKworICAgICAgICAq IGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVj b2RlR2VuZXJhdG9yOjpzaG91bGRTZXRGdW5jdGlvbk5hbWUpOiBBZGRlZC4KKyAgICAgICAgKEpT Qzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRTZXRGdW5jdGlvbk5hbWUpOiBBZGRlZC4KKyAgICAg ICAgKEpTQzo6Qnl0ZWNvZGVHZW5lcmF0b3I6OmVtaXRTZXRGdW5jdGlvbk5hbWVJZk5lZWRlZElt cGwpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdFNldEZ1 bmN0aW9uTmFtZUlmTmVlZGVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBieXRlY29tcGlsZXIvQnl0 ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgU3BsaXQgdGhlICJpZiBuZWVkZWQiIGxvZ2ljIG91 dCBpbnRvIGl0cyBvd24gZnVuY3Rpb24uCisKKyAgICAgICAgKiBieXRlY29tcGlsZXIvTm9kZXND b2RlZ2VuLmNwcDoKKyAgICAgICAgKEpTQzo6UHJvcGVydHlMaXN0Tm9kZTo6ZW1pdEJ5dGVjb2Rl KToKKyAgICAgICAgKEpTQzo6UHJvcGVydHlMaXN0Tm9kZTo6ZW1pdFB1dENvbnN0YW50UHJvcGVy dHkpOgorICAgICAgICAoSlNDOjpEZWZpbmVGaWVsZE5vZGU6OmVtaXRCeXRlY29kZSk6CisgICAg ICAgIE5ldmVyIGVtaXQgT3BTZXRGdW5jdGlvbk5hbWUgZm9yIGEgbmFtZSBvZiB1bmtub3duIHR5 cGUuCisgICAgICAgIChCdXQgYWxzbywgZG9uJ3QgcGVyZm9ybSBhIG5lZWRsZXNzIFRvUHJvcGVy dHlLZXkgZm9yIG5vbi1mdW5jdGlvbiBjb21wdXRlZCBwcm9wZXJ0eSBrZXlzLikKKworICAgICAg ICAqIHJ1bnRpbWUvSlNGdW5jdGlvbi5jcHA6CisgICAgICAgIChKU0M6OkpTRnVuY3Rpb246OnNl dEZ1bmN0aW9uTmFtZSk6CisgICAgICAgIERvbid0IGNhbGwgdG9TdHJpbmcsIGFzc2VydCBpc1N0 cmluZy4KKwogMjAyMC0wMi0xMCAgVHJ1aXR0IFNhdmVsbCAgPHRzYXZlbGxAYXBwbGUuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyNTYwOTEuCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw CmluZGV4IDVhNzk5NmZkMGRiNmY3MDk1YTI2NGVjNTY1MGFhZWU5MTVjOGU3YjUuLmZhM2FiYmQx MWFkYTExY2VkOGFiZDdhMDU1ZDI2NTc5MDFjZGViMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCkBAIC0z MDc2LDM3ICszMDc2LDM4IEBAIFJlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0TmV3 RnVuY3Rpb24oUmVnaXN0ZXJJRCogZHN0LCBGdW5jdGlvbk1ldGFkYXRhCiAgICAgcmV0dXJuIGRz dDsKIH0KIAotdGVtcGxhdGU8dHlwZW5hbWUgTGF6eU5hbWVSZWdpc3RlckZuPgotdm9pZCBCeXRl Y29kZUdlbmVyYXRvcjo6ZW1pdFNldEZ1bmN0aW9uTmFtZUlmTmVlZGVkSW1wbChFeHByZXNzaW9u Tm9kZSogdmFsdWVOb2RlLCBSZWdpc3RlcklEKiB2YWx1ZSwgY29uc3QgTGF6eU5hbWVSZWdpc3Rl ckZuJiBsYXp5TmFtZUZuKQorYm9vbCBCeXRlY29kZUdlbmVyYXRvcjo6c2hvdWxkU2V0RnVuY3Rp b25OYW1lKEV4cHJlc3Npb25Ob2RlKiBub2RlKQogewotICAgIGlmICh2YWx1ZU5vZGUtPmlzQmFz ZUZ1bmNFeHByTm9kZSgpKSB7Ci0gICAgICAgIEZ1bmN0aW9uTWV0YWRhdGFOb2RlKiBtZXRhZGF0 YSA9IHN0YXRpY19jYXN0PEJhc2VGdW5jRXhwck5vZGUqPih2YWx1ZU5vZGUpLT5tZXRhZGF0YSgp OworICAgIGlmIChub2RlLT5pc0Jhc2VGdW5jRXhwck5vZGUoKSkgeworICAgICAgICBGdW5jdGlv bk1ldGFkYXRhTm9kZSogbWV0YWRhdGEgPSBzdGF0aWNfY2FzdDxCYXNlRnVuY0V4cHJOb2RlKj4o bm9kZSktPm1ldGFkYXRhKCk7CiAgICAgICAgIGlmICghbWV0YWRhdGEtPmVjbWFOYW1lKCkuaXNO dWxsKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfSBlbHNlIGlmICh2YWx1ZU5vZGUtPmlz Q2xhc3NFeHByTm9kZSgpKSB7Ci0gICAgICAgIENsYXNzRXhwck5vZGUqIGNsYXNzRXhwck5vZGUg PSBzdGF0aWNfY2FzdDxDbGFzc0V4cHJOb2RlKj4odmFsdWVOb2RlKTsKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9IGVsc2UgaWYgKG5vZGUtPmlzQ2xhc3NFeHByTm9kZSgpKSB7Cisg ICAgICAgIENsYXNzRXhwck5vZGUqIGNsYXNzRXhwck5vZGUgPSBzdGF0aWNfY2FzdDxDbGFzc0V4 cHJOb2RlKj4obm9kZSk7CiAgICAgICAgIGlmICghY2xhc3NFeHByTm9kZS0+ZWNtYU5hbWUoKS5p c051bGwoKSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgaWYgKGNsYXNzRXhwck5vZGUtPmhhc1N0YXRpY1Byb3BlcnR5KG1fdm0ucHJvcGVy dHlOYW1lcy0+bmFtZSkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfSBlbHNlCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgUmVnaXN0ZXJJRCogbmFtZSA9IGxhenlOYW1lRm4oKTsKKyAgICByZXR1cm4gdHJ1 ZTsKK30KKwordm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdFNldEZ1bmN0aW9uTmFtZShSZWdp c3RlcklEKiB2YWx1ZSwgY29uc3QgSWRlbnRpZmllciYgaWRlbnQpCit7CisgICAgUmVmUHRyPFJl Z2lzdGVySUQ+IG5hbWUgPSBlbWl0TG9hZChuZXdUZW1wb3JhcnkoKSwgaWRlbnQpOwogCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCB1c2UgYW4gb3BfY2FsbCB0byBhbiBpbnRlcm5hbCBmdW5jdGlv biBoZXJlIGluc3RlYWQuCiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1NTU0NwogICAgIE9wU2V0RnVuY3Rpb25OYW1lOjplbWl0KHRoaXMsIHZhbHVlLCBu YW1lKTsKIH0KIAotdm9pZCBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdFNldEZ1bmN0aW9uTmFtZUlm TmVlZGVkKEV4cHJlc3Npb25Ob2RlKiB2YWx1ZU5vZGUsIFJlZ2lzdGVySUQqIHZhbHVlLCBjb25z dCBJZGVudGlmaWVyJiBpZGVudCkKLXsKLSAgICBlbWl0U2V0RnVuY3Rpb25OYW1lSWZOZWVkZWRJ bXBsKHZhbHVlTm9kZSwgdmFsdWUsIFs9XSgpIHsgcmV0dXJuIGVtaXRMb2FkKG5ld1RlbXBvcmFy eSgpLCBpZGVudCk7IH0pOwotfQotCi12b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0U2V0RnVu Y3Rpb25OYW1lSWZOZWVkZWQoRXhwcmVzc2lvbk5vZGUqIHZhbHVlTm9kZSwgUmVnaXN0ZXJJRCog dmFsdWUsIFJlZ2lzdGVySUQqIG5hbWUpCit2b2lkIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0U2V0 RnVuY3Rpb25OYW1lKFJlZ2lzdGVySUQqIHZhbHVlLCBSZWdpc3RlcklEKiBuYW1lKQogewotICAg IGVtaXRTZXRGdW5jdGlvbk5hbWVJZk5lZWRlZEltcGwodmFsdWVOb2RlLCB2YWx1ZSwgWz1dKCkg eyByZXR1cm4gbmFtZTsgfSk7CisgICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgYW4gb3BfY2Fs bCB0byBhbiBpbnRlcm5hbCBmdW5jdGlvbiBoZXJlIGluc3RlYWQuCisgICAgLy8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTU0NworICAgIE9wU2V0RnVuY3Rpb25O YW1lOjplbWl0KHRoaXMsIHZhbHVlLCBuYW1lKTsKIH0KIAogUmVnaXN0ZXJJRCogQnl0ZWNvZGVH ZW5lcmF0b3I6OmVtaXRDYWxsKFJlZ2lzdGVySUQqIGRzdCwgUmVnaXN0ZXJJRCogZnVuYywgRXhw ZWN0ZWRGdW5jdGlvbiBleHBlY3RlZEZ1bmN0aW9uLCBDYWxsQXJndW1lbnRzJiBjYWxsQXJndW1l bnRzLCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3QsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBk aXZvdFN0YXJ0LCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3RFbmQsIERlYnVnZ2FibGVDYWxs IGRlYnVnZ2FibGVDYWxsKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCmluZGV4IGE4Yjk0M2NmMGMwMjgwZjVjMTE0ZDJk ZTlkOGZkOTMyYzJhNDU4ODQuLjI5ODkzNzQwYTg1YTU4NDllMzk3Mjg4NTY1MDMyYWU3NGJhZmY1 NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNv ZGVHZW5lcmF0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5 dGVjb2RlR2VuZXJhdG9yLmgKQEAgLTc1Myw4ICs3NTMsOSBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgUmVnaXN0ZXJJRCogZW1pdE5ld01ldGhvZERlZmluaXRpb24oUmVnaXN0ZXJJRCogZHN0 LCBNZXRob2REZWZpbml0aW9uTm9kZSopOwogICAgICAgICBSZWdpc3RlcklEKiBlbWl0TmV3UmVn RXhwKFJlZ2lzdGVySUQqIGRzdCwgUmVnRXhwKik7CiAKLSAgICAgICAgdm9pZCBlbWl0U2V0RnVu Y3Rpb25OYW1lSWZOZWVkZWQoRXhwcmVzc2lvbk5vZGUqIHZhbHVlTm9kZSwgUmVnaXN0ZXJJRCog dmFsdWUsIFJlZ2lzdGVySUQqIG5hbWUpOwotICAgICAgICB2b2lkIGVtaXRTZXRGdW5jdGlvbk5h bWVJZk5lZWRlZChFeHByZXNzaW9uTm9kZSogdmFsdWVOb2RlLCBSZWdpc3RlcklEKiB2YWx1ZSwg Y29uc3QgSWRlbnRpZmllciYpOworICAgICAgICBib29sIHNob3VsZFNldEZ1bmN0aW9uTmFtZShF eHByZXNzaW9uTm9kZSopOworICAgICAgICB2b2lkIGVtaXRTZXRGdW5jdGlvbk5hbWUoUmVnaXN0 ZXJJRCogdmFsdWUsIFJlZ2lzdGVySUQqIG5hbWUpOworICAgICAgICB2b2lkIGVtaXRTZXRGdW5j dGlvbk5hbWUoUmVnaXN0ZXJJRCogdmFsdWUsIGNvbnN0IElkZW50aWZpZXImKTsKIAogICAgICAg ICBSZWdpc3RlcklEKiBtb3ZlTGlua1RpbWVDb25zdGFudChSZWdpc3RlcklEKiBkc3QsIExpbmtU aW1lQ29uc3RhbnQpOwogICAgICAgICBSZWdpc3RlcklEKiBtb3ZlRW1wdHlWYWx1ZShSZWdpc3Rl cklEKiBkc3QpOwpAQCAtOTc5LDkgKzk4MCw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBi b29sIGVtaXRSZXR1cm5WaWFGaW5hbGx5SWZOZWVkZWQoUmVnaXN0ZXJJRCogcmV0dXJuUmVnaXN0 ZXIpOwogICAgICAgICB2b2lkIGVtaXRGaW5hbGx5Q29tcGxldGlvbihGaW5hbGx5Q29udGV4dCYs IExhYmVsJiBub3JtYWxDb21wbGV0aW9uTGFiZWwpOwogCi0gICAgICAgIHRlbXBsYXRlPHR5cGVu YW1lIExhenlOYW1lUmVnaXN0ZXJGbj4KLSAgICAgICAgdm9pZCBlbWl0U2V0RnVuY3Rpb25OYW1l SWZOZWVkZWRJbXBsKEV4cHJlc3Npb25Ob2RlKiwgUmVnaXN0ZXJJRCosIGNvbnN0IExhenlOYW1l UmVnaXN0ZXJGbiYpOwotCiAgICAgcHVibGljOgogICAgICAgICB2b2lkIHB1c2hGaW5hbGx5Q29u dHJvbEZsb3dTY29wZShGaW5hbGx5Q29udGV4dCYpOwogICAgICAgICB2b2lkIHBvcEZpbmFsbHlD b250cm9sRmxvd1Njb3BlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv bXBpbGVyL05vZGVzQ29kZWdlbi5jcHAKaW5kZXggODI1NjMxOGMxZTM3ZjQzZjJlYTQ1NTMxNDkz OGUwZjU4ZWFhMTQ5YS4uNjdlYzk2ZWMwMzIyZGQ2YjMwN2I3N2FlNGE4Y2E1YjI0Yzk1MjNmNSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rlc0NvZGVn ZW4uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2Rl Z2VuLmNwcApAQCAtNjQ0LDcgKzY0NCwxMCBAQCBSZWdpc3RlcklEKiBQcm9wZXJ0eUxpc3ROb2Rl OjplbWl0Qnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZQogICAg ICAgICAgICAgICAgIC8vIENvbXB1dGVkIGFjY2Vzc29ycy4KICAgICAgICAgICAgICAgICBpZiAo bm9kZS0+bV90eXBlICYgUHJvcGVydHlOb2RlOjpDb21wdXRlZCkgewogICAgICAgICAgICAgICAg ICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gcHJvcGVydHlOYW1lID0gZ2VuZXJhdG9yLmVtaXROb2Rl KG5vZGUtPm1fZXhwcmVzc2lvbik7Ci0gICAgICAgICAgICAgICAgICAgIGdlbmVyYXRvci5lbWl0 U2V0RnVuY3Rpb25OYW1lSWZOZWVkZWQobm9kZS0+bV9hc3NpZ24sIHZhbHVlLmdldCgpLCBwcm9w ZXJ0eU5hbWUuZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICBpZiAoZ2VuZXJhdG9yLnNob3Vs ZFNldEZ1bmN0aW9uTmFtZShub2RlLT5tX2Fzc2lnbikpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHByb3BlcnR5TmFtZSA9IGdlbmVyYXRvci5lbWl0VG9Qcm9wZXJ0eUtleShnZW5lcmF0b3Iu bmV3VGVtcG9yYXJ5KCksIHByb3BlcnR5TmFtZS5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICBnZW5lcmF0b3IuZW1pdFNldEZ1bmN0aW9uTmFtZSh2YWx1ZS5nZXQoKSwgcHJvcGVydHlO YW1lLmdldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBp ZiAobm9kZS0+bV90eXBlICYgUHJvcGVydHlOb2RlOjpHZXR0ZXIpCiAgICAgICAgICAgICAgICAg ICAgICAgICBnZW5lcmF0b3IuZW1pdFB1dEdldHRlckJ5VmFsKGRzdCwgcHJvcGVydHlOYW1lLmdl dCgpLCBhdHRyaWJ1dGVzLCB2YWx1ZS5nZXQoKSk7CiAgICAgICAgICAgICAgICAgICAgIGVsc2UK QEAgLTcyMiw3ICs3MjUsMTAgQEAgdm9pZCBQcm9wZXJ0eUxpc3ROb2RlOjplbWl0UHV0Q29uc3Rh bnRQcm9wZXJ0eShCeXRlY29kZUdlbmVyYXRvciYgZ2VuZXJhdG9yLCBSZWcKICAgICAgICAgZWxz ZQogICAgICAgICAgICAgcHJvcGVydHlOYW1lUmVnaXN0ZXIgPSBnZW5lcmF0b3IuZW1pdE5vZGUo bm9kZS5tX2V4cHJlc3Npb24pOwogCi0gICAgICAgIGdlbmVyYXRvci5lbWl0U2V0RnVuY3Rpb25O YW1lSWZOZWVkZWQobm9kZS5tX2Fzc2lnbiwgdmFsdWUuZ2V0KCksIHByb3BlcnR5TmFtZVJlZ2lz dGVyLmdldCgpKTsKKyAgICAgICAgaWYgKGdlbmVyYXRvci5zaG91bGRTZXRGdW5jdGlvbk5hbWUo bm9kZS5tX2Fzc2lnbikpIHsKKyAgICAgICAgICAgIHByb3BlcnR5TmFtZVJlZ2lzdGVyID0gZ2Vu ZXJhdG9yLmVtaXRUb1Byb3BlcnR5S2V5KGdlbmVyYXRvci5uZXdUZW1wb3JhcnkoKSwgcHJvcGVy dHlOYW1lUmVnaXN0ZXIuZ2V0KCkpOworICAgICAgICAgICAgZ2VuZXJhdG9yLmVtaXRTZXRGdW5j dGlvbk5hbWUodmFsdWUuZ2V0KCksIHByb3BlcnR5TmFtZVJlZ2lzdGVyLmdldCgpKTsKKyAgICAg ICAgfQogICAgICAgICBnZW5lcmF0b3IuZW1pdENhbGxEZWZpbmVQcm9wZXJ0eShuZXdPYmosIHBy b3BlcnR5TmFtZVJlZ2lzdGVyLmdldCgpLCB2YWx1ZS5nZXQoKSwgbnVsbHB0ciwgbnVsbHB0ciwg Qnl0ZWNvZGVHZW5lcmF0b3I6OlByb3BlcnR5Q29uZmlndXJhYmxlIHwgQnl0ZWNvZGVHZW5lcmF0 b3I6OlByb3BlcnR5V3JpdGFibGUsIG1fcG9zaXRpb24pOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtNzM4LDcgKzc0NCwxMCBAQCB2b2lkIFByb3BlcnR5TGlzdE5vZGU6OmVtaXRQdXRDb25z dGFudFByb3BlcnR5KEJ5dGVjb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZwogICAgICAgICBy ZXR1cm47CiAgICAgfQogICAgIFJlZlB0cjxSZWdpc3RlcklEPiBwcm9wZXJ0eU5hbWUgPSBnZW5l cmF0b3IuZW1pdE5vZGUobm9kZS5tX2V4cHJlc3Npb24pOwotICAgIGdlbmVyYXRvci5lbWl0U2V0 RnVuY3Rpb25OYW1lSWZOZWVkZWQobm9kZS5tX2Fzc2lnbiwgdmFsdWUuZ2V0KCksIHByb3BlcnR5 TmFtZS5nZXQoKSk7CisgICAgaWYgKGdlbmVyYXRvci5zaG91bGRTZXRGdW5jdGlvbk5hbWUobm9k ZS5tX2Fzc2lnbikpIHsKKyAgICAgICAgcHJvcGVydHlOYW1lID0gZ2VuZXJhdG9yLmVtaXRUb1By b3BlcnR5S2V5KGdlbmVyYXRvci5uZXdUZW1wb3JhcnkoKSwgcHJvcGVydHlOYW1lLmdldCgpKTsK KyAgICAgICAgZ2VuZXJhdG9yLmVtaXRTZXRGdW5jdGlvbk5hbWUodmFsdWUuZ2V0KCksIHByb3Bl cnR5TmFtZS5nZXQoKSk7CisgICAgfQogICAgIGdlbmVyYXRvci5lbWl0RGlyZWN0UHV0QnlWYWwo bmV3T2JqLCBwcm9wZXJ0eU5hbWUuZ2V0KCksIHZhbHVlLmdldCgpKTsKIH0KIApAQCAtNDMyNSw4 ICs0MzM0LDggQEAgdm9pZCBEZWZpbmVGaWVsZE5vZGU6OmVtaXRCeXRlY29kZShCeXRlY29kZUdl bmVyYXRvciYgZ2VuZXJhdG9yLCBSZWdpc3RlcklEKikKICAgICAgICAgZ2VuZXJhdG9yLmVtaXRM b2FkKHZhbHVlLmdldCgpLCBqc1VuZGVmaW5lZCgpKTsKICAgICBlbHNlIHsKICAgICAgICAgZ2Vu ZXJhdG9yLmVtaXROb2RlKHZhbHVlLmdldCgpLCBtX2Fzc2lnbik7Ci0gICAgICAgIGlmIChtX2lk ZW50KQotICAgICAgICAgICAgZ2VuZXJhdG9yLmVtaXRTZXRGdW5jdGlvbk5hbWVJZk5lZWRlZCht X2Fzc2lnbiwgdmFsdWUuZ2V0KCksICptX2lkZW50KTsKKyAgICAgICAgaWYgKG1faWRlbnQgJiYg Z2VuZXJhdG9yLnNob3VsZFNldEZ1bmN0aW9uTmFtZShtX2Fzc2lnbikpCisgICAgICAgICAgICBn ZW5lcmF0b3IuZW1pdFNldEZ1bmN0aW9uTmFtZSh2YWx1ZS5nZXQoKSwgKm1faWRlbnQpOwogICAg IH0KIAogICAgIHN3aXRjaCAobV90eXBlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTRnVuY3Rpb24uY3BwCmluZGV4IGNkNmVjMTVlZTA5YTlmMzRjYWYyZjI5NDAwZmM5NmQ5 YTU5ZDRkYmMuLmVlODVlZTA2NDZjOWRkYWY5ZTZlOTdhZjE3YjlmOWMwMzc3ZDE4ZTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rpb24uY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rpb24uY3BwCkBAIC03NjYsOSAr NzY2LDggQEAgdm9pZCBKU0Z1bmN0aW9uOjpzZXRGdW5jdGlvbk5hbWUoSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwgSlNWYWx1ZSB2YWx1ZSkKICAgICAgICAgZWxzZQogICAgICAgICAgICAg bmFtZSA9IG1ha2VTdHJpbmcoJ1snLCBTdHJpbmcoJnVpZCksICddJyk7CiAgICAgfSBlbHNlIHsK LSAgICAgICAgSlNTdHJpbmcqIGpzU3RyID0gdmFsdWUudG9TdHJpbmcoZ2xvYmFsT2JqZWN0KTsK LSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKLSAgICAgICAgbmFt ZSA9IGpzU3RyLT52YWx1ZShnbG9iYWxPYmplY3QpOworICAgICAgICBBU1NFUlQodmFsdWUuaXNT dHJpbmcoKSk7CisgICAgICAgIG5hbWUgPSBhc1N0cmluZyh2YWx1ZSktPnZhbHVlKGdsb2JhbE9i amVjdCk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CiAgICAg fQogICAgIHJlaWZ5TmFtZSh2bSwgZ2xvYmFsT2JqZWN0LCBuYW1lKTsKZGlmZiAtLWdpdCBhL0pT VGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTdiNDEyZWM1ZWQyN2Jj ZTU5Zjg3ZDA1MGI5ZmVhNDA3NTdiZjQ5MS4uYTBkNTkwYmM3MGU3NDQzM2VhMTdlNzk4M2I1MWQz YTkxYTkwMDQ3NyAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wMi0xMCAgUm9zcyBLaXJzbGluZyAgPHJv c3Mua2lyc2xpbmdAc29ueS5jb20+CisKKyAgICAgICAgW0pTQ10gQ29tcHV0ZWQgZnVuY3Rpb24g cHJvcGVydGllcyBjb21wdXRlIHRoZWlyIGtleXMgdHdpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzI5NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL2NvbXB1dGVkLXByb3BlcnR5LWtl eS1zaWRlLWVmZmVjdHMuanM6IEFkZGVkLgorICAgICAgICAqIHRlc3QyNjIvZXhwZWN0YXRpb25z LnlhbWw6IE1hcmsgNiB0ZXN0IGNhc2VzIGFzIHBhc3NpbmcuCisKIDIwMjAtMDItMDYgIFN1a29s c2FrIFNha3NodXdvbmcgIDxzdWtvbHNha0BnbWFpbC5jb20+IGFuZCBBbGV4ZXkgU2h2YXlrYSAg PHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBKYXZhU2NyaXB0IHN0cmluZyBjb3Jy dXB0aW9uIHVzaW5nIFJlZ0V4cCB3aXRoIHVuaWNvZGUgY2hhcmFjdGVyCmRpZmYgLS1naXQgYS9K U1Rlc3RzL3N0cmVzcy9jb21wdXRlZC1wcm9wZXJ0eS1rZXktc2lkZS1lZmZlY3RzLmpzIGIvSlNU ZXN0cy9zdHJlc3MvY29tcHV0ZWQtcHJvcGVydHkta2V5LXNpZGUtZWZmZWN0cy5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4wOGQxY2ZkZjY5OWE5MTc1OTdiNTE3NTcxM2MyY2Y1NTEyZDk0ZGRlCi0tLSAvZGV2L251 bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvY29tcHV0ZWQtcHJvcGVydHkta2V5LXNpZGUtZWZmZWN0 cy5qcwpAQCAtMCwwICsxLDM4IEBACitmdW5jdGlvbiBzaG91bGRCZShhY3R1YWwsIGV4cGVjdGVk KSB7CisgICAgaWYgKGFjdHVhbCAhPT0gZXhwZWN0ZWQpCisgICAgICAgIHRocm93IG5ldyBFcnJv cihgZXhwZWN0ZWQgJHtleHBlY3RlZH0gYnV0IGdvdCAke2FjdHVhbH1gKTsKK30KKworbGV0IGNv dW50OworY29uc3Qga2V5MSA9IHsgdG9TdHJpbmcoKSB7IGNvdW50Kys7IHJldHVybiAnZm9vJzsg fSB9OworY29uc3Qga2V5MiA9IHsgdG9TdHJpbmc6IG51bGwsIHZhbHVlT2YoKSB7IGNvdW50Kys7 IHJldHVybiAnZm9vJzsgfSB9OworCitmdW5jdGlvbiB0ZXN0KCkgeworICBjb3VudCA9IDA7CisK KyAgKHsgW2tleTFdKCkgeyByZXR1cm4gJ2Jhcic7IH0gfSk7CisgIHNob3VsZEJlKGNvdW50LCAx KTsKKyAgKHsgW2tleTFdOiBmdW5jdGlvbiAoKSB7IHJldHVybiAnYmFyJzsgfSB9KTsKKyAgc2hv dWxkQmUoY291bnQsIDIpOworICAoeyBba2V5MV06ICgpID0+ICdiYXInIH0pOworICBzaG91bGRC ZShjb3VudCwgMyk7CisgICh7IGdldCBba2V5MV0oKSB7IHJldHVybiAnYmFyJzsgfSB9KTsKKyAg c2hvdWxkQmUoY291bnQsIDQpOworICAoeyBzZXQgW2tleTFdKF8pIHt9IH0pOworICBzaG91bGRC ZShjb3VudCwgNSk7CisKKyAgKHsgW2tleTJdKCkgeyByZXR1cm4gJ2Jhcic7IH0gfSk7CisgIHNo b3VsZEJlKGNvdW50LCA2KTsKKyAgKHsgW2tleTJdOiBmdW5jdGlvbiAoKSB7IHJldHVybiAnYmFy JzsgfSB9KTsKKyAgc2hvdWxkQmUoY291bnQsIDcpOworICAoeyBba2V5Ml06ICgpID0+ICdiYXIn IH0pOworICBzaG91bGRCZShjb3VudCwgOCk7CisgICh7IGdldCBba2V5Ml0oKSB7IHJldHVybiAn YmFyJzsgfSB9KTsKKyAgc2hvdWxkQmUoY291bnQsIDkpOworICAoeyBzZXQgW2tleTJdKF8pIHt9 IH0pOworICBzaG91bGRCZShjb3VudCwgMTApOworfQorbm9JbmxpbmUodGVzdCk7CisKK2ZvciAo bGV0IGkgPSAwOyBpIDwgMWU1OyBpKyspCisgIHRlc3QoKTsKZGlmZiAtLWdpdCBhL0pTVGVzdHMv dGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbCBiL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMu eWFtbAppbmRleCAwYzViYTFkZmUxZTAwZWE2NWFjZTRkYTQyNGM4MDU3N2FkNzgwYjlmLi5mYjhj YWFmZDlmYjQwYWJjY2IwZDZjZDgyMjhkNjI2YjcxNzBkMDkxIDEwMDY0NAotLS0gYS9KU1Rlc3Rz L3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKKysrIGIvSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0 aW9ucy55YW1sCkBAIC0yMjAzLDE1ICsyMjAzLDYgQEAgdGVzdC9sYW5ndWFnZS9ibG9jay1zY29w ZS9zeW50YXgvcmVkZWNsYXJhdGlvbi92YXItcmVkZWNsYXJhdGlvbi1hdHRlbXB0LWFmdGVyLWYK ICAgZGVmYXVsdDogJ1Rlc3QyNjI6IFRoaXMgc3RhdGVtZW50IHNob3VsZCBub3QgYmUgZXZhbHVh dGVkLicKIHRlc3QvbGFuZ3VhZ2UvYmxvY2stc2NvcGUvc3ludGF4L3JlZGVjbGFyYXRpb24vdmFy LXJlZGVjbGFyYXRpb24tYXR0ZW1wdC1hZnRlci1nZW5lcmF0b3IuanM6CiAgIGRlZmF1bHQ6ICdU ZXN0MjYyOiBUaGlzIHN0YXRlbWVudCBzaG91bGQgbm90IGJlIGV2YWx1YXRlZC4nCi10ZXN0L2xh bmd1YWdlL2NvbXB1dGVkLXByb3BlcnR5LW5hbWVzL3RvLW5hbWUtc2lkZS1lZmZlY3RzL2NsYXNz LmpzOgotICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBbMCwgMV0gYW5kIFswXSB0 byBoYXZlIHRoZSBzYW1lIGNvbnRlbnRzLiBvcmRlciBzZXQgZm9yIGtleTEnCi0gIHN0cmljdCBt b2RlOiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBbMCwgMV0gYW5kIFswXSB0byBoYXZlIHRoZSBz YW1lIGNvbnRlbnRzLiBvcmRlciBzZXQgZm9yIGtleTEnCi10ZXN0L2xhbmd1YWdlL2NvbXB1dGVk LXByb3BlcnR5LW5hbWVzL3RvLW5hbWUtc2lkZS1lZmZlY3RzL251bWJlcnMtY2xhc3MuanM6Ci0g IGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFswLCAxXSBhbmQgWzBdIHRvIGhhdmUg dGhlIHNhbWUgY29udGVudHMuIG9yZGVyIHNldCBmb3Iga2V5MScKLSAgc3RyaWN0IG1vZGU6ICdU ZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFswLCAxXSBhbmQgWzBdIHRvIGhhdmUgdGhlIHNhbWUgY29u dGVudHMuIG9yZGVyIHNldCBmb3Iga2V5MScKLXRlc3QvbGFuZ3VhZ2UvY29tcHV0ZWQtcHJvcGVy dHktbmFtZXMvdG8tbmFtZS1zaWRlLWVmZmVjdHMvb2JqZWN0LmpzOgotICBkZWZhdWx0OiAnVGVz dDI2MkVycm9yOiBUaGUgcmVzdWx0IG9mIGBjb3VudGVyKytgIGlzIGAwYCBFeHBlY3RlZCBTYW1l VmFsdWUowqsxwrssIMKrMMK7KSB0byBiZSB0cnVlJwotICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJF cnJvcjogVGhlIHJlc3VsdCBvZiBgY291bnRlcisrYCBpcyBgMGAgRXhwZWN0ZWQgU2FtZVZhbHVl KMKrMcK7LCDCqzDCuykgdG8gYmUgdHJ1ZScKIHRlc3QvbGFuZ3VhZ2UvZXZhbC1jb2RlL2RpcmVj dC9uZXcudGFyZ2V0LWFycm93LmpzOgogICBkZWZhdWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3Rl ZCBTYW1lVmFsdWUowqtmdW5jdGlvbiBSZWZlcmVuY2VFcnJvcigpIHsnCiAgIHN0cmljdCBtb2Rl OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBTYW1lVmFsdWUowqtmdW5jdGlvbiBSZWZlcmVuY2VF cnJvcigpIHsnCg==