304972 2026-01-05 21:42:30 -0800 REGRESSION(305142@main): Introduces a few unwanted changes and needs refinement 2026-01-05 21:47:12 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 304941 1 commit-queue commit-queue annevk cdumez webkit-bug-importer oldest_to_newest 2169562 0 commit-queue 2026-01-05 21:42:30 -0800 https://commits.webkit.org/305142@main introduced a regression: Introduces a few unwanted changes and needs refinement This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 2169564 1 477917 commit-queue 2026-01-05 21:42:35 -0800 Created attachment 477917 REVERT of 305142@main Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 2169565 2 ews-feeder 2026-01-05 21:46:03 -0800 Committed 305144@main (bf90956b5e75): <https://commits.webkit.org/305144@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 477917. 2169566 3 webkit-bug-importer 2026-01-05 21:47:12 -0800 <rdar://problem/167597946> 477917 2026-01-05 21:42:35 -0800 2026-01-05 21:46:05 -0800 REVERT of 305142@main bug-304972-20260106054234.patch text/plain 23026 commit-queue RnJvbSBkMzAzNGZhOTRhYTQxNzEzMjEzNGE1ODQyMWZmZjVmOTVkMjg4MTQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDb21taXQgUXVldWUgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3Jn PgpEYXRlOiBUdWUsIDYgSmFuIDIwMjYgMDU6NDI6MzIgKzAwMDAKU3ViamVjdDogW1BBVENIXSBV bnJldmlld2VkLCByZXZlcnRpbmcgMzA1MTQyQG1haW4uCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzA0OTcyCgpJbnRyb2R1Y2VzIGEgZmV3IHVud2FudGVkIGNoYW5n ZXMgYW5kIG5lZWRzIHJlZmluZW1lbnQKClJldmVydGVkIGNoYW5nZXNldDoKCiJDaGFuZ2UgVmVj dG9yPFJlZlB0cjxUcmFja0Jhc2U+PiB0byBhIFZlY3RvciBvZiBSZWYgYW5kIHJlZHVjZSB1bnNh ZmVuZXNzIgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA0OTQxCmh0 dHBzOi8vY29tbWl0cy53ZWJraXQub3JnLzMwNTE0MkBtYWluCi0tLQogU291cmNlL1dURi93dGYv VmVjdG9yLmggICAgICAgICAgICAgICAgICAgICAgIHwgMzUgKy0tLS0tLS0tLS0tLQogU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCAgICAgIHwgMTIgKystLS0KIFNvdXJj ZS9XZWJDb3JlL2h0bWwvdHJhY2svQXVkaW9UcmFja0xpc3QuY3BwICB8IDIzICsrKystLS0tLQog U291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRpb1RyYWNrTGlzdC5oICAgIHwgIDYgKy0tCiBT b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuY3BwICAgfCA1MSArKysrKysr KystLS0tLS0tLS0tCiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuaCAg ICAgfCAgOCArLS0KIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVHJhY2tMaXN0QmFzZS5jcHAg ICB8ICA4ICstLQogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UcmFja0xpc3RCYXNlLmggICAg IHwgIDIgKy0KIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVmlkZW9UcmFja0xpc3QuY3BwICB8 IDI1ICsrKystLS0tLQogU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WaWRlb1RyYWNrTGlzdC5o ICAgIHwgIDYgKy0tCiAuLi4vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQu bW0gfCAgMiArLQogMTEgZmlsZXMgY2hhbmdlZCwgNjUgaW5zZXJ0aW9ucygrKSwgMTEzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1ZlY3Rvci5oIGIvU291cmNlL1dU Ri93dGYvVmVjdG9yLmgKaW5kZXggMWVlMTBlYTc1MmU5Li44Y2JhNmEyYWFkY2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XVEYvd3RmL1ZlY3Rvci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1ZlY3Rvci5o CkBAIC03NzQsNyArNzc0LDcgQEAgcHVibGljOgogICAgICAgICByZW1vdmVMYXN0KCk7CiAgICAg ICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQotCisgICAgCiAgICAgYm9vbCBjb250YWlucyhjb25z dCBhdXRvJikgY29uc3Q7CiAgICAgYm9vbCBjb250YWluc0lmKE5PRVNDQVBFIGNvbnN0IEludm9j YWJsZTxib29sKGNvbnN0IFQmKT4gYXV0byYpIGNvbnN0OwogICAgIHNpemVfdCBmaW5kKGNvbnN0 IGF1dG8mKSBjb25zdDsKQEAgLTc4MiwxNCArNzgyLDYgQEAgcHVibGljOgogICAgIHNpemVfdCBy ZXZlcnNlRmluZChjb25zdCBhdXRvJikgY29uc3Q7CiAgICAgc2l6ZV90IHJldmVyc2VGaW5kSWYo Tk9FU0NBUEUgY29uc3QgSW52b2NhYmxlPGJvb2woY29uc3QgVCYpPiBhdXRvJikgY29uc3Q7CiAK LSAgICAvLyBPdmVybG9hZHMgZm9yIHNtYXJ0IHBvaW50ZXIgZWxlbWVudCB0eXBlcyB0aGF0IHRh a2UgcmF3IHBvaW50ZXIgcGFyYW1ldGVycy4KLSAgICB0ZW1wbGF0ZTxTbWFydFB0ciBVID0gVCwg dHlwZW5hbWUgVj4gcmVxdWlyZXMgc3RkOjpzYW1lX2FzPFUsIFQ+ICYmIHN0ZDo6ZGVyaXZlZF9m cm9tPFYsIHR5cGVuYW1lIEdldFB0ckhlbHBlcjxVPjo6VW5kZXJseWluZ1R5cGU+Ci0gICAgYm9v bCBjb250YWlucyhWKikgY29uc3Q7Ci0gICAgdGVtcGxhdGU8U21hcnRQdHIgVSA9IFQsIHR5cGVu YW1lIFY+IHJlcXVpcmVzIHN0ZDo6c2FtZV9hczxVLCBUPiAmJiBzdGQ6OmRlcml2ZWRfZnJvbTxW LCB0eXBlbmFtZSBHZXRQdHJIZWxwZXI8VT46OlVuZGVybHlpbmdUeXBlPgotICAgIHNpemVfdCBm aW5kKFYqKSBjb25zdDsKLSAgICB0ZW1wbGF0ZTxTbWFydFB0ciBVID0gVCwgdHlwZW5hbWUgVj4g cmVxdWlyZXMgc3RkOjpzYW1lX2FzPFUsIFQ+ICYmIHN0ZDo6ZGVyaXZlZF9mcm9tPFYsIHR5cGVu YW1lIEdldFB0ckhlbHBlcjxVPjo6VW5kZXJseWluZ1R5cGU+Ci0gICAgc2l6ZV90IHJldmVyc2VG aW5kKFYqKSBjb25zdDsKLQogICAgIGJvb2wgYXBwZW5kSWZOb3RDb250YWlucyhjb25zdCBhdXRv Jik7CiAKICAgICB2b2lkIHNocmluayhzaXplX3Qgc2l6ZSk7CkBAIC0xMTE1LDMxICsxMTA3LDYg QEAgYm9vbCBWZWN0b3I8VCwgaW5saW5lQ2FwYWNpdHksIE92ZXJmbG93SGFuZGxlciwgbWluQ2Fw YWNpdHksIE1hbGxvYz46OmFwcGVuZElmTm8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdGVtcGxh dGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBPdmVyZmxvd0hh bmRsZXIsIHNpemVfdCBtaW5DYXBhY2l0eSwgdHlwZW5hbWUgTWFsbG9jPgotdGVtcGxhdGU8U21h cnRQdHIgVSwgdHlwZW5hbWUgVj4gcmVxdWlyZXMgc3RkOjpzYW1lX2FzPFUsIFQ+ICYmIHN0ZDo6 ZGVyaXZlZF9mcm9tPFYsIHR5cGVuYW1lIEdldFB0ckhlbHBlcjxVPjo6VW5kZXJseWluZ1R5cGU+ Ci1ib29sIFZlY3RvcjxULCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZsb3dIYW5kbGVyLCBtaW5DYXBh Y2l0eSwgTWFsbG9jPjo6Y29udGFpbnMoViogcHRyKSBjb25zdAotewotICAgIHJldHVybiBmaW5k KHB0cikgIT0gbm90Rm91bmQ7Ci19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxp bmVDYXBhY2l0eSwgdHlwZW5hbWUgT3ZlcmZsb3dIYW5kbGVyLCBzaXplX3QgbWluQ2FwYWNpdHks IHR5cGVuYW1lIE1hbGxvYz4KLXRlbXBsYXRlPFNtYXJ0UHRyIFUsIHR5cGVuYW1lIFY+IHJlcXVp cmVzIHN0ZDo6c2FtZV9hczxVLCBUPiAmJiBzdGQ6OmRlcml2ZWRfZnJvbTxWLCB0eXBlbmFtZSBH ZXRQdHJIZWxwZXI8VT46OlVuZGVybHlpbmdUeXBlPgotc2l6ZV90IFZlY3RvcjxULCBpbmxpbmVD YXBhY2l0eSwgT3ZlcmZsb3dIYW5kbGVyLCBtaW5DYXBhY2l0eSwgTWFsbG9jPjo6ZmluZChWKiBw dHIpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGZpbmRJZihbJl0oYXV0byYgaXRlbSkgewotICAgICAg ICByZXR1cm4gR2V0UHRySGVscGVyPFU+OjpnZXRQdHIoaXRlbSkgPT0gcHRyOwotICAgIH0pOwot fQotCi10ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1l IE92ZXJmbG93SGFuZGxlciwgc2l6ZV90IG1pbkNhcGFjaXR5LCB0eXBlbmFtZSBNYWxsb2M+Ci10 ZW1wbGF0ZTxTbWFydFB0ciBVLCB0eXBlbmFtZSBWPiByZXF1aXJlcyBzdGQ6OnNhbWVfYXM8VSwg VD4gJiYgc3RkOjpkZXJpdmVkX2Zyb208ViwgdHlwZW5hbWUgR2V0UHRySGVscGVyPFU+OjpVbmRl cmx5aW5nVHlwZT4KLXNpemVfdCBWZWN0b3I8VCwgaW5saW5lQ2FwYWNpdHksIE92ZXJmbG93SGFu ZGxlciwgbWluQ2FwYWNpdHksIE1hbGxvYz46OnJldmVyc2VGaW5kKFYqIHB0cikgY29uc3QKLXsK LSAgICByZXR1cm4gcmV2ZXJzZUZpbmRJZihbJl0oYXV0byYgaXRlbSkgewotICAgICAgICByZXR1 cm4gR2V0UHRySGVscGVyPFU+OjpnZXRQdHIoaXRlbSkgPT0gcHRyOwotICAgIH0pOwotfQotCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIE92ZXJm bG93SGFuZGxlciwgc2l6ZV90IG1pbkNhcGFjaXR5LCB0eXBlbmFtZSBNYWxsb2M+CiB2b2lkIFZl Y3RvcjxULCBpbmxpbmVDYXBhY2l0eSwgT3ZlcmZsb3dIYW5kbGVyLCBtaW5DYXBhY2l0eSwgTWFs bG9jPjo6ZmlsbChjb25zdCBUJiB2YWwsIHNpemVfdCBuZXdTaXplKQogewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggMmYzMzFjYTBlNDA5Li4zNTQ2ZDU5ZjY3 NzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNzc2OSwx MCArNzc2OSwxMCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6Omhhc0Nsb3NlZENhcHRpb25zKCkg Y29uc3QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IG1fdGV4dFRyYWNrcy0+bGVuZ3RoKCk7ICsraSkgewotICAgICAgICBSZWYgdHJhY2sgPSBt X3RleHRUcmFja3MtPml0ZW0oaSkucmVsZWFzZU5vbk51bGwoKTsKLSAgICAgICAgaWYgKHRyYWNr LT5yZWFkaW5lc3NTdGF0ZSgpID09IFRleHRUcmFjazo6RmFpbGVkVG9Mb2FkKQorICAgICAgICBh dXRvJiB0cmFjayA9ICptX3RleHRUcmFja3MtPml0ZW0oaSk7CisgICAgICAgIGlmICh0cmFjay5y ZWFkaW5lc3NTdGF0ZSgpID09IFRleHRUcmFjazo6RmFpbGVkVG9Mb2FkKQogICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgIGlmICh0cmFjay0+a2luZCgpID09IFRleHRUcmFjazo6S2luZDo6 Q2FwdGlvbnMgfHwgdHJhY2stPmtpbmQoKSA9PSBUZXh0VHJhY2s6OktpbmQ6OlN1YnRpdGxlcykK KyAgICAgICAgaWYgKHRyYWNrLmtpbmQoKSA9PSBUZXh0VHJhY2s6OktpbmQ6OkNhcHRpb25zIHx8 IHRyYWNrLmtpbmQoKSA9PSBUZXh0VHJhY2s6OktpbmQ6OlN1YnRpdGxlcykKICAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0KIApAQCAtODA2NSwxMCArODA2NSwxMCBAQCB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6Om1hcmtDYXB0aW9uQW5kU3VidGl0bGVUcmFja3NBc1VuY29uZmlndXJlZChS ZWNvbmZpZ3VyZU1vZAogICAgIC8vIGNhcHRpb25zIGFuZCBub24tZGVmYXVsdCB0cmFja3Mgc2hv dWxkIGJlIGRpc3BsYXllZCBiYXNlZCBvbiBsYW5ndWFnZQogICAgIC8vIHByZWZlcmVuY2VzIGlm IHRoZSB1c2VyIGhhcyB0dXJuZWQgY2FwdGlvbnMgb24pLgogICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBtX3RleHRUcmFja3MtPmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgUmVmIHRyYWNr ID0gbV90ZXh0VHJhY2tzLT5pdGVtKGkpLnJlbGVhc2VOb25OdWxsKCk7Ci0gICAgICAgIGF1dG8g a2luZCA9IHRyYWNrLT5raW5kKCk7CisgICAgICAgIGF1dG8mIHRyYWNrID0gKm1fdGV4dFRyYWNr cy0+aXRlbShpKTsKKyAgICAgICAgYXV0byBraW5kID0gdHJhY2sua2luZCgpOwogICAgICAgICBp ZiAoa2luZCA9PSBUZXh0VHJhY2s6OktpbmQ6OlN1YnRpdGxlcyB8fCBraW5kID09IFRleHRUcmFj azo6S2luZDo6Q2FwdGlvbnMpCi0gICAgICAgICAgICB0cmFjay0+c2V0SGFzQmVlbkNvbmZpZ3Vy ZWQoZmFsc2UpOworICAgICAgICAgICAgdHJhY2suc2V0SGFzQmVlbkNvbmZpZ3VyZWQoZmFsc2Up OwogICAgIH0KIAogICAgIG1fcHJvY2Vzc2luZ1ByZWZlcmVuY2VDaGFuZ2UgPSB0cnVlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRpb1RyYWNrTGlzdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0F1ZGlvVHJhY2tMaXN0LmNwcAppbmRleCAzZTg3MTcy ZDhkMzYuLmRiMjBiZDhiYTM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFj ay9BdWRpb1RyYWNrTGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRp b1RyYWNrTGlzdC5jcHAKQEAgLTQ3LDExICs0NywxMSBAQCB2b2lkIEF1ZGlvVHJhY2tMaXN0Ojph cHBlbmQoUmVmPEF1ZGlvVHJhY2s+JiYgdHJhY2spCiAgICAgc2l6ZV90IGluZGV4ID0gdHJhY2st PmluYmFuZFRyYWNrSW5kZXgoKTsKICAgICBzaXplX3QgaW5zZXJ0aW9uSW5kZXg7CiAgICAgZm9y IChpbnNlcnRpb25JbmRleCA9IDA7IGluc2VydGlvbkluZGV4IDwgbV9pbmJhbmRUcmFja3Muc2l6 ZSgpOyArK2luc2VydGlvbkluZGV4KSB7Ci0gICAgICAgIFJlZiBvdGhlclRyYWNrID0gZG93bmNh c3Q8QXVkaW9UcmFjaz4obV9pbmJhbmRUcmFja3NbaW5zZXJ0aW9uSW5kZXhdKTsKKyAgICAgICAg UmVmIG90aGVyVHJhY2sgPSBkb3duY2FzdDxBdWRpb1RyYWNrPigqbV9pbmJhbmRUcmFja3NbaW5z ZXJ0aW9uSW5kZXhdKTsKICAgICAgICAgaWYgKG90aGVyVHJhY2stPmluYmFuZFRyYWNrSW5kZXgo KSA+IGluZGV4KQogICAgICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIG1faW5iYW5kVHJhY2tz Lmluc2VydChpbnNlcnRpb25JbmRleCwgdHJhY2suY29weVJlZigpKTsKKyAgICBtX2luYmFuZFRy YWNrcy5pbnNlcnQoaW5zZXJ0aW9uSW5kZXgsIHRyYWNrLnB0cigpKTsKIAogICAgIGlmICghdHJh Y2stPnRyYWNrTGlzdCgpKQogICAgICAgICB0cmFjay0+c2V0VHJhY2tMaXN0KCp0aGlzKTsKQEAg LTY4LDIzICs2OCwxOCBAQCB2b2lkIEF1ZGlvVHJhY2tMaXN0OjpyZW1vdmUoVHJhY2tCYXNlJiB0 cmFjaywgYm9vbCBzY2hlZHVsZUV2ZW50KQogICAgIFRyYWNrTGlzdEJhc2U6OnJlbW92ZSh0cmFj aywgc2NoZWR1bGVFdmVudCk7CiB9CiAKLVJlZlB0cjxBdWRpb1RyYWNrPiBBdWRpb1RyYWNrTGlz dDo6aXRlbSh1bnNpZ25lZCBpbmRleCkgY29uc3QKK0F1ZGlvVHJhY2sqIEF1ZGlvVHJhY2tMaXN0 OjppdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdAogewogICAgIGlmIChpbmRleCA8IG1faW5iYW5k VHJhY2tzLnNpemUoKSkKLSAgICAgICAgcmV0dXJuIGRvd25jYXN0PEF1ZGlvVHJhY2s+KG1faW5i YW5kVHJhY2tzW2luZGV4XSk7CisgICAgICAgIHJldHVybiBkb3duY2FzdDxBdWRpb1RyYWNrPiht X2luYmFuZFRyYWNrc1tpbmRleF0uZ2V0KCkpOwogICAgIHJldHVybiBudWxscHRyOwogfQogCi1S ZWZQdHI8QXVkaW9UcmFjaz4gQXVkaW9UcmFja0xpc3Q6Omxhc3RJdGVtKCkgY29uc3QKLXsKLSAg ICByZXR1cm4gaXRlbShsZW5ndGgoKSAtIDEpOwotfQotCi1SZWZQdHI8QXVkaW9UcmFjaz4gQXVk aW9UcmFja0xpc3Q6OmZpcnN0RW5hYmxlZCgpIGNvbnN0CitBdWRpb1RyYWNrKiBBdWRpb1RyYWNr TGlzdDo6Zmlyc3RFbmFibGVkKCkgY29uc3QKIHsKICAgICBmb3IgKGF1dG8mIGl0ZW0gOiBtX2lu YmFuZFRyYWNrcykgewotICAgICAgICBpZiAoaXRlbS0+ZW5hYmxlZCgpKQotICAgICAgICAgICAg cmV0dXJuIGRvd25jYXN0PEF1ZGlvVHJhY2s+KGl0ZW0pOworICAgICAgICBpZiAoaXRlbSAmJiBp dGVtLT5lbmFibGVkKCkpCisgICAgICAgICAgICByZXR1cm4gZG93bmNhc3Q8QXVkaW9UcmFjaz4o aXRlbS5nZXQoKSk7CiAgICAgfQogICAgIHJldHVybiBudWxscHRyOwogfQpAQCAtOTIsNyArODcs NyBAQCBSZWZQdHI8QXVkaW9UcmFjaz4gQXVkaW9UcmFja0xpc3Q6OmZpcnN0RW5hYmxlZCgpIGNv bnN0CiBSZWZQdHI8QXVkaW9UcmFjaz4gQXVkaW9UcmFja0xpc3Q6OmdldFRyYWNrQnlJZChjb25z dCBBdG9tU3RyaW5nJiBpZCkgY29uc3QKIHsKICAgICBmb3IgKGF1dG8mIGluYmFuZFRyYWNrIDog bV9pbmJhbmRUcmFja3MpIHsKLSAgICAgICAgUmVmIHRyYWNrID0gZG93bmNhc3Q8QXVkaW9UcmFj az4oaW5iYW5kVHJhY2spOworICAgICAgICBSZWYgdHJhY2sgPSBkb3duY2FzdDxBdWRpb1RyYWNr PigqaW5iYW5kVHJhY2spOwogICAgICAgICBpZiAodHJhY2stPmlkKCkgPT0gaWQpCiAgICAgICAg ICAgICByZXR1cm4gdHJhY2s7CiAgICAgfQpAQCAtMTAyLDcgKzk3LDcgQEAgUmVmUHRyPEF1ZGlv VHJhY2s+IEF1ZGlvVHJhY2tMaXN0OjpnZXRUcmFja0J5SWQoY29uc3QgQXRvbVN0cmluZyYgaWQp IGNvbnN0CiBSZWZQdHI8QXVkaW9UcmFjaz4gQXVkaW9UcmFja0xpc3Q6OmdldFRyYWNrQnlJZChU cmFja0lEIGlkKSBjb25zdAogewogICAgIGZvciAoYXV0byYgaW5iYW5kVHJhY2sgOiBtX2luYmFu ZFRyYWNrcykgewotICAgICAgICBSZWYgdHJhY2sgPSBkb3duY2FzdDxBdWRpb1RyYWNrPihpbmJh bmRUcmFjayk7CisgICAgICAgIFJlZiB0cmFjayA9IGRvd25jYXN0PEF1ZGlvVHJhY2s+KCppbmJh bmRUcmFjayk7CiAgICAgICAgIGlmICh0cmFjay0+dHJhY2tJZCgpID09IGlkKQogICAgICAgICAg ICAgcmV0dXJuIHRyYWNrOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv dHJhY2svQXVkaW9UcmFja0xpc3QuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svQXVkaW9U cmFja0xpc3QuaAppbmRleCA1ZjNkYWQwMTUyZTkuLmY4YzZhMGY2NTkzYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRpb1RyYWNrTGlzdC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svQXVkaW9UcmFja0xpc3QuaApAQCAtNDgsOSArNDgsOSBAQCBwdWJs aWM6CiAgICAgUmVmUHRyPEF1ZGlvVHJhY2s+IGdldFRyYWNrQnlJZChUcmFja0lEKSBjb25zdDsK IAogICAgIGJvb2wgaXNTdXBwb3J0ZWRQcm9wZXJ0eUluZGV4KHVuc2lnbmVkIGluZGV4KSBjb25z dCB7IHJldHVybiBpbmRleCA8IG1faW5iYW5kVHJhY2tzLnNpemUoKTsgfQotICAgIFJlZlB0cjxB dWRpb1RyYWNrPiBpdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdDsKLSAgICBSZWZQdHI8QXVkaW9U cmFjaz4gbGFzdEl0ZW0oKSBjb25zdDsKLSAgICBSZWZQdHI8QXVkaW9UcmFjaz4gZmlyc3RFbmFi bGVkKCkgY29uc3Q7CisgICAgQXVkaW9UcmFjayogaXRlbSh1bnNpZ25lZCBpbmRleCkgY29uc3Q7 CisgICAgQXVkaW9UcmFjayogbGFzdEl0ZW0oKSBjb25zdCB7IHJldHVybiBpdGVtKGxlbmd0aCgp IC0gMSk7IH0KKyAgICBBdWRpb1RyYWNrKiBmaXJzdEVuYWJsZWQoKSBjb25zdDsKICAgICB2b2lk IGFwcGVuZChSZWY8QXVkaW9UcmFjaz4mJik7CiAgICAgdm9pZCByZW1vdmUoVHJhY2tCYXNlJiwg Ym9vbCBzY2hlZHVsZUV2ZW50ID0gdHJ1ZSkgZmluYWw7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3RyYWNrL1RleHRUcmFja0xpc3QuY3BwCmluZGV4IGZiODhhZDUzYTgyNC4uYjIyNmIwYWJhZTQy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0xpc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5jcHAKQEAgLTcz LDI1ICs3MywyNSBAQCBpbnQgVGV4dFRyYWNrTGlzdDo6Z2V0VHJhY2tJbmRleFJlbGF0aXZlVG9S ZW5kZXJlZFRyYWNrcyhUZXh0VHJhY2smIHRleHRUcmFjaykKICAgICBpbnQgdHJhY2tJbmRleCA9 IDA7CiAKICAgICBmb3IgKGF1dG8mIGVsZW1lbnRUcmFjayA6IG1fZWxlbWVudFRyYWNrcykgewot ICAgICAgICBpZiAoIWRvd25jYXN0PFRleHRUcmFjaz4oZWxlbWVudFRyYWNrLmdldCgpKS5pc1Jl bmRlcmVkKCkpCisgICAgICAgIGlmICghZG93bmNhc3Q8VGV4dFRyYWNrPigqZWxlbWVudFRyYWNr KS5pc1JlbmRlcmVkKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKGVsZW1l bnRUcmFjay5wdHIoKSA9PSAmdGV4dFRyYWNrKQorICAgICAgICBpZiAoZWxlbWVudFRyYWNrID09 ICZ0ZXh0VHJhY2spCiAgICAgICAgICAgICByZXR1cm4gdHJhY2tJbmRleDsKICAgICAgICAgKyt0 cmFja0luZGV4OwogICAgIH0KIAogICAgIGZvciAoYXV0byYgYWRkVHJhY2sgOiBtX2FkZFRyYWNr VHJhY2tzKSB7Ci0gICAgICAgIGlmICghZG93bmNhc3Q8VGV4dFRyYWNrPihhZGRUcmFjay5nZXQo KSkuaXNSZW5kZXJlZCgpKQorICAgICAgICBpZiAoIWRvd25jYXN0PFRleHRUcmFjaz4oKmFkZFRy YWNrKS5pc1JlbmRlcmVkKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKGFk ZFRyYWNrLnB0cigpID09ICZ0ZXh0VHJhY2spCisgICAgICAgIGlmIChhZGRUcmFjayA9PSAmdGV4 dFRyYWNrKQogICAgICAgICAgICAgcmV0dXJuIHRyYWNrSW5kZXg7CiAgICAgICAgICsrdHJhY2tJ bmRleDsKICAgICB9CiAKICAgICBmb3IgKGF1dG8mIGluYmFuZFRyYWNrIDogbV9pbmJhbmRUcmFj a3MpIHsKLSAgICAgICAgaWYgKCFkb3duY2FzdDxUZXh0VHJhY2s+KGluYmFuZFRyYWNrLmdldCgp KS5pc1JlbmRlcmVkKCkpCisgICAgICAgIGlmICghZG93bmNhc3Q8VGV4dFRyYWNrPigqaW5iYW5k VHJhY2spLmlzUmVuZGVyZWQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAo aW5iYW5kVHJhY2sucHRyKCkgPT0gJnRleHRUcmFjaykKKyAgICAgICAgaWYgKGluYmFuZFRyYWNr ID09ICZ0ZXh0VHJhY2spCiAgICAgICAgICAgICByZXR1cm4gdHJhY2tJbmRleDsKICAgICAgICAg Kyt0cmFja0luZGV4OwogICAgIH0KQEAgLTk5LDcgKzk5LDcgQEAgaW50IFRleHRUcmFja0xpc3Q6 OmdldFRyYWNrSW5kZXhSZWxhdGl2ZVRvUmVuZGVyZWRUcmFja3MoVGV4dFRyYWNrJiB0ZXh0VHJh Y2spCiAgICAgcmV0dXJuIC0xOwogfQogCi1SZWZQdHI8VGV4dFRyYWNrPiBUZXh0VHJhY2tMaXN0 OjppdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdAorVGV4dFRyYWNrKiBUZXh0VHJhY2tMaXN0Ojpp dGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdAogewogICAgIC8vIDQuOC4xMC4xMi4xIFRleHQgdHJh Y2sgbW9kZWwKICAgICAvLyBUaGUgdGV4dCB0cmFja3MgYXJlIHNvcnRlZCBhcyBmb2xsb3dzOgpA QCAtMTA5LDI0ICsxMDksMTkgQEAgUmVmUHRyPFRleHRUcmFjaz4gVGV4dFRyYWNrTGlzdDo6aXRl bSh1bnNpZ25lZCBpbmRleCkgY29uc3QKICAgICAvLyByZXNvdXJjZSksIGluIHRoZSBvcmRlciBk ZWZpbmVkIGJ5IHRoZSBtZWRpYSByZXNvdXJjZSdzIGZvcm1hdCBzcGVjaWZpY2F0aW9uLgogCiAg ICAgaWYgKGluZGV4IDwgbV9lbGVtZW50VHJhY2tzLnNpemUoKSkKLSAgICAgICAgcmV0dXJuIGRv d25jYXN0PFRleHRUcmFjaz4obV9lbGVtZW50VHJhY2tzW2luZGV4XSk7CisgICAgICAgIHJldHVy biBkb3duY2FzdDxUZXh0VHJhY2s+KG1fZWxlbWVudFRyYWNrc1tpbmRleF0uZ2V0KCkpOwogCiAg ICAgaW5kZXggLT0gbV9lbGVtZW50VHJhY2tzLnNpemUoKTsKICAgICBpZiAoaW5kZXggPCBtX2Fk ZFRyYWNrVHJhY2tzLnNpemUoKSkKLSAgICAgICAgcmV0dXJuIGRvd25jYXN0PFRleHRUcmFjaz4o bV9hZGRUcmFja1RyYWNrc1tpbmRleF0pOworICAgICAgICByZXR1cm4gZG93bmNhc3Q8VGV4dFRy YWNrPihtX2FkZFRyYWNrVHJhY2tzW2luZGV4XS5nZXQoKSk7CiAKICAgICBpbmRleCAtPSBtX2Fk ZFRyYWNrVHJhY2tzLnNpemUoKTsKICAgICBpZiAoaW5kZXggPCBtX2luYmFuZFRyYWNrcy5zaXpl KCkpCi0gICAgICAgIHJldHVybiBkb3duY2FzdDxUZXh0VHJhY2s+KG1faW5iYW5kVHJhY2tzW2lu ZGV4XSk7CisgICAgICAgIHJldHVybiBkb3duY2FzdDxUZXh0VHJhY2s+KG1faW5iYW5kVHJhY2tz W2luZGV4XS5nZXQoKSk7CiAKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotUmVmUHRyPFRleHRU cmFjaz4gVGV4dFRyYWNrTGlzdDo6bGFzdEl0ZW0oKSBjb25zdAotewotICAgIHJldHVybiBpdGVt KGxlbmd0aCgpIC0gMSk7Ci19Ci0KIFJlZlB0cjxUZXh0VHJhY2s+IFRleHRUcmFja0xpc3Q6Omdl dFRyYWNrQnlJZChjb25zdCBBdG9tU3RyaW5nJiBpZCkgY29uc3QKIHsKICAgICAvLyA0LjguMTAu MTIuNSBUZXh0IHRyYWNrIEFQSQpAQCAtMTU1LDIwICsxNTAsMjAgQEAgUmVmUHRyPFRleHRUcmFj az4gVGV4dFRyYWNrTGlzdDo6Z2V0VHJhY2tCeUlkKFRyYWNrSUQgaWQpIGNvbnN0CiAKIHZvaWQg VGV4dFRyYWNrTGlzdDo6aW52YWxpZGF0ZVRyYWNrSW5kZXhlc0FmdGVyVHJhY2soVGV4dFRyYWNr JiB0cmFjaykKIHsKLSAgICBWZWN0b3I8UmVmPFRyYWNrQmFzZT4+KiB0cmFja3MgPSBudWxscHRy OworICAgIFZlY3RvcjxSZWZQdHI8VHJhY2tCYXNlPj4qIHRyYWNrcyA9IG51bGxwdHI7CiAKICAg ICBzd2l0Y2ggKHRyYWNrLnRyYWNrVHlwZSgpKSB7CiAgICAgY2FzZSBUZXh0VHJhY2s6OlRyYWNr RWxlbWVudDoKICAgICAgICAgdHJhY2tzID0gJm1fZWxlbWVudFRyYWNrczsKICAgICAgICAgZm9y IChhdXRvJiBhZGRUcmFjayA6IG1fYWRkVHJhY2tUcmFja3MpCi0gICAgICAgICAgICBkb3duY2Fz dDxUZXh0VHJhY2s+KGFkZFRyYWNrLmdldCgpKS5pbnZhbGlkYXRlVHJhY2tJbmRleCgpOworICAg ICAgICAgICAgZG93bmNhc3Q8VGV4dFRyYWNrPihhZGRUcmFjay5nZXQoKSktPmludmFsaWRhdGVU cmFja0luZGV4KCk7CiAgICAgICAgIGZvciAoYXV0byYgaW5iYW5kVHJhY2sgOiBtX2luYmFuZFRy YWNrcykKLSAgICAgICAgICAgIGRvd25jYXN0PFRleHRUcmFjaz4oaW5iYW5kVHJhY2suZ2V0KCkp LmludmFsaWRhdGVUcmFja0luZGV4KCk7CisgICAgICAgICAgICBkb3duY2FzdDxUZXh0VHJhY2s+ KGluYmFuZFRyYWNrLmdldCgpKS0+aW52YWxpZGF0ZVRyYWNrSW5kZXgoKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBUZXh0VHJhY2s6OkFkZFRyYWNrOgogICAgICAgICB0cmFja3MgPSAmbV9h ZGRUcmFja1RyYWNrczsKICAgICAgICAgZm9yIChhdXRvJiBpbmJhbmRUcmFjayA6IG1faW5iYW5k VHJhY2tzKQotICAgICAgICAgICAgZG93bmNhc3Q8VGV4dFRyYWNrPihpbmJhbmRUcmFjay5nZXQo KSkuaW52YWxpZGF0ZVRyYWNrSW5kZXgoKTsKKyAgICAgICAgICAgIGRvd25jYXN0PFRleHRUcmFj az4oaW5iYW5kVHJhY2suZ2V0KCkpLT5pbnZhbGlkYXRlVHJhY2tJbmRleCgpOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIFRleHRUcmFjazo6SW5CYW5kOgogICAgICAgICB0cmFja3MgPSAmbV9p bmJhbmRUcmFja3M7CkBAIC0xODIsMjEgKzE3NywyMSBAQCB2b2lkIFRleHRUcmFja0xpc3Q6Omlu dmFsaWRhdGVUcmFja0luZGV4ZXNBZnRlclRyYWNrKFRleHRUcmFjayYgdHJhY2spCiAgICAgICAg IHJldHVybjsKIAogICAgIGZvciAoc2l6ZV90IGkgPSBpbmRleDsgaSA8IHRyYWNrcy0+c2l6ZSgp OyArK2kpCi0gICAgICAgIGRvd25jYXN0PFRleHRUcmFjaz4odHJhY2tzLT5hdChpbmRleCkuZ2V0 KCkpLmludmFsaWRhdGVUcmFja0luZGV4KCk7CisgICAgICAgIGRvd25jYXN0PFRleHRUcmFjaz4o KnRyYWNrcy0+YXQoaW5kZXgpKS5pbnZhbGlkYXRlVHJhY2tJbmRleCgpOwogfQogCiB2b2lkIFRl eHRUcmFja0xpc3Q6OmFwcGVuZChSZWY8VGV4dFRyYWNrPiYmIHRyYWNrKQogewogICAgIGlmICh0 cmFjay0+dHJhY2tUeXBlKCkgPT0gVGV4dFRyYWNrOjpBZGRUcmFjaykKLSAgICAgICAgbV9hZGRU cmFja1RyYWNrcy5hcHBlbmQodHJhY2suY29weVJlZigpKTsKKyAgICAgICAgbV9hZGRUcmFja1Ry YWNrcy5hcHBlbmQodHJhY2sucHRyKCkpOwogICAgIGVsc2UgaWYgKGF1dG8qIHRleHRUcmFjayA9 IGR5bmFtaWNEb3duY2FzdDxMb2FkYWJsZVRleHRUcmFjaz4odHJhY2suZ2V0KCkpKSB7CiAgICAg ICAgIC8vIEluc2VydCB0cmFja3MgYWRkZWQgZm9yIDx0cmFjaz4gZWxlbWVudCBpbiB0cmVlIG9y ZGVyLgogICAgICAgICBzaXplX3QgaW5kZXggPSB0ZXh0VHJhY2stPnRyYWNrRWxlbWVudEluZGV4 KCk7Ci0gICAgICAgIG1fZWxlbWVudFRyYWNrcy5pbnNlcnQoaW5kZXgsIHRyYWNrLmNvcHlSZWYo KSk7CisgICAgICAgIG1fZWxlbWVudFRyYWNrcy5pbnNlcnQoaW5kZXgsIHRyYWNrLnB0cigpKTsK ICAgICB9IGVsc2UgaWYgKHRyYWNrLT50cmFja1R5cGUoKSA9PSBUZXh0VHJhY2s6OkluQmFuZCkg ewogICAgICAgICAvLyBJbnNlcnQgdHJhY2tzIGFkZGVkIGZvciBpbi1iYW5kIGluIHRoZSBtZWRp YSBmaWxlIG9yZGVyLgogICAgICAgICBzaXplX3QgaW5kZXggPSBkb3duY2FzdDxJbmJhbmRUZXh0 VHJhY2s+KHRyYWNrLmdldCgpKS5pbmJhbmRUcmFja0luZGV4KCk7Ci0gICAgICAgIG1faW5iYW5k VHJhY2tzLmluc2VydChpbmRleCwgdHJhY2suY29weVJlZigpKTsKKyAgICAgICAgbV9pbmJhbmRU cmFja3MuaW5zZXJ0KGluZGV4LCB0cmFjay5wdHIoKSk7CiAgICAgfSBlbHNlCiAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOwogCkBAIC0yMTEsNyArMjA2LDcgQEAgdm9pZCBUZXh0VHJhY2tM aXN0OjphcHBlbmQoUmVmPFRleHRUcmFjaz4mJiB0cmFjaykKIHZvaWQgVGV4dFRyYWNrTGlzdDo6 cmVtb3ZlKFRyYWNrQmFzZSYgdHJhY2ssIGJvb2wgc2NoZWR1bGVFdmVudCkKIHsKICAgICBhdXRv JiB0ZXh0VHJhY2sgPSBkb3duY2FzdDxUZXh0VHJhY2s+KHRyYWNrKTsKLSAgICBWZWN0b3I8UmVm PFRyYWNrQmFzZT4+KiB0cmFja3MgPSBudWxscHRyOworICAgIFZlY3RvcjxSZWZQdHI8VHJhY2tC YXNlPj4qIHRyYWNrcyA9IG51bGxwdHI7CiAgICAgc3dpdGNoICh0ZXh0VHJhY2sudHJhY2tUeXBl KCkpIHsKICAgICBjYXNlIFRleHRUcmFjazo6VHJhY2tFbGVtZW50OgogICAgICAgICB0cmFja3Mg PSAmbV9lbGVtZW50VHJhY2tzOwpAQCAtMjM1LDcgKzIzMCw3IEBAIHZvaWQgVGV4dFRyYWNrTGlz dDo6cmVtb3ZlKFRyYWNrQmFzZSYgdHJhY2ssIGJvb2wgc2NoZWR1bGVFdmVudCkKICAgICBpZiAo dHJhY2sudHJhY2tMaXN0KCkgPT0gdGhpcykKICAgICAgICAgdHJhY2suY2xlYXJUcmFja0xpc3Qo KTsKIAotICAgIFJlZiB0cmFja1JlZiA9ICgqdHJhY2tzKVtpbmRleF07CisgICAgUmVmPFRyYWNr QmFzZT4gdHJhY2tSZWYgPSAqKCp0cmFja3MpW2luZGV4XTsKICAgICB0cmFja3MtPnJlbW92ZUF0 KGluZGV4KTsKIAogICAgIGlmIChzY2hlZHVsZUV2ZW50KQpAQCAtMjQ0LDcgKzIzOSw3IEBAIHZv aWQgVGV4dFRyYWNrTGlzdDo6cmVtb3ZlKFRyYWNrQmFzZSYgdHJhY2ssIGJvb2wgc2NoZWR1bGVF dmVudCkKIAogYm9vbCBUZXh0VHJhY2tMaXN0Ojpjb250YWlucyhUcmFja0Jhc2UmIHRyYWNrKSBj b25zdAogewotICAgIGNvbnN0IFZlY3RvcjxSZWY8VHJhY2tCYXNlPj4qIHRyYWNrcyA9IG51bGxw dHI7CisgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxUcmFja0Jhc2U+PiogdHJhY2tzID0gbnVsbHB0 cjsKICAgICBzd2l0Y2ggKGRvd25jYXN0PFRleHRUcmFjaz4odHJhY2spLnRyYWNrVHlwZSgpKSB7 CiAgICAgY2FzZSBUZXh0VHJhY2s6OlRyYWNrRWxlbWVudDoKICAgICAgICAgdHJhY2tzID0gJm1f ZWxlbWVudFRyYWNrczsKQEAgLTI1OCw4ICsyNTMsOCBAQCBib29sIFRleHRUcmFja0xpc3Q6OmNv bnRhaW5zKFRyYWNrQmFzZSYgdHJhY2spIGNvbnN0CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQotCi0gICAgcmV0dXJuIHRyYWNrcy0+Y29udGFpbnMo JnRyYWNrKTsKKyAgICAKKyAgICByZXR1cm4gdHJhY2tzLT5maW5kKCZ0cmFjaykgIT0gbm90Rm91 bmQ7CiB9CiAKIGVudW0gRXZlbnRUYXJnZXRJbnRlcmZhY2VUeXBlIFRleHRUcmFja0xpc3Q6OmV2 ZW50VGFyZ2V0SW50ZXJmYWNlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9UZXh0 VHJhY2tMaXN0LmgKaW5kZXggMzZhNzNiYTI3NGI1Li5mNzkyMjAxOGRkZTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrTGlzdC5oCkBAIC01MiwxMCArNTIsMTAgQEAgcHVi bGljOgogICAgIGludCBnZXRUcmFja0luZGV4UmVsYXRpdmVUb1JlbmRlcmVkVHJhY2tzKFRleHRU cmFjayYpOwogICAgIGJvb2wgY29udGFpbnMoVHJhY2tCYXNlJikgY29uc3QgZmluYWw7CiAKLSAg ICBSZWZQdHI8VGV4dFRyYWNrPiBpdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdDsKKyAgICBUZXh0 VHJhY2sqIGl0ZW0odW5zaWduZWQgaW5kZXgpIGNvbnN0OwogICAgIFJlZlB0cjxUZXh0VHJhY2s+ IGdldFRyYWNrQnlJZChjb25zdCBBdG9tU3RyaW5nJikgY29uc3Q7CiAgICAgUmVmUHRyPFRleHRU cmFjaz4gZ2V0VHJhY2tCeUlkKFRyYWNrSUQpIGNvbnN0OwotICAgIFJlZlB0cjxUZXh0VHJhY2s+ IGxhc3RJdGVtKCkgY29uc3Q7CisgICAgVGV4dFRyYWNrKiBsYXN0SXRlbSgpIGNvbnN0IHsgcmV0 dXJuIGl0ZW0obGVuZ3RoKCkgLSAxKTsgfQogCiAgICAgdm9pZCBhcHBlbmQoUmVmPFRleHRUcmFj az4mJik7CiAgICAgdm9pZCByZW1vdmUoVHJhY2tCYXNlJiwgYm9vbCBzY2hlZHVsZUV2ZW50ID0g dHJ1ZSkgZmluYWw7CkBAIC03MSw4ICs3MSw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGludmFs aWRhdGVUcmFja0luZGV4ZXNBZnRlclRyYWNrKFRleHRUcmFjayYpOwogCi0gICAgVmVjdG9yPFJl ZjxUcmFja0Jhc2U+PiBtX2FkZFRyYWNrVHJhY2tzOwotICAgIFZlY3RvcjxSZWY8VHJhY2tCYXNl Pj4gbV9lbGVtZW50VHJhY2tzOworICAgIFZlY3RvcjxSZWZQdHI8VHJhY2tCYXNlPj4gbV9hZGRU cmFja1RyYWNrczsKKyAgICBWZWN0b3I8UmVmUHRyPFRyYWNrQmFzZT4+IG1fZWxlbWVudFRyYWNr czsKICAgICBNZWRpYVRpbWUgbV9kdXJhdGlvbjsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVHJhY2tMaXN0QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3RyYWNrL1RyYWNrTGlzdEJhc2UuY3BwCmluZGV4IGE4YWU4ODZjNjA1My4uYjg4ZTQxMjJhYmVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RyYWNrTGlzdEJhc2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVHJhY2tMaXN0QmFzZS5jcHAKQEAgLTU0 LDcgKzU0LDcgQEAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogVHJhY2tMaXN0QmFzZTo6c2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpIGNvbnN0CiB2b2lkIFRyYWNrTGlzdEJhc2U6OmRpZE1vdmVUb05l d0RvY3VtZW50KERvY3VtZW50JiBuZXdEb2N1bWVudCkKIHsKICAgICBBY3RpdmVET01PYmplY3Q6 OmRpZE1vdmVUb05ld0RvY3VtZW50KG5ld0RvY3VtZW50KTsKLSAgICBmb3IgKGF1dG8mIHRyYWNr IDogbV9pbmJhbmRUcmFja3MpCisgICAgZm9yIChSZWZQdHIgdHJhY2sgOiBtX2luYmFuZFRyYWNr cykKICAgICAgICAgdHJhY2stPmRpZE1vdmVUb05ld0RvY3VtZW50KG5ld0RvY3VtZW50KTsKIH0K IApAQCAtNzgsNyArNzgsNyBAQCBSZWZQdHI8VHJhY2tCYXNlPiBUcmFja0xpc3RCYXNlOjpmaW5k KFRyYWNrSUQgdHJhY2tJRCkgY29uc3QKICAgICB9KTsKICAgICBpZiAoaW5kZXggPT0gbm90Rm91 bmQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgIHJldHVybiBtX2luYmFuZFRyYWNrc1tp bmRleF0uY29weVJlZigpOworICAgIHJldHVybiBtX2luYmFuZFRyYWNrc1tpbmRleF07CiB9CiAK IHZvaWQgVHJhY2tMaXN0QmFzZTo6cmVtb3ZlKFRyYWNrSUQgdHJhY2tJRCwgYm9vbCBzY2hlZHVs ZUV2ZW50KQpAQCAtOTYsNyArOTYsNyBAQCB2b2lkIFRyYWNrTGlzdEJhc2U6OnJlbW92ZShUcmFj a0Jhc2UmIHRyYWNrLCBib29sIHNjaGVkdWxlRXZlbnQpCiAgICAgaWYgKHRyYWNrLnRyYWNrTGlz dCgpID09IHRoaXMpCiAgICAgICAgIHRyYWNrLmNsZWFyVHJhY2tMaXN0KCk7CiAKLSAgICBSZWYg dHJhY2tSZWYgPSBtX2luYmFuZFRyYWNrc1tpbmRleF07CisgICAgUmVmPFRyYWNrQmFzZT4gdHJh Y2tSZWYgPSAqbV9pbmJhbmRUcmFja3NbaW5kZXhdOwogCiAgICAgbV9pbmJhbmRUcmFja3MucmVt b3ZlQXQoaW5kZXgpOwogCkBAIC0xMDYsNyArMTA2LDcgQEAgdm9pZCBUcmFja0xpc3RCYXNlOjpy ZW1vdmUoVHJhY2tCYXNlJiB0cmFjaywgYm9vbCBzY2hlZHVsZUV2ZW50KQogCiBib29sIFRyYWNr TGlzdEJhc2U6OmNvbnRhaW5zKFRyYWNrQmFzZSYgdHJhY2spIGNvbnN0CiB7Ci0gICAgcmV0dXJu IG1faW5iYW5kVHJhY2tzLmNvbnRhaW5zKCZ0cmFjayk7CisgICAgcmV0dXJuIG1faW5iYW5kVHJh Y2tzLmZpbmQoJnRyYWNrKSAhPSBub3RGb3VuZDsKIH0KIAogYm9vbCBUcmFja0xpc3RCYXNlOjpj b250YWlucyhUcmFja0lEIHRyYWNrSUQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL1RyYWNrTGlzdEJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2sv VHJhY2tMaXN0QmFzZS5oCmluZGV4IGU0YTc3Y2VjOTE4Ny4uNDA5ZGM2MjliMGNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RyYWNrTGlzdEJhc2UuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3RyYWNrL1RyYWNrTGlzdEJhc2UuaApAQCAtODAsNyArODAsNyBAQCBw cm90ZWN0ZWQ6CiAgICAgdm9pZCBzY2hlZHVsZUFkZFRyYWNrRXZlbnQoUmVmPFRyYWNrQmFzZT4m Jik7CiAgICAgdm9pZCBzY2hlZHVsZVJlbW92ZVRyYWNrRXZlbnQoUmVmPFRyYWNrQmFzZT4mJik7 CiAKLSAgICBWZWN0b3I8UmVmPFRyYWNrQmFzZT4+IG1faW5iYW5kVHJhY2tzOworICAgIFZlY3Rv cjxSZWZQdHI8VHJhY2tCYXNlPj4gbV9pbmJhbmRUcmFja3M7CiAKIHByaXZhdGU6CiAgICAgdm9p ZCBzY2hlZHVsZVRyYWNrRXZlbnQoY29uc3QgQXRvbVN0cmluZyYgZXZlbnROYW1lLCBSZWY8VHJh Y2tCYXNlPiYmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVmlkZW9U cmFja0xpc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WaWRlb1RyYWNrTGlzdC5j cHAKaW5kZXggZTZkZTllNGUxY2VmLi4wNmMyMDIyOTk3ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVmlkZW9UcmFja0xpc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvdHJhY2svVmlkZW9UcmFja0xpc3QuY3BwCkBAIC00OCwxMSArNDgsMTEgQEAgdm9pZCBW aWRlb1RyYWNrTGlzdDo6YXBwZW5kKFJlZjxWaWRlb1RyYWNrPiYmIHRyYWNrKQogICAgIHNpemVf dCBpbmRleCA9IHRyYWNrLT5pbmJhbmRUcmFja0luZGV4KCk7CiAgICAgc2l6ZV90IGluc2VydGlv bkluZGV4OwogICAgIGZvciAoaW5zZXJ0aW9uSW5kZXggPSAwOyBpbnNlcnRpb25JbmRleCA8IG1f aW5iYW5kVHJhY2tzLnNpemUoKTsgKytpbnNlcnRpb25JbmRleCkgewotICAgICAgICBSZWYgb3Ro ZXJUcmFjayA9IGRvd25jYXN0PFZpZGVvVHJhY2s+KG1faW5iYW5kVHJhY2tzW2luc2VydGlvbklu ZGV4XSk7CisgICAgICAgIFJlZiBvdGhlclRyYWNrID0gZG93bmNhc3Q8VmlkZW9UcmFjaz4oKm1f aW5iYW5kVHJhY2tzW2luc2VydGlvbkluZGV4XSk7CiAgICAgICAgIGlmIChvdGhlclRyYWNrLT5p bmJhbmRUcmFja0luZGV4KCkgPiBpbmRleCkKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KLSAg ICBtX2luYmFuZFRyYWNrcy5pbnNlcnQoaW5zZXJ0aW9uSW5kZXgsIHRyYWNrLmNvcHlSZWYoKSk7 CisgICAgbV9pbmJhbmRUcmFja3MuaW5zZXJ0KGluc2VydGlvbkluZGV4LCB0cmFjay5wdHIoKSk7 CiAKICAgICBpZiAoIXRyYWNrLT50cmFja0xpc3QoKSkKICAgICAgICAgdHJhY2stPnNldFRyYWNr TGlzdCgqdGhpcyk7CkBAIC02MCwyMiArNjAsMTcgQEAgdm9pZCBWaWRlb1RyYWNrTGlzdDo6YXBw ZW5kKFJlZjxWaWRlb1RyYWNrPiYmIHRyYWNrKQogICAgIHNjaGVkdWxlQWRkVHJhY2tFdmVudChX VEY6Om1vdmUodHJhY2spKTsKIH0KIAotUmVmUHRyPFZpZGVvVHJhY2s+IFZpZGVvVHJhY2tMaXN0 OjppdGVtKHVuc2lnbmVkIGluZGV4KSBjb25zdAorVmlkZW9UcmFjayogVmlkZW9UcmFja0xpc3Q6 Oml0ZW0odW5zaWduZWQgaW5kZXgpIGNvbnN0CiB7CiAgICAgaWYgKGluZGV4IDwgbV9pbmJhbmRU cmFja3Muc2l6ZSgpKQotICAgICAgICByZXR1cm4gZG93bmNhc3Q8VmlkZW9UcmFjaz4obV9pbmJh bmRUcmFja3NbaW5kZXhdKTsKKyAgICAgICAgcmV0dXJuIGRvd25jYXN0PFZpZGVvVHJhY2s+KG1f aW5iYW5kVHJhY2tzW2luZGV4XS5nZXQoKSk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLVJl ZlB0cjxWaWRlb1RyYWNrPiBWaWRlb1RyYWNrTGlzdDo6bGFzdEl0ZW0oKSBjb25zdAotewotICAg IHJldHVybiBpdGVtKGxlbmd0aCgpIC0gMSk7Ci19Ci0KIFJlZlB0cjxWaWRlb1RyYWNrPiBWaWRl b1RyYWNrTGlzdDo6Z2V0VHJhY2tCeUlkKGNvbnN0IEF0b21TdHJpbmcmIGlkKSBjb25zdAogewot ICAgIGZvciAoYXV0byYgaW5iYW5kVHJhY2sgOiBtX2luYmFuZFRyYWNrcykgewotICAgICAgICBS ZWYgdHJhY2sgPSBkb3duY2FzdDxWaWRlb1RyYWNrPihpbmJhbmRUcmFjayk7CisgICAgZm9yIChh dXRvJiBpbmJhbmRUcmFja3MgOiBtX2luYmFuZFRyYWNrcykgeworICAgICAgICBSZWYgdHJhY2sg PSBkb3duY2FzdDxWaWRlb1RyYWNrPigqaW5iYW5kVHJhY2tzKTsKICAgICAgICAgaWYgKHRyYWNr LT5pZCgpID09IGlkKQogICAgICAgICAgICAgcmV0dXJuIHRyYWNrOwogICAgIH0KQEAgLTg0LDgg Kzc5LDggQEAgUmVmUHRyPFZpZGVvVHJhY2s+IFZpZGVvVHJhY2tMaXN0OjpnZXRUcmFja0J5SWQo Y29uc3QgQXRvbVN0cmluZyYgaWQpIGNvbnN0CiAKIFJlZlB0cjxWaWRlb1RyYWNrPiBWaWRlb1Ry YWNrTGlzdDo6Z2V0VHJhY2tCeUlkKFRyYWNrSUQgaWQpIGNvbnN0CiB7Ci0gICAgZm9yIChhdXRv JiBpbmJhbmRUcmFjayA6IG1faW5iYW5kVHJhY2tzKSB7Ci0gICAgICAgIFJlZiB0cmFjayA9IGRv d25jYXN0PFZpZGVvVHJhY2s+KGluYmFuZFRyYWNrKTsKKyAgICBmb3IgKGF1dG8mIGluYmFuZFRy YWNrcyA6IG1faW5iYW5kVHJhY2tzKSB7CisgICAgICAgIFJlZiB0cmFjayA9IGRvd25jYXN0PFZp ZGVvVHJhY2s+KCppbmJhbmRUcmFja3MpOwogICAgICAgICBpZiAodHJhY2stPnRyYWNrSWQoKSA9 PSBpZCkKICAgICAgICAgICAgIHJldHVybiB0cmFjazsKICAgICB9CkBAIC0xMDAsMTMgKzk1LDEz IEBAIGludCBWaWRlb1RyYWNrTGlzdDo6c2VsZWN0ZWRJbmRleCgpIGNvbnN0CiAgICAgLy8gY3Vy cmVudGx5IHJlcHJlc2VudCBhbnkgdHJhY2tzLCBvciBpZiBub25lIG9mIHRoZSB0cmFja3MgYXJl IHNlbGVjdGVkLAogICAgIC8vIGl0IG11c3QgaW5zdGVhZCByZXR1cm4g4oiSMS4KICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoKCk7ICsraSkgewotICAgICAgICBpZiAoZG93bmNh c3Q8VmlkZW9UcmFjaz4obV9pbmJhbmRUcmFja3NbaV0uZ2V0KCkpLnNlbGVjdGVkKCkpCisgICAg ICAgIGlmIChkb3duY2FzdDxWaWRlb1RyYWNrPigqbV9pbmJhbmRUcmFja3NbaV0pLnNlbGVjdGVk KCkpCiAgICAgICAgICAgICByZXR1cm4gaTsKICAgICB9CiAgICAgcmV0dXJuIC0xOwogfQogCi1S ZWZQdHI8VmlkZW9UcmFjaz4gVmlkZW9UcmFja0xpc3Q6OnNlbGVjdGVkSXRlbSgpIGNvbnN0CitW aWRlb1RyYWNrKiBWaWRlb1RyYWNrTGlzdDo6c2VsZWN0ZWRJdGVtKCkgY29uc3QKIHsKICAgICBh dXRvIHNlbGVjdGVkSW5kZXggPSB0aGlzLT5zZWxlY3RlZEluZGV4KCk7CiAgICAgaWYgKHNlbGVj dGVkSW5kZXggPCAwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WaWRl b1RyYWNrTGlzdC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WaWRlb1RyYWNrTGlzdC5o CmluZGV4IDQ4MTA5N2ZmM2ZlNi4uODBjYjE5MmExNGQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1ZpZGVvVHJhY2tMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC90cmFjay9WaWRlb1RyYWNrTGlzdC5oCkBAIC00OSw5ICs0OSw5IEBAIHB1YmxpYzoKICAgICBp bnQgc2VsZWN0ZWRJbmRleCgpIGNvbnN0OwogCiAgICAgYm9vbCBpc1N1cHBvcnRlZFByb3BlcnR5 SW5kZXgodW5zaWduZWQgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIGluZGV4IDwgbV9pbmJhbmRUcmFj a3Muc2l6ZSgpOyB9Ci0gICAgUmVmUHRyPFZpZGVvVHJhY2s+IGl0ZW0odW5zaWduZWQpIGNvbnN0 OwotICAgIFJlZlB0cjxWaWRlb1RyYWNrPiBsYXN0SXRlbSgpIGNvbnN0OwotICAgIFJlZlB0cjxW aWRlb1RyYWNrPiBzZWxlY3RlZEl0ZW0oKSBjb25zdDsKKyAgICBWaWRlb1RyYWNrKiBpdGVtKHVu c2lnbmVkKSBjb25zdDsKKyAgICBWaWRlb1RyYWNrKiBsYXN0SXRlbSgpIGNvbnN0IHsgcmV0dXJu IGl0ZW0obGVuZ3RoKCkgLSAxKTsgfQorICAgIFZpZGVvVHJhY2sqIHNlbGVjdGVkSXRlbSgpIGNv bnN0OwogICAgIHZvaWQgYXBwZW5kKFJlZjxWaWRlb1RyYWNrPiYmKTsKIAogICAgIC8vIEV2ZW50 VGFyZ2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFj a1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nv Y29hL1BsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50Lm1tCmluZGV4IGIyNDIwZWJjMDAz NS4uNjY3MmExZDM5Mjk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2Nv YS9QbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudC5tbQpAQCAt NTQxLDcgKzU0MSw3IEBAIHZvaWQgUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQ6Om1h eWJlVXBkYXRlVmlkZW9NZXRhZGF0YSgpCiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAg IHJldHVybjsKICAgICBSZWZQdHIgdmlkZW9UcmFja3MgPSBtZWRpYUVsZW1lbnQtPnZpZGVvVHJh Y2tzKCk7Ci0gICAgUmVmUHRyIHNlbGVjdGVkSXRlbSA9IHZpZGVvVHJhY2tzID8gdmlkZW9UcmFj a3MtPnNlbGVjdGVkSXRlbSgpIDogbnVsbHB0cjsKKyAgICBhdXRvKiBzZWxlY3RlZEl0ZW0gPSB2 aWRlb1RyYWNrcyA/IHZpZGVvVHJhY2tzLT5zZWxlY3RlZEl0ZW0oKSA6IG51bGxwdHI7CiAKICAg ICAvLyBPY2Nhc2lvbmFsbHksIHdoZW4gdGVhcmluZyBkb3duIGFuIEFWQXNzZXRUcmFjayBpbiBh IEhMUyBzdHJlYW0sIHRoZSB0cmFja3MKICAgICAvLyBleHBvc2VkIHRvIHdlYiBjb250ZW50IGFy ZSByZWNyZWF0ZWQsIGFuZCBhICJyZW1vdmV0cmFjayIgZXZlbnQgaXMgZmlyZWQgYmVmb3JlCg==