185587 2018-05-13 11:28:37 -0700 [JSC] Fix CachedCall's argument count if RegExp has named captures 2018-05-22 17:18:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki commit-queue ews-watchlist fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1423431 0 ysuzuki 2018-05-13 11:28:37 -0700 [JSC] Fix CachedCall's argument count if RegExp has named captures 1423432 1 340269 ysuzuki 2018-05-13 11:35:19 -0700 Created attachment 340269 Patch 1426395 2 340269 mark.lam 2018-05-22 16:48:58 -0700 Comment on attachment 340269 Patch r=me 1426416 3 340269 commit-queue 2018-05-22 17:17:03 -0700 Comment on attachment 340269 Patch Clearing flags on attachment: 340269 Committed r232092: <https://trac.webkit.org/changeset/232092> 1426417 4 commit-queue 2018-05-22 17:17:04 -0700 All reviewed patches have been landed. Closing bug. 1426421 5 webkit-bug-importer 2018-05-22 17:18:22 -0700 <rdar://problem/40470543> 340269 2018-05-13 11:35:19 -0700 2018-05-22 17:17:03 -0700 Patch bug-185587-20180514033518.patch text/plain 11259 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MjM2YjQ2NTQ0ZGZkNTMwMTJjNjA3N2QyYmI3OWMzZjY4MTAzNWE2Li5kMzdhNDY2OGE4OGNkZTRj NzNlYWI5YWYxNjdlOTFmNDQ0NDJhYWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxOC0wNS0xMyAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBGaXggQ2FjaGVkQ2FsbCdzIGFyZ3VtZW50IGNvdW50IGlm IFJlZ0V4cCBoYXMgbmFtZWQgY2FwdHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NTU4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIElmIHRoZSBnaXZlbiBSZWdFeHAgaGFzIG5hbWVkIGNhcHR1cmVz LCB0aGUgYXJndW1lbnQgY291bnQgb2YgQ2FjaGVkQ2FsbCBpbiBTdHJpbmcjcmVwbGFjZQorICAg ICAgICBzaG91bGQgYmUgaW5jcmVhc2VkIGJ5IG9uZS4gVGhpcyBjYXVzZXMgY3Jhc2ggd2l0aCBh c3NlcnRpb24gaW4gdGVzdDI2Mi4gVGhpcyBwYXRjaCBjb3JyZWN0cworICAgICAgICB0aGUgYXJn dW1lbnQgY291bnQuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIHVuaWZpZXMgc291cmNlLmlz OEJpdCgpLyFzb3VyY2UuaXM4Qml0KCkgY29kZSBzaW5jZSB0aGV5IGFyZSBub3cgY29tcGxldGVs eQorICAgICAgICB0aGUgc2FtZS4KKworICAgICAgICAqIHJ1bnRpbWUvU3RyaW5nUHJvdG90eXBl LmNwcDoKKyAgICAgICAgKEpTQzo6cmVwbGFjZVVzaW5nUmVnRXhwU2VhcmNoKToKKwogMjAxOC0w NS0xMiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIENhY2hlZENh bGw6OmNhbGwoKSBzaG91bGQgYmUgZmFzdGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcAppbmRleCAzM2VhY2IyYTBiZTJiN2ExNzJlNGM4 YjQ4YmY0ZmQ3Y2Y4OGM1ZTQwLi5iNTBiMTc0Y2Y5MGUzN2E0OWUxMjc2ZDRjYmUyYzBlMTA2Mjlm Y2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90 b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3Rv dHlwZS5jcHAKQEAgLTU2NSwxNDAgKzU2NSw3MyBAQCBzdGF0aWMgQUxXQVlTX0lOTElORSBKU1N0 cmluZyogcmVwbGFjZVVzaW5nUmVnRXhwU2VhcmNoKAogICAgIGlmIChnbG9iYWwgJiYgY2FsbFR5 cGUgPT0gQ2FsbFR5cGU6OkpTKSB7CiAgICAgICAgIC8vIHJlZ0V4cC0+bnVtU3VicGF0dGVybnMo KSArIDEgZm9yIHBhdHRlcm4gYXJncywgKyAyIGZvciBtYXRjaCBzdGFydCBhbmQgc3RyaW5nCiAg ICAgICAgIGludCBhcmdDb3VudCA9IHJlZ0V4cC0+bnVtU3VicGF0dGVybnMoKSArIDEgKyAyOwor ICAgICAgICBpZiAoaGFzTmFtZWRDYXB0dXJlcykKKyAgICAgICAgICAgICsrYXJnQ291bnQ7CiAg ICAgICAgIEpTRnVuY3Rpb24qIGZ1bmMgPSBqc0Nhc3Q8SlNGdW5jdGlvbio+KHJlcGxhY2VWYWx1 ZSk7CiAgICAgICAgIENhY2hlZENhbGwgY2FjaGVkQ2FsbChleGVjLCBmdW5jLCBhcmdDb3VudCk7 CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOwotICAgICAgICBp ZiAoc291cmNlLmlzOEJpdCgpKSB7Ci0gICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAg ICAgICAgICAgIGludCogb3ZlY3RvcjsKLSAgICAgICAgICAgICAgICBNYXRjaFJlc3VsdCByZXN1 bHQgPSByZWdFeHBDb25zdHJ1Y3Rvci0+cGVyZm9ybU1hdGNoKHZtLCByZWdFeHAsIHN0cmluZywg c291cmNlLCBzdGFydFBvc2l0aW9uLCAmb3ZlY3Rvcik7Ci0gICAgICAgICAgICAgICAgaWYgKCFy ZXN1bHQpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICAgICAgaWYg KFVOTElLRUxZKCFzb3VyY2VSYW5nZXMudHJ5Q29uc3RydWN0QW5kQXBwZW5kKGxhc3RJbmRleCwg cmVzdWx0LnN0YXJ0IC0gbGFzdEluZGV4KSkpCi0gICAgICAgICAgICAgICAgICAgIE9VVF9PRl9N RU1PUlkoZXhlYywgc2NvcGUpOwotCi0gICAgICAgICAgICAgICAgdW5zaWduZWQgaSA9IDA7Ci0g ICAgICAgICAgICAgICAgY2FjaGVkQ2FsbC5jbGVhckFyZ3VtZW50cygpOwotCi0gICAgICAgICAg ICAgICAgSlNPYmplY3QqIGdyb3VwcyA9IG51bGxwdHI7Ci0KLSAgICAgICAgICAgICAgICBpZiAo aGFzTmFtZWRDYXB0dXJlcykgewotICAgICAgICAgICAgICAgICAgICBKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0ID0gZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpOwotICAgICAgICAgICAg ICAgICAgICBncm91cHMgPSBKU0ZpbmFsT2JqZWN0OjpjcmVhdGUodm0sIEpTRmluYWxPYmplY3Q6 OmNyZWF0ZVN0cnVjdHVyZSh2bSwgZ2xvYmFsT2JqZWN0LCBnbG9iYWxPYmplY3QtPm9iamVjdFBy b3RvdHlwZSgpLCAwKSk7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgZm9y ICg7IGkgPCByZWdFeHAtPm51bVN1YnBhdHRlcm5zKCkgKyAxOyArK2kpIHsKLSAgICAgICAgICAg ICAgICAgICAgaW50IG1hdGNoU3RhcnQgPSBvdmVjdG9yW2kgKiAyXTsKLSAgICAgICAgICAgICAg ICAgICAgaW50IG1hdGNoTGVuID0gb3ZlY3RvcltpICogMiArIDFdIC0gbWF0Y2hTdGFydDsKLQot ICAgICAgICAgICAgICAgICAgICBKU1ZhbHVlIHBhdHRlcm5WYWx1ZTsKLQotICAgICAgICAgICAg ICAgICAgICBpZiAobWF0Y2hTdGFydCA8IDApCi0gICAgICAgICAgICAgICAgICAgICAgICBwYXR0 ZXJuVmFsdWUgPSBqc1VuZGVmaW5lZCgpOwotICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgICAgICAgICBwYXR0ZXJuVmFsdWUgPSBqc1N1YnN0cmluZygmdm0sIHNvdXJj ZSwgbWF0Y2hTdGFydCwgbWF0Y2hMZW4pOwotCi0gICAgICAgICAgICAgICAgICAgIGNhY2hlZENh bGwuYXBwZW5kQXJndW1lbnQocGF0dGVyblZhbHVlKTsKLQotICAgICAgICAgICAgICAgICAgICBp ZiAoaSAmJiBoYXNOYW1lZENhcHR1cmVzKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBTdHJp bmcgZ3JvdXBOYW1lID0gcmVnRXhwLT5nZXRDYXB0dXJlR3JvdXBOYW1lKGkpOwotICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKCFncm91cE5hbWUuaXNFbXB0eSgpKQotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdyb3Vwcy0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5n KCZ2bSwgZ3JvdXBOYW1lKSwgcGF0dGVyblZhbHVlKTsKLSAgICAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIGNhY2hlZENhbGwuYXBwZW5kQXJn dW1lbnQoanNOdW1iZXIocmVzdWx0LnN0YXJ0KSk7Ci0gICAgICAgICAgICAgICAgY2FjaGVkQ2Fs bC5hcHBlbmRBcmd1bWVudChzdHJpbmcpOwotICAgICAgICAgICAgICAgIGlmIChoYXNOYW1lZENh cHR1cmVzKQotICAgICAgICAgICAgICAgICAgICBjYWNoZWRDYWxsLmFwcGVuZEFyZ3VtZW50KGdy b3Vwcyk7CisgICAgICAgIHdoaWxlICh0cnVlKSB7CisgICAgICAgICAgICBpbnQqIG92ZWN0b3I7 CisgICAgICAgICAgICBNYXRjaFJlc3VsdCByZXN1bHQgPSByZWdFeHBDb25zdHJ1Y3Rvci0+cGVy Zm9ybU1hdGNoKHZtLCByZWdFeHAsIHN0cmluZywgc291cmNlLCBzdGFydFBvc2l0aW9uLCAmb3Zl Y3Rvcik7CisgICAgICAgICAgICBpZiAoIXJlc3VsdCkKKyAgICAgICAgICAgICAgICBicmVhazsK IAotICAgICAgICAgICAgICAgIGNhY2hlZENhbGwuc2V0VGhpcyhqc1VuZGVmaW5lZCgpKTsKLSAg ICAgICAgICAgICAgICBpZiAoVU5MSUtFTFkoY2FjaGVkQ2FsbC5oYXNPdmVyZmxvd2VkQXJndW1l bnRzKCkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHRocm93T3V0T2ZNZW1vcnlFcnJvcihleGVj LCBzY29wZSk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGlmIChVTkxJS0VMWSghc291cmNlUmFuZ2VzLnRyeUNvbnN0 cnVjdEFuZEFwcGVuZChsYXN0SW5kZXgsIHJlc3VsdC5zdGFydCAtIGxhc3RJbmRleCkpKQorICAg ICAgICAgICAgICAgIE9VVF9PRl9NRU1PUlkoZXhlYywgc2NvcGUpOwogCi0gICAgICAgICAgICAg ICAgSlNWYWx1ZSBqc1Jlc3VsdCA9IGNhY2hlZENhbGwuY2FsbCgpOwotICAgICAgICAgICAgICAg IFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOwotICAgICAgICAgICAgICAgIHJl cGxhY2VtZW50cy5hcHBlbmQoanNSZXN1bHQudG9XVEZTdHJpbmcoZXhlYykpOwotICAgICAgICAg ICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOworICAgICAgICAgICAg Y2FjaGVkQ2FsbC5jbGVhckFyZ3VtZW50cygpOwogCi0gICAgICAgICAgICAgICAgbGFzdEluZGV4 ID0gcmVzdWx0LmVuZDsKLSAgICAgICAgICAgICAgICBzdGFydFBvc2l0aW9uID0gbGFzdEluZGV4 OworICAgICAgICAgICAgSlNPYmplY3QqIGdyb3VwcyA9IG51bGxwdHI7CiAKLSAgICAgICAgICAg ICAgICAvLyBzcGVjaWFsIGNhc2Ugb2YgZW1wdHkgbWF0Y2gKLSAgICAgICAgICAgICAgICBpZiAo cmVzdWx0LmVtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3RhcnRQb3NpdGlvbisrOwot ICAgICAgICAgICAgICAgICAgICBpZiAoc3RhcnRQb3NpdGlvbiA+IHNvdXJjZUxlbikKLSAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGlmIChoYXNOYW1lZENhcHR1cmVzKSB7CisgICAgICAgICAgICAgICAgSlNHbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKTsKKyAgICAgICAgICAg ICAgICBncm91cHMgPSBKU0ZpbmFsT2JqZWN0OjpjcmVhdGUodm0sIEpTRmluYWxPYmplY3Q6OmNy ZWF0ZVN0cnVjdHVyZSh2bSwgZ2xvYmFsT2JqZWN0LCBnbG9iYWxPYmplY3QtPm9iamVjdFByb3Rv dHlwZSgpLCAwKSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAgICAgIGludCogb3ZlY3RvcjsKLSAgICAgICAg ICAgICAgICBNYXRjaFJlc3VsdCByZXN1bHQgPSByZWdFeHBDb25zdHJ1Y3Rvci0+cGVyZm9ybU1h dGNoKHZtLCByZWdFeHAsIHN0cmluZywgc291cmNlLCBzdGFydFBvc2l0aW9uLCAmb3ZlY3Rvcik7 Ci0gICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFr OwogCi0gICAgICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFzb3VyY2VSYW5nZXMudHJ5Q29uc3Ry dWN0QW5kQXBwZW5kKGxhc3RJbmRleCwgcmVzdWx0LnN0YXJ0IC0gbGFzdEluZGV4KSkpCi0gICAg ICAgICAgICAgICAgICAgIE9VVF9PRl9NRU1PUlkoZXhlYywgc2NvcGUpOworICAgICAgICAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHJlZ0V4cC0+bnVtU3VicGF0dGVybnMoKSArIDE7ICsr aSkgeworICAgICAgICAgICAgICAgIGludCBtYXRjaFN0YXJ0ID0gb3ZlY3RvcltpICogMl07Cisg ICAgICAgICAgICAgICAgaW50IG1hdGNoTGVuID0gb3ZlY3RvcltpICogMiArIDFdIC0gbWF0Y2hT dGFydDsKIAotICAgICAgICAgICAgICAgIHVuc2lnbmVkIGkgPSAwOwotICAgICAgICAgICAgICAg IGNhY2hlZENhbGwuY2xlYXJBcmd1bWVudHMoKTsKKyAgICAgICAgICAgICAgICBKU1ZhbHVlIHBh dHRlcm5WYWx1ZTsKIAotICAgICAgICAgICAgICAgIEpTT2JqZWN0KiBncm91cHMgPSBudWxscHRy OwotCi0gICAgICAgICAgICAgICAgaWYgKGhhc05hbWVkQ2FwdHVyZXMpIHsKLSAgICAgICAgICAg ICAgICAgICAgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IGV4ZWMtPmxleGljYWxHbG9i YWxPYmplY3QoKTsKLSAgICAgICAgICAgICAgICAgICAgZ3JvdXBzID0gSlNGaW5hbE9iamVjdDo6 Y3JlYXRlKHZtLCBKU0ZpbmFsT2JqZWN0OjpjcmVhdGVTdHJ1Y3R1cmUodm0sIGdsb2JhbE9iamVj dCwgZ2xvYmFsT2JqZWN0LT5vYmplY3RQcm90b3R5cGUoKSwgMCkpOwotICAgICAgICAgICAgICAg IH0KLQotICAgICAgICAgICAgICAgIGZvciAoOyBpIDwgcmVnRXhwLT5udW1TdWJwYXR0ZXJucygp ICsgMTsgKytpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGludCBtYXRjaFN0YXJ0ID0gb3ZlY3Rv cltpICogMl07Ci0gICAgICAgICAgICAgICAgICAgIGludCBtYXRjaExlbiA9IG92ZWN0b3JbaSAq IDIgKyAxXSAtIG1hdGNoU3RhcnQ7Ci0KLSAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZSBwYXR0 ZXJuVmFsdWU7Ci0KLSAgICAgICAgICAgICAgICAgICAgaWYgKG1hdGNoU3RhcnQgPCAwKQotICAg ICAgICAgICAgICAgICAgICAgICAgcGF0dGVyblZhbHVlID0ganNVbmRlZmluZWQoKTsKLSAgICAg ICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAgcGF0dGVyblZhbHVl ID0ganNTdWJzdHJpbmcoJnZtLCBzb3VyY2UsIG1hdGNoU3RhcnQsIG1hdGNoTGVuKTsKKyAgICAg ICAgICAgICAgICBpZiAobWF0Y2hTdGFydCA8IDApCisgICAgICAgICAgICAgICAgICAgIHBhdHRl cm5WYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgICAgICBwYXR0ZXJuVmFsdWUgPSBqc1N1YnN0cmluZygmdm0sIHNvdXJjZSwgbWF0Y2hT dGFydCwgbWF0Y2hMZW4pOwogCi0gICAgICAgICAgICAgICAgICAgIGNhY2hlZENhbGwuYXBwZW5k QXJndW1lbnQocGF0dGVyblZhbHVlKTsKKyAgICAgICAgICAgICAgICBjYWNoZWRDYWxsLmFwcGVu ZEFyZ3VtZW50KHBhdHRlcm5WYWx1ZSk7CiAKLSAgICAgICAgICAgICAgICAgICAgaWYgKGkgJiYg aGFzTmFtZWRDYXB0dXJlcykgewotICAgICAgICAgICAgICAgICAgICAgICAgU3RyaW5nIGdyb3Vw TmFtZSA9IHJlZ0V4cC0+Z2V0Q2FwdHVyZUdyb3VwTmFtZShpKTsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGlmICghZ3JvdXBOYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBncm91cHMtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmdm0sIGdy b3VwTmFtZSksIHBhdHRlcm5WYWx1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICBpZiAoaSAmJiBoYXNOYW1lZENhcHR1cmVzKSB7CisgICAgICAgICAgICAgICAgICAg IFN0cmluZyBncm91cE5hbWUgPSByZWdFeHAtPmdldENhcHR1cmVHcm91cE5hbWUoaSk7CisgICAg ICAgICAgICAgICAgICAgIGlmICghZ3JvdXBOYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAg ICAgICAgICAgIGdyb3Vwcy0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKCZ2 bSwgZ3JvdXBOYW1lKSwgcGF0dGVyblZhbHVlKTsKICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgICAgICBjYWNoZWRDYWxsLmFwcGVuZEFyZ3VtZW50KGpzTnVt YmVyKHJlc3VsdC5zdGFydCkpOwotICAgICAgICAgICAgICAgIGNhY2hlZENhbGwuYXBwZW5kQXJn dW1lbnQoc3RyaW5nKTsKLSAgICAgICAgICAgICAgICBpZiAoaGFzTmFtZWRDYXB0dXJlcykKLSAg ICAgICAgICAgICAgICAgICAgY2FjaGVkQ2FsbC5hcHBlbmRBcmd1bWVudChncm91cHMpOworICAg ICAgICAgICAgY2FjaGVkQ2FsbC5hcHBlbmRBcmd1bWVudChqc051bWJlcihyZXN1bHQuc3RhcnQp KTsKKyAgICAgICAgICAgIGNhY2hlZENhbGwuYXBwZW5kQXJndW1lbnQoc3RyaW5nKTsKKyAgICAg ICAgICAgIGlmIChoYXNOYW1lZENhcHR1cmVzKQorICAgICAgICAgICAgICAgIGNhY2hlZENhbGwu YXBwZW5kQXJndW1lbnQoZ3JvdXBzKTsKIAotICAgICAgICAgICAgICAgIGNhY2hlZENhbGwuc2V0 VGhpcyhqc1VuZGVmaW5lZCgpKTsKLSAgICAgICAgICAgICAgICBpZiAoVU5MSUtFTFkoY2FjaGVk Q2FsbC5oYXNPdmVyZmxvd2VkQXJndW1lbnRzKCkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHRo cm93T3V0T2ZNZW1vcnlFcnJvcihleGVjLCBzY29wZSk7Ci0gICAgICAgICAgICAgICAgICAgIHJl dHVybiBudWxscHRyOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNhY2hlZENhbGwu c2V0VGhpcyhqc1VuZGVmaW5lZCgpKTsKKyAgICAgICAgICAgIGlmIChVTkxJS0VMWShjYWNoZWRD YWxsLmhhc092ZXJmbG93ZWRBcmd1bWVudHMoKSkpIHsKKyAgICAgICAgICAgICAgICB0aHJvd091 dE9mTWVtb3J5RXJyb3IoZXhlYywgc2NvcGUpOworICAgICAgICAgICAgICAgIHJldHVybiBudWxs cHRyOworICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgSlNWYWx1ZSBqc1Jlc3VsdCA9 IGNhY2hlZENhbGwuY2FsbCgpOwotICAgICAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04o c2NvcGUsIG51bGxwdHIpOwotICAgICAgICAgICAgICAgIHJlcGxhY2VtZW50cy5hcHBlbmQoanNS ZXN1bHQudG9XVEZTdHJpbmcoZXhlYykpOwotICAgICAgICAgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIG51bGxwdHIpOworICAgICAgICAgICAgSlNWYWx1ZSBqc1Jlc3VsdCA9IGNh Y2hlZENhbGwuY2FsbCgpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg bnVsbHB0cik7CisgICAgICAgICAgICByZXBsYWNlbWVudHMuYXBwZW5kKGpzUmVzdWx0LnRvV1RG U3RyaW5nKGV4ZWMpKTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51 bGxwdHIpOwogCi0gICAgICAgICAgICAgICAgbGFzdEluZGV4ID0gcmVzdWx0LmVuZDsKLSAgICAg ICAgICAgICAgICBzdGFydFBvc2l0aW9uID0gbGFzdEluZGV4OworICAgICAgICAgICAgbGFzdElu ZGV4ID0gcmVzdWx0LmVuZDsKKyAgICAgICAgICAgIHN0YXJ0UG9zaXRpb24gPSBsYXN0SW5kZXg7 CiAKLSAgICAgICAgICAgICAgICAvLyBzcGVjaWFsIGNhc2Ugb2YgZW1wdHkgbWF0Y2gKLSAgICAg ICAgICAgICAgICBpZiAocmVzdWx0LmVtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3Rh cnRQb3NpdGlvbisrOwotICAgICAgICAgICAgICAgICAgICBpZiAoc3RhcnRQb3NpdGlvbiA+IHNv dXJjZUxlbikKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIC8vIHNwZWNpYWwgY2FzZSBvZiBlbXB0eSBtYXRjaAorICAgICAgICAg ICAgaWYgKHJlc3VsdC5lbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgc3RhcnRQb3NpdGlvbisr OworICAgICAgICAgICAgICAgIGlmIChzdGFydFBvc2l0aW9uID4gc291cmNlTGVuKQorICAgICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxz ZSB7CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDAxODM0OGFhNDkxZTVhMmEwMTVkYmU1M2NhNTFkZjczODNiYTZkNmUuLjJhZDg4ZTM2NWY2 OGE4NWJhYzJlMjY3YzBjZGM0Njc2Mzg2YWM3MmQgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdl TG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTgtMDUtMTMg IFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKKyAgICAgICAgW0pTQ10g Rml4IENhY2hlZENhbGwncyBhcmd1bWVudCBjb3VudCBpZiBSZWdFeHAgaGFzIG5hbWVkIGNhcHR1 cmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU1 ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRl c3QyNjIvZXhwZWN0YXRpb25zLnlhbWw6CisKIDIwMTgtMDUtMTMgIEFuZHkgVmFuV2Fnb25lciAg PGFuZHlAdmFud2Fnb25lci5mYW1pbHk+CiAKICAgICAgICAgW0lOVExdIEltcHJvdmUgc3BlYyAm IHRlc3QyNjIgY29tcGxpYW5jZSBmb3IgSW50bCBBUElzCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3Rl c3QyNjIvZXhwZWN0YXRpb25zLnlhbWwgYi9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlh bWwKaW5kZXggZmYzYmQzODYyNjE0YTIxYWVkNWU5Zjc3OTBhMzljZThiZjA4NmFjNi4uY2Q3NjQ1 MDE4NDhiMTE5NTA1ZDRkYmMyYmQ5NTNmN2M2Y2ZlYThhYyAxMDA2NDQKLS0tIGEvSlNUZXN0cy90 ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCisrKyBiL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlv bnMueWFtbApAQCAtMTMwOSw5ICsxMzA5LDYgQEAgdGVzdC9idWlsdC1pbnMvUmVnRXhwL2xvb2tC ZWhpbmQvdmFyaWFibGUtbGVuZ3RoLmpzOgogdGVzdC9idWlsdC1pbnMvUmVnRXhwL2xvb2tCZWhp bmQvd29yZC1ib3VuZGFyeS5qczoKICAgZGVmYXVsdDogJ1N5bnRheEVycm9yOiBJbnZhbGlkIHJl Z3VsYXIgZXhwcmVzc2lvbjogaW52YWxpZCBncm91cCBzcGVjaWZpZXIgbmFtZScKICAgc3RyaWN0 IG1vZGU6ICdTeW50YXhFcnJvcjogSW52YWxpZCByZWd1bGFyIGV4cHJlc3Npb246IGludmFsaWQg Z3JvdXAgc3BlY2lmaWVyIG5hbWUnCi10ZXN0L2J1aWx0LWlucy9SZWdFeHAvbmFtZWQtZ3JvdXBz L2Z1bmN0aW9uYWwtcmVwbGFjZS1nbG9iYWwuanM6Ci0gIGRlZmF1bHQ6ICJUeXBlRXJyb3I6IHVu ZGVmaW5lZCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICdncm91cHMuZnN0JykiCi0gIHN0 cmljdCBtb2RlOiAiVHlwZUVycm9yOiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVh dGluZyAnZ3JvdXBzLmZzdCcpIgogdGVzdC9idWlsdC1pbnMvUmVnRXhwL25hbWVkLWdyb3Vwcy9n cm91cHMtb2JqZWN0LXN1YmNsYXNzLXNhbnMuanM6CiAgIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6 IEV4cGVjdGVkIFNhbWVWYWx1ZSjDgsKrYsOCwrssIMOCwqskPGE+w4LCuykgdG8gYmUgdHJ1ZScK ICAgc3RyaWN0IG1vZGU6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFNhbWVWYWx1ZSjDgsKrYsOC wrssIMOCwqskPGE+w4LCuykgdG8gYmUgdHJ1ZScK