241398 2022-06-07 19:12:07 -0700 AX ITM: Fix for accessibility/Mac/aria-errormessage.html in isolated tree mode. 2022-06-13 10:15:27 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1874633 0 andresg_22 2022-06-07 19:12:07 -0700 This test is failing in isolated tree mode. 1874634 1 webkit-bug-importer 2022-06-07 19:12:16 -0700 <rdar://problem/94589697> 1874637 2 460081 andresg_22 2022-06-07 19:38:04 -0700 Created attachment 460081 Patch 1875107 3 460144 andresg_22 2022-06-09 14:26:58 -0700 Created attachment 460144 Patch 1875230 4 460159 andresg_22 2022-06-10 07:07:19 -0700 Created attachment 460159 Patch 1875262 5 460161 andresg_22 2022-06-10 10:12:43 -0700 Created attachment 460161 Patch 1875544 6 ews-feeder 2022-06-13 10:15:25 -0700 Committed r295491 (251496@main): <https://commits.webkit.org/251496@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460161. 460081 2022-06-07 19:38:04 -0700 2022-06-10 07:07:13 -0700 Patch bug-241398-20220607223802.patch text/plain 7714 andresg_22 RnJvbSA4OTNjZTAwOGRiMDU1N2Y4N2E3NmI2M2Y4MTk0Mzg0MTVkYTJjYzc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDcgSnVuIDIwMjIgMjE6MDU6NTIgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WCBJVE06IEZpeCBmb3IgYWNjZXNzaWJpbGl0eS9NYWMvYXJpYS1lcnJvcm1lc3NhZ2UuaHRtbCBp bgogaXNvbGF0ZWQgdHJlZSBtb2RlLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjQxMzk4CgpUZXN0OiBhY2Nlc3NpYmlsaXR5L01hYy9hcmlhLWVycm9ybWVzc2FnZS5o dG1sCgpSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaCBhbmQgVHlsZXIgV2lsY29jay4KClRoaXMg dGVzdCB3YXMgZmFpbGluZyBiZWNhdXNlIHRoZSBlbGVtZW50cyB0aGF0IGFyZSByZWZlcmVuY2Vk IGFzIGVycm9yIG1lc3NhZ2VzIGFyZSA8c3Bhbj4gZWxlbWVudHMsIHdoaWNoIGFyZSBpZ25vcmVk IG9uIHRoZSBtYWMgcGxhdGZvcm0uIFRoZXJlZm9yZSB0aGVyZSB3YXMgbm8gaXNvbGF0ZWQgb2Jq ZWN0IGNyZWF0ZWQgZm9yIHRob3NlIGVsZW1lbnRzIGFuZCBBWElzb2xhdGVkVHJlZTo6b2JqZWN0 c0ZvcklEcyB3aWxsIG5vdCByZXR1cm4gdGhlbS4gVGhpcyBwYXRjaCBzb2x2ZXMgdGhpcyBwcm9i bGVtIGJ5IGNyZWF0aW5nIG9ycGhhbiBpc29sYXRlZCBvYmplY3RzIGluIEFYSXNvbGF0ZWRUcmVl Om9iamVjdHNGb3JJRHMgaWYgdGhlcmUgaXMgbm8gaXNvbGF0ZWQgb2JqZWN0IGZvciB0aGUgcmVx dWVzdGVkIEFYSUQsIGFuZCB0aGUgY29ycmVzcG9uZGluZyBsaXZlIG9iamVjdHMgZXhpc3RzLgot LS0KIC4uLi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8ICAyICst CiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaCAgfCAgMiArLQog Li4uL2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCAgICAgICAgIHwgIDQgKy0tCiAu Li4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCAgICAgICAgICAgfCAzNiArKysrKysr KysrKysrKysrLS0tCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmggICAgICAgICAg ICAgfCAgNCArLS0KIDUgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVj dENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAKaW5kZXggZmMwZmRiZWYyMzEwLi5lMjdjMDA1Y2UxYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtOTUyLDcgKzk1Miw3IEBAIFZl Y3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gQVhPYmplY3RDYWNoZTo6b2JqZWN0c0ZvcklEcyhj b25zdCBWZWN0b3I8QVhJRD4mIGF4CiAKICAgICByZXR1cm4gYXhJRHMubWFwKFt0aGlzXSAoY29u c3QgYXV0byYgYXhJRCkgLT4gUmVmUHRyPEFYQ29yZU9iamVjdD4gewogICAgICAgICBBU1NFUlQo YXhJRC5pc1ZhbGlkKCkpOwotICAgICAgICByZXR1cm4gb2JqZWN0RnJvbUFYSUQoYXhJRCk7Cisg ICAgICAgIHJldHVybiBvYmplY3RGb3JJRChheElEKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaAppbmRleCA4YTNjNDY3Y2MwOGEu LmNmMTJiMTRjNWEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVj dENhY2hlLmgKQEAgLTIyMyw3ICsyMjMsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBub2RlSXNUZXh0 Q29udHJvbChjb25zdCBOb2RlKik7CiAKICAgICBBWElEIHBsYXRmb3JtR2VuZXJhdGVBWElEKCkg Y29uc3Q7Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0RnJvbUFYSUQoQVhJRCBpZCkg Y29uc3QgeyByZXR1cm4gbV9vYmplY3RzLmdldChpZCk7IH0KKyAgICBBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBvYmplY3RGb3JJRChjb25zdCBBWElEJiBpZCkgY29uc3QgeyByZXR1cm4gbV9vYmplY3Rz LmdldChpZCk7IH0KICAgICBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+IG9iamVjdHNGb3JJ RHMoY29uc3QgVmVjdG9yPEFYSUQ+JikgY29uc3Q7CiAKICAgICAvLyBUZXh0IG1hcmtlciB1dGls aXRpZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDlhMDBmNGU1ZWY1Mi4uNmY0 YjRmZDQ0NzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcApAQCAtNzYsOCArNzYsNiBA QCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmluaXRpYWxpemVQcm9wZXJ0aWVzKEFYQ29yZU9iamVj dCYgY29yZU9iamVjdCwgSXNSb290IGlzUgogewogICAgIEFTU0VSVChpczxBY2Nlc3NpYmlsaXR5 T2JqZWN0Pihjb3JlT2JqZWN0KSk7CiAgICAgYXV0byYgb2JqZWN0ID0gZG93bmNhc3Q8QWNjZXNz aWJpbGl0eU9iamVjdD4oY29yZU9iamVjdCk7Ci0gICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGNyZWF0 ZSBhbiBpc29sYXRlZCBvYmplY3QgZnJvbSBhbiBpZ25vcmVkIG9iamVjdC4KLSAgICBBU1NFUlQo IW9iamVjdC5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpOwogCiAgICAgc2V0UHJvcGVydHkoQVhQ cm9wZXJ0eU5hbWU6OkFSSUFMYW5kbWFya1JvbGVEZXNjcmlwdGlvbiwgb2JqZWN0LmFyaWFMYW5k bWFya1JvbGVEZXNjcmlwdGlvbigpLmlzb2xhdGVkQ29weSgpKTsKICAgICBzZXRQcm9wZXJ0eShB WFByb3BlcnR5TmFtZTo6QWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uLCBvYmplY3QuYWNjZXNzaWJp bGl0eURlc2NyaXB0aW9uKCkuaXNvbGF0ZWRDb3B5KCkpOwpAQCAtNDEzLDcgKzQxMSw3IEBAIEFY Q29yZU9iamVjdCogQVhJc29sYXRlZE9iamVjdDo6YXNzb2NpYXRlZEFYT2JqZWN0KCkgY29uc3QK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBhdXRvKiBheE9iamVjdENhY2hlID0gdGhp cy0+YXhPYmplY3RDYWNoZSgpOwotICAgIHJldHVybiBheE9iamVjdENhY2hlID8gYXhPYmplY3RD YWNoZS0+b2JqZWN0RnJvbUFYSUQobV9pZCkgOiBudWxscHRyOworICAgIHJldHVybiBheE9iamVj dENhY2hlID8gYXhPYmplY3RDYWNoZS0+b2JqZWN0Rm9ySUQobV9pZCkgOiBudWxscHRyOwogfQog CiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OnNldE1hdGhzY3JpcHRzKEFYUHJvcGVydHlOYW1lIHBy b3BlcnR5TmFtZSwgQVhDb3JlT2JqZWN0JiBvYmplY3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAK aW5kZXggMjE1Zjc5NjNkODcyLi4zOTA5M2UzMmU1ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHAKQEAgLTE0NSw3ICsxNDUsNyBAQCBSZWZQdHI8QVhJc29sYXRlZFRyZWU+IEFYSXNvbGF0ZWRU cmVlOjp0cmVlRm9yUGFnZUlEKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCkKICAgICByZXR1cm4gbnVs bHB0cjsKIH0KIAotUmVmUHRyPEFYSXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0ZWRUcmVlOjpub2Rl Rm9ySUQoQVhJRCBheElEKSBjb25zdAorUmVmUHRyPEFYSXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0 ZWRUcmVlOjpub2RlRm9ySUQoY29uc3QgQVhJRCYgYXhJRCkgY29uc3QKIHsKICAgICAvLyBJbiBp c29sYXRlZCB0cmVlIG1vZGUgMiwgb25seSBhY2Nlc3MgbV9yZWFkZXJUaHJlYWROb2RlTWFwIG9u IHRoZSBBWCB0aHJlYWQuCiAgICAgQVNTRVJUKG1fdXNlZE9uQVhUaHJlYWQgPyAhaXNNYWluVGhy ZWFkKCkgOiBpc01haW5UaHJlYWQoKSk7CkBAIC0xNTUsMTcgKzE1NSw0MiBAQCBSZWZQdHI8QVhJ c29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVGb3JJRChBWElEIGF4SUQpIGNvbnN0 CiAgICAgcmV0dXJuIGF4SUQuaXNWYWxpZCgpID8gbV9yZWFkZXJUaHJlYWROb2RlTWFwLmdldChh eElEKSA6IG51bGxwdHI7CiB9CiAKLVZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gQVhJc29s YXRlZFRyZWU6Om9iamVjdHNGb3JJRHMoY29uc3QgVmVjdG9yPEFYSUQ+JiBheElEcykgY29uc3QK K1ZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gQVhJc29sYXRlZFRyZWU6Om9iamVjdHNGb3JJ RHMoY29uc3QgVmVjdG9yPEFYSUQ+JiBheElEcykKIHsKICAgICBBWFRSQUNFKCJBWElzb2xhdGVk VHJlZTo6b2JqZWN0c0ZvcklEcyJfcyk7CisgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CisK ICAgICBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+IHJlc3VsdDsKICAgICByZXN1bHQucmVz ZXJ2ZUluaXRpYWxDYXBhY2l0eShheElEcy5zaXplKCkpOwogICAgIGZvciAoYXV0byYgYXhJRCA6 IGF4SURzKSB7Ci0gICAgICAgIGlmIChhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChheElEKSkKKyAg ICAgICAgYXV0byBvYmplY3QgPSBub2RlRm9ySUQoYXhJRCk7CisgICAgICAgIGlmIChvYmplY3Qp IHsKICAgICAgICAgICAgIHJlc3VsdC51bmNoZWNrZWRBcHBlbmQob2JqZWN0KTsKKyAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgLy8gVGhlcmUgaXMgbm8gaXNvbGF0 ZWQgb2JqZWN0IGZvciB0aGlzIEFYSUQuIFRoaXMgY2FuIGhhcHBlbiBpZiB0aGUgY29ycmVzcG9u ZGluZyBsaXZlIG9iamVjdCBpcyBpZ25vcmVkLgorICAgICAgICAvLyBJZiB0aGVyZSBpcyBhIGxp dmUgb2JqZWN0IGZvciB0aGlzIElELCBjcmVhdGUgYW4gb3JwaGFuIGlzb2xhdGVkIG9iamVjdCB0 aGF0IGNvcnJlc3BvbmRzIHRvIGl0LgorICAgICAgICBvYmplY3QgPSBBY2Nlc3NpYmlsaXR5Ojpy ZXRyaWV2ZVZhbHVlRnJvbU1haW5UaHJlYWQ8UmVmUHRyPEFYSXNvbGF0ZWRPYmplY3Q+PihbJmF4 SUQsIHRoaXNdICgpIC0+IFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiB7CisgICAgICAgICAgICBh dXRvKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKKyAgICAgICAgICAgIGlmICghY2FjaGUpCisg ICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAgICAgICAgIGF1dG8qIGF4T2Jq ZWN0ID0gY2FjaGUtPm9iamVjdEZvcklEKGF4SUQpOworICAgICAgICAgICAgaWYgKCFheE9iamVj dCkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICAgICAgYXV0byBv YmplY3QgPSBBWElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoKmF4T2JqZWN0LCBjb25zdF9jYXN0PEFY SXNvbGF0ZWRUcmVlKj4odGhpcykpOworICAgICAgICAgICAgQVNTRVJUKGF4T2JqZWN0LT53cmFw cGVyKCkpOworICAgICAgICAgICAgb2JqZWN0LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIoYXhPYmpl Y3QtPndyYXBwZXIoKSk7CisgICAgICAgICAgICByZXR1cm4gb2JqZWN0OworICAgICAgICB9KTsK KyAgICAgICAgaWYgKG9iamVjdCkgeworICAgICAgICAgICAgbV9yZWFkZXJUaHJlYWROb2RlTWFw LmFkZChheElELCAqb2JqZWN0KTsKKyAgICAgICAgICAgIHJlc3VsdC51bmNoZWNrZWRBcHBlbmQo b2JqZWN0KTsKKyAgICAgICAgfQogICAgIH0KICAgICByZXN1bHQuc2hyaW5rVG9GaXQoKTsKLQog ICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTI2Myw5ICsyODgsMTAgQEAgdm9pZCBBWElzb2xh dGVkVHJlZTo6cXVldWVSZW1vdmFsc0FuZFVucmVzb2x2ZWRDaGFuZ2VzKGNvbnN0IFZlY3RvcjxB WElEPiYgc3VidHIKICAgICAgICAgaWYgKGF1dG8qIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKSB7 CiAgICAgICAgICAgICByZXNvbHZlZEFwcGVuZHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShtX3Vu cmVzb2x2ZWRQZW5kaW5nQXBwZW5kcy5zaXplKCkpOwogICAgICAgICAgICAgZm9yIChjb25zdCBh dXRvJiB1bnJlc29sdmVkQXBwZW5kIDogbV91bnJlc29sdmVkUGVuZGluZ0FwcGVuZHMpIHsKLSAg ICAgICAgICAgICAgICBpZiAoYXV0byogYXhPYmplY3QgPSBjYWNoZS0+b2JqZWN0RnJvbUFYSUQo dW5yZXNvbHZlZEFwcGVuZC5rZXkpKQorICAgICAgICAgICAgICAgIGlmIChhdXRvKiBheE9iamVj dCA9IGNhY2hlLT5vYmplY3RGb3JJRCh1bnJlc29sdmVkQXBwZW5kLmtleSkpIHsKICAgICAgICAg ICAgICAgICAgICAgaWYgKGF1dG8gbm9kZUNoYW5nZSA9IG5vZGVDaGFuZ2VGb3JPYmplY3QoKmF4 T2JqZWN0LCB1bnJlc29sdmVkQXBwZW5kLnZhbHVlKSkKICAgICAgICAgICAgICAgICAgICAgICAg IHJlc29sdmVkQXBwZW5kcy51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZSgqbm9kZUNoYW5nZSkpOwor ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIG1fdW5yZXNvbHZl ZFBlbmRpbmdBcHBlbmRzLmNsZWFyKCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCmlu ZGV4IGFjNDAxOTZmOTk4OS4uYWRmYzIzYTExODY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAg LTMzMiw4ICszMzIsOCBAQCBwdWJsaWM6CiAKICAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4g cm9vdE5vZGUoKTsKICAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gZm9jdXNlZE5vZGUoKTsK LSAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gbm9kZUZvcklEKEFYSUQpIGNvbnN0OwotICAg IFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gb2JqZWN0c0ZvcklEcyhjb25zdCBWZWN0b3I8 QVhJRD4mKSBjb25zdDsKKyAgICBSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gbm9kZUZvcklEKGNv bnN0IEFYSUQmKSBjb25zdDsKKyAgICBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+IG9iamVj dHNGb3JJRHMoY29uc3QgVmVjdG9yPEFYSUQ+Jik7CiAKICAgICBzdHJ1Y3QgTm9kZUNoYW5nZSB7 CiAgICAgICAgIFJlZjxBWElzb2xhdGVkT2JqZWN0PiBpc29sYXRlZE9iamVjdDsKLS0gCjIuMzIu MCAoQXBwbGUgR2l0LTEzMikKCg== 460144 2022-06-09 14:26:58 -0700 2022-06-10 07:07:15 -0700 Patch bug-241398-20220609172657.patch text/plain 13076 andresg_22 RnJvbSA0ZThkNDYwZDc0MTIzZDMyMzY5MDdhNWUxYjRlZGMyNjIyMDg0ODU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDcgSnVuIDIwMjIgMjE6MDU6NTIgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WCBJVE06IEZpeCBmb3IgYWNjZXNzaWJpbGl0eS9NYWMvYXJpYS1lcnJvcm1lc3NhZ2UuaHRtbCBp bgogaXNvbGF0ZWQgdHJlZSBtb2RlLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjQxMzk4CgpUZXN0OiBhY2Nlc3NpYmlsaXR5L01hYy9hcmlhLWVycm9ybWVzc2FnZS5o dG1sCgpSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaCBhbmQgVHlsZXIgV2lsY29jay4KClRoaXMg dGVzdCB3YXMgZmFpbGluZyBiZWNhdXNlIHRoZSBlbGVtZW50cyB0aGF0IGFyZSByZWZlcmVuY2Vk IGFzIGVycm9yIG1lc3NhZ2VzIGFyZSA8c3Bhbj4gZWxlbWVudHMsIHdoaWNoIGFyZSBpZ25vcmVk IG9uIHRoZSBtYWMgcGxhdGZvcm0uIFRoZXJlZm9yZSB0aGVyZSB3YXMgbm8gaXNvbGF0ZWQgb2Jq ZWN0IGNyZWF0ZWQgZm9yIHRob3NlIGVsZW1lbnRzIGFuZCBBWElzb2xhdGVkVHJlZTo6b2JqZWN0 c0ZvcklEcyB3aWxsIG5vdCByZXR1cm4gdGhlbS4gVGhpcyBwYXRjaCBzb2x2ZXMgdGhpcyBwcm9i bGVtIGJ5IGNyZWF0aW5nIGlzb2xhdGVkIG9iamVjdHMgZm9yIGlnbm9yZWQgbGl2ZSBvYmplY3Rz IHRoYXQgYXJlIHRoZSB0YXJnZXQgb2YgYSByZWxhdGlvbnNoaXAgZHVyaW5nIHRoZSBnZW5lcmF0 aW9uIGFuZCB1cGRhdGUgb2YgdGhlIGlzb2xhdGVkIHRyZWUuCi0tLQogLi4uL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCAgIHwgMTAgKysrKy0KIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oICB8ICA0ICstCiAuLi4vaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRPYmplY3QuY3BwICAgICAgICAgfCAgNCArLQogLi4uL2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5jcHAgICAgICAgICAgIHwgNDUgKysrKysrKysrKysrKysrLS0tLQogLi4u L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oICAgICAgICAgICAgIHwgIDkgKystLQogU291 cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwICAgIHwgIDIgKy0KIDYgZmls ZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXggZmMwZmRiZWYy MzEwLi42ZTkzYTYzYzNhNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcApAQCAtOTUyLDcgKzk1Miw3IEBAIFZlY3RvcjxSZWZQdHI8QVhDb3Jl T2JqZWN0Pj4gQVhPYmplY3RDYWNoZTo6b2JqZWN0c0ZvcklEcyhjb25zdCBWZWN0b3I8QVhJRD4m IGF4CiAKICAgICByZXR1cm4gYXhJRHMubWFwKFt0aGlzXSAoY29uc3QgYXV0byYgYXhJRCkgLT4g UmVmUHRyPEFYQ29yZU9iamVjdD4gewogICAgICAgICBBU1NFUlQoYXhJRC5pc1ZhbGlkKCkpOwot ICAgICAgICByZXR1cm4gb2JqZWN0RnJvbUFYSUQoYXhJRCk7CisgICAgICAgIHJldHVybiBvYmpl Y3RGb3JJRChheElEKTsKICAgICB9KTsKIH0KIApAQCAtMzc4NCw2ICszNzg0LDcgQEAgdm9pZCBB WE9iamVjdENhY2hlOjphZGRSZWxhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvcmlnaW4sIEFj Y2Vzc2liaWxpdHlPYmplY3QKICAgICAgICAgfQogICAgICAgICB0YXJnZXRzSXRlcmF0b3ItPnZh bHVlLmFwcGVuZCh0YXJnZXQtPm9iamVjdElEKCkpOwogICAgIH0KKyAgICBtX3JlbGF0aW9uVGFy Z2V0cy5hcHBlbmQodGFyZ2V0LT5vYmplY3RJRCgpKTsKIAogICAgIGlmIChhZGRpbmdTeW1tZXRy aWNSZWxhdGlvbiA9PSBBZGRpbmdTeW1tZXRyaWNSZWxhdGlvbjo6Tm8pIHsKICAgICAgICAgaWYg KGF1dG8gc3ltbWV0cmljID0gc3ltbWV0cmljUmVsYXRpb24ocmVsYXRpb25UeXBlKTsgc3ltbWV0 cmljICE9IEFYUmVsYXRpb25UeXBlOjpOb25lKQpAQCAtMzgwMCw2ICszODAxLDcgQEAgdm9pZCBB WE9iamVjdENhY2hlOjp1cGRhdGVSZWxhdGlvbnNJZk5lZWRlZCgpCiAgICAgcmVsYXRpb25zTmVl ZFVwZGF0ZShmYWxzZSk7CiAgICAgQVhMT0coIlVwZGF0aW5nIHJlbGF0aW9ucy4iKTsKICAgICBt X3JlbGF0aW9ucy5jbGVhcigpOworICAgIG1fcmVsYXRpb25UYXJnZXRzLmNsZWFyKCk7CiAKICAg ICBzdHJ1Y3QgUmVsYXRpb25PcmlnaW4gewogICAgICAgICBFbGVtZW50KiBvcmlnaW5FbGVtZW50 IHsgbnVsbHB0ciB9OwpAQCAtMzg2MCw2ICszODYyLDEyIEBAIEhhc2hNYXA8QVhJRCwgQVhSZWxh dGlvbnM+IEFYT2JqZWN0Q2FjaGU6OnJlbGF0aW9ucygpCiAgICAgcmV0dXJuIG1fcmVsYXRpb25z OwogfQogCitjb25zdCBWZWN0b3I8QVhJRD4mIEFYT2JqZWN0Q2FjaGU6OnJlbGF0aW9uVGFyZ2V0 SURzKCkKK3sKKyAgICB1cGRhdGVSZWxhdGlvbnNJZk5lZWRlZCgpOworICAgIHJldHVybiBtX3Jl bGF0aW9uVGFyZ2V0czsKK30KKwogc3RkOjpvcHRpb25hbDxWZWN0b3I8QVhJRD4+IEFYT2JqZWN0 Q2FjaGU6OnJlbGF0ZWRPYmplY3RJRHNGb3IoY29uc3QgQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFY UmVsYXRpb25UeXBlIHJlbGF0aW9uVHlwZSkKIHsKICAgICB1cGRhdGVSZWxhdGlvbnNJZk5lZWRl ZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaAppbmRl eCA4YTNjNDY3Y2MwOGEuLjFjYWYzNTM2ODgwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTIyMyw3ICsyMjMsNyBAQCBwdWJsaWM6CiAgICAg Ym9vbCBub2RlSXNUZXh0Q29udHJvbChjb25zdCBOb2RlKik7CiAKICAgICBBWElEIHBsYXRmb3Jt R2VuZXJhdGVBWElEKCkgY29uc3Q7Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0RnJv bUFYSUQoQVhJRCBpZCkgY29uc3QgeyByZXR1cm4gbV9vYmplY3RzLmdldChpZCk7IH0KKyAgICBB Y2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3RGb3JJRChjb25zdCBBWElEJiBpZCkgY29uc3QgeyBy ZXR1cm4gbV9vYmplY3RzLmdldChpZCk7IH0KICAgICBWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVj dD4+IG9iamVjdHNGb3JJRHMoY29uc3QgVmVjdG9yPEFYSUQ+JikgY29uc3Q7CiAKICAgICAvLyBU ZXh0IG1hcmtlciB1dGlsaXRpZXMuCkBAIC01MDIsNiArNTAyLDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHVwZGF0ZVJlbGF0aW9uc0lmTmVlZGVkKCk7CiAgICAgdm9pZCByZWxhdGlvbnNOZWVkVXBk YXRlKGJvb2wpOwogICAgIEhhc2hNYXA8QVhJRCwgQVhSZWxhdGlvbnM+IHJlbGF0aW9ucygpOwor ICAgIGNvbnN0IFZlY3RvcjxBWElEPiYgcmVsYXRpb25UYXJnZXRJRHMoKTsKIAogICAgIERvY3Vt ZW50JiBtX2RvY3VtZW50OwogICAgIGNvbnN0IHN0ZDo6b3B0aW9uYWw8UGFnZUlkZW50aWZpZXI+ IG1fcGFnZUlEOyAvLyBjb25zdGFudCBmb3Igb2JqZWN0J3MgbGlmZXRpbWUuCkBAIC01NjEsNiAr NTYyLDcgQEAgcHJpdmF0ZToKICAgICAvLyBSZWxhdGlvbnNoaXBzIGJldHdlZW4gb2JqZWN0cy4K ICAgICBIYXNoTWFwPEFYSUQsIEFYUmVsYXRpb25zPiBtX3JlbGF0aW9uczsKICAgICBib29sIG1f cmVsYXRpb25zTmVlZFVwZGF0ZSB7IHRydWUgfTsKKyAgICBWZWN0b3I8QVhJRD4gbV9yZWxhdGlv blRhcmdldHM7CiAKICNpZiBVU0UoQVRTUEkpCiAgICAgTGlzdEhhc2hTZXQ8UmVmUHRyPEFYQ29y ZU9iamVjdD4+IG1fZGVmZXJyZWRQYXJlbnRDaGFuZ2VkTGlzdDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5jcHAKaW5kZXggOWEwMGY0ZTVlZjUyLi42ZjRiNGZkNDQ3NjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRPYmplY3QuY3BwCkBAIC03Niw4ICs3Niw2IEBAIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6 aW5pdGlhbGl6ZVByb3BlcnRpZXMoQVhDb3JlT2JqZWN0JiBjb3JlT2JqZWN0LCBJc1Jvb3QgaXNS CiB7CiAgICAgQVNTRVJUKGlzPEFjY2Vzc2liaWxpdHlPYmplY3Q+KGNvcmVPYmplY3QpKTsKICAg ICBhdXRvJiBvYmplY3QgPSBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pihjb3JlT2JqZWN0 KTsKLSAgICAvLyBXZSBzaG91bGQgbmV2ZXIgY3JlYXRlIGFuIGlzb2xhdGVkIG9iamVjdCBmcm9t IGFuIGlnbm9yZWQgb2JqZWN0LgotICAgIEFTU0VSVCghb2JqZWN0LmFjY2Vzc2liaWxpdHlJc0ln bm9yZWQoKSk7CiAKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6QVJJQUxhbmRtYXJr Um9sZURlc2NyaXB0aW9uLCBvYmplY3QuYXJpYUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uKCkuaXNv bGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpBY2Nlc3NpYmls aXR5RGVzY3JpcHRpb24sIG9iamVjdC5hY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKS5pc29sYXRl ZENvcHkoKSk7CkBAIC00MTMsNyArNDExLDcgQEAgQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2Jq ZWN0Ojphc3NvY2lhdGVkQVhPYmplY3QoKSBjb25zdAogICAgICAgICByZXR1cm4gbnVsbHB0cjsK IAogICAgIGF1dG8qIGF4T2JqZWN0Q2FjaGUgPSB0aGlzLT5heE9iamVjdENhY2hlKCk7Ci0gICAg cmV0dXJuIGF4T2JqZWN0Q2FjaGUgPyBheE9iamVjdENhY2hlLT5vYmplY3RGcm9tQVhJRChtX2lk KSA6IG51bGxwdHI7CisgICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUgPyBheE9iamVjdENhY2hlLT5v YmplY3RGb3JJRChtX2lkKSA6IG51bGxwdHI7CiB9CiAKIHZvaWQgQVhJc29sYXRlZE9iamVjdDo6 c2V0TWF0aHNjcmlwdHMoQVhQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBBWENvcmVPYmplY3Qm IG9iamVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCAyMTVmNzk2M2Q4NzIuLjAyMDEz NmUxYzIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIFJl ZlB0cjxBWElzb2xhdGVkVHJlZT4gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JQYWdlSUQoUGFnZUlk ZW50aWZpZXIgcGFnZUlEKQogICAgIHJldHVybiBudWxscHRyOwogfQogCi1SZWZQdHI8QVhJc29s YXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVGb3JJRChBWElEIGF4SUQpIGNvbnN0CitS ZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVGb3JJRChjb25zdCBB WElEJiBheElEKSBjb25zdAogewogICAgIC8vIEluIGlzb2xhdGVkIHRyZWUgbW9kZSAyLCBvbmx5 IGFjY2VzcyBtX3JlYWRlclRocmVhZE5vZGVNYXAgb24gdGhlIEFYIHRocmVhZC4KICAgICBBU1NF UlQobV91c2VkT25BWFRocmVhZCA/ICFpc01haW5UaHJlYWQoKSA6IGlzTWFpblRocmVhZCgpKTsK QEAgLTE1NSw5ICsxNTUsMTEgQEAgUmVmUHRyPEFYSXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0ZWRU cmVlOjpub2RlRm9ySUQoQVhJRCBheElEKSBjb25zdAogICAgIHJldHVybiBheElELmlzVmFsaWQo KSA/IG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5nZXQoYXhJRCkgOiBudWxscHRyOwogfQogCi1WZWN0 b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+IEFYSXNvbGF0ZWRUcmVlOjpvYmplY3RzRm9ySURzKGNv bnN0IFZlY3RvcjxBWElEPiYgYXhJRHMpIGNvbnN0CitWZWN0b3I8UmVmUHRyPEFYQ29yZU9iamVj dD4+IEFYSXNvbGF0ZWRUcmVlOjpvYmplY3RzRm9ySURzKGNvbnN0IFZlY3RvcjxBWElEPiYgYXhJ RHMpCiB7CiAgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6Om9iamVjdHNGb3JJRHMiX3MpOwor ICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOworCiAgICAgVmVjdG9yPFJlZlB0cjxBWENvcmVP YmplY3Q+PiByZXN1bHQ7CiAgICAgcmVzdWx0LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoYXhJRHMu c2l6ZSgpKTsKICAgICBmb3IgKGF1dG8mIGF4SUQgOiBheElEcykgewpAQCAtMTY1LDcgKzE2Nyw2 IEBAIFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gQVhJc29sYXRlZFRyZWU6Om9iamVjdHNG b3JJRHMoY29uc3QgVmVjdG9yPEFYSUQ+JiBhCiAgICAgICAgICAgICByZXN1bHQudW5jaGVja2Vk QXBwZW5kKG9iamVjdCk7CiAgICAgfQogICAgIHJlc3VsdC5zaHJpbmtUb0ZpdCgpOwotCiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KIApAQCAtMTc4LDE1ICsxNzksMTYgQEAgdm9pZCBBWElzb2xhdGVk VHJlZTo6Z2VuZXJhdGVTdWJ0cmVlKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGNvbGxlY3ROb2RlQ2hhbmdlc0ZvclN1YnRyZWUoYXhPYmplY3QpOworICAg IGNvbGxlY3RJZ25vcmVkUmVsYXRlZE5vZGVzKCk7CiAgICAgcXVldWVSZW1vdmFsc0FuZFVucmVz b2x2ZWRDaGFuZ2VzKHsgfSk7CiB9CiAKLXN0ZDo6b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6Ok5v ZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KEFYQ29yZU9iamVj dCYgYXhPYmplY3QsIEF0dGFjaFdyYXBwZXIgYXR0YWNoV3JhcHBlcikKK3N0ZDo6b3B0aW9uYWw8 QVhJc29sYXRlZFRyZWU6Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9y T2JqZWN0KEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIEF0dGFjaFdyYXBwZXIgYXR0YWNoV3JhcHBl ciwgQWxsb3dJZ25vcmVkT2JqZWN0IGFsbG93SWdub3JlZCkKIHsKICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOwogCi0gICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGNyZWF0ZSBhbiBpc29sYXRlZCBv YmplY3QgZnJvbSBhbiBpZ25vcmVkIG9iamVjdC4KLSAgICBpZiAoYXhPYmplY3QuYWNjZXNzaWJp bGl0eUlzSWdub3JlZCgpKQorICAgIC8vIENyZWF0ZSBhbiBpc29sYXRlZCBvYmplY3QgZnJvbSBh biBpZ25vcmVkIG9iamVjdCBvbmx5IGlmIGl0IGlzIGV4cGxpY2l0bHkgc3RhdGVkLgorICAgIGlm IChhbGxvd0lnbm9yZWQgPT0gQWxsb3dJZ25vcmVkT2JqZWN0OjpObyAmJiBheE9iamVjdC5hY2Nl c3NpYmlsaXR5SXNJZ25vcmVkKCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKICAg ICBpZiAoIWF4T2JqZWN0Lm9iamVjdElEKCkuaXNWYWxpZCgpKSB7CkBAIC0yNjEsMTMgKzI2Mywy MiBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpxdWV1ZVJlbW92YWxzQW5kVW5yZXNvbHZlZENoYW5n ZXMoY29uc3QgVmVjdG9yPEFYSUQ+JiBzdWJ0cgogICAgIFZlY3RvcjxOb2RlQ2hhbmdlPiByZXNv bHZlZEFwcGVuZHM7CiAgICAgaWYgKCFtX3VucmVzb2x2ZWRQZW5kaW5nQXBwZW5kcy5pc0VtcHR5 KCkpIHsKICAgICAgICAgaWYgKGF1dG8qIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKSB7Ci0gICAg ICAgICAgICByZXNvbHZlZEFwcGVuZHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShtX3VucmVzb2x2 ZWRQZW5kaW5nQXBwZW5kcy5zaXplKCkpOworICAgICAgICAgICAgcmVzb2x2ZWRBcHBlbmRzLnJl c2VydmVJbml0aWFsQ2FwYWNpdHkobV91bnJlc29sdmVkUGVuZGluZ0FwcGVuZHMuc2l6ZSgpICsg bV9pZ25vcmVkUGVuZGluZ0FwcGVuZHMuc2l6ZSgpKTsKICAgICAgICAgICAgIGZvciAoY29uc3Qg YXV0byYgdW5yZXNvbHZlZEFwcGVuZCA6IG1fdW5yZXNvbHZlZFBlbmRpbmdBcHBlbmRzKSB7Ci0g ICAgICAgICAgICAgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gY2FjaGUtPm9iamVjdEZyb21BWElE KHVucmVzb2x2ZWRBcHBlbmQua2V5KSkKKyAgICAgICAgICAgICAgICBpZiAoYXV0byogYXhPYmpl Y3QgPSBjYWNoZS0+b2JqZWN0Rm9ySUQodW5yZXNvbHZlZEFwcGVuZC5rZXkpKSB7CiAgICAgICAg ICAgICAgICAgICAgIGlmIChhdXRvIG5vZGVDaGFuZ2UgPSBub2RlQ2hhbmdlRm9yT2JqZWN0KCph eE9iamVjdCwgdW5yZXNvbHZlZEFwcGVuZC52YWx1ZSkpCiAgICAgICAgICAgICAgICAgICAgICAg ICByZXNvbHZlZEFwcGVuZHMudW5jaGVja2VkQXBwZW5kKFdURk1vdmUoKm5vZGVDaGFuZ2UpKTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBtX3VucmVzb2x2 ZWRQZW5kaW5nQXBwZW5kcy5jbGVhcigpOworCisgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8m IGlnbm9yZWRBcHBlbmQgOiBtX2lnbm9yZWRQZW5kaW5nQXBwZW5kcykgeworICAgICAgICAgICAg ICAgIGlmIChhdXRvKiBheE9iamVjdCA9IGNhY2hlLT5vYmplY3RGb3JJRChpZ25vcmVkQXBwZW5k LmtleSkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGF1dG8gbm9kZUNoYW5nZSA9IG5vZGVD aGFuZ2VGb3JPYmplY3QoKmF4T2JqZWN0LCBpZ25vcmVkQXBwZW5kLnZhbHVlLCBBbGxvd0lnbm9y ZWRPYmplY3Q6OlllcykpCisgICAgICAgICAgICAgICAgICAgICAgICByZXNvbHZlZEFwcGVuZHMu dW5jaGVja2VkQXBwZW5kKFdURk1vdmUoKm5vZGVDaGFuZ2UpKTsKKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBtX2lnbm9yZWRQZW5kaW5nQXBwZW5kcy5jbGVh cigpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0yOTUsNiArMzA2LDIyIEBAIHZvaWQgQVhJc29s YXRlZFRyZWU6OmNvbGxlY3ROb2RlQ2hhbmdlc0ZvclN1YnRyZWUoQVhDb3JlT2JqZWN0JiBheE9i amVjdCkKICAgICBtX25vZGVNYXAuc2V0KGF4T2JqZWN0Lm9iamVjdElEKCksIFBhcmVudENoaWxk cmVuSURzIHsgYXhQYXJlbnQgPyBheFBhcmVudC0+b2JqZWN0SUQoKSA6IEFYSUQoKSwgV1RGTW92 ZShheENoaWxkcmVuSURzKSB9KTsKIH0KIAordm9pZCBBWElzb2xhdGVkVHJlZTo6Y29sbGVjdEln bm9yZWRSZWxhdGVkTm9kZXMoKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisKKyAg ICBhdXRvKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKTsKKyAgICBpZiAoIWNhY2hlKQorICAgICAg ICByZXR1cm47CisKKyAgICBhdXRvIHRhcmdldElEcyA9IGNhY2hlLT5yZWxhdGlvblRhcmdldElE cygpOworICAgIGZvciAoY29uc3QgYXV0byYgdGFyZ2V0SUQgOiB0YXJnZXRJRHMpIHsKKyAgICAg ICAgYXV0byogdGFyZ2V0ID0gY2FjaGUtPm9iamVjdEZvcklEKHRhcmdldElEKTsKKyAgICAgICAg aWYgKHRhcmdldCAmJiB0YXJnZXQtPmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSkKKyAgICAgICAg ICAgIG1faWdub3JlZFBlbmRpbmdBcHBlbmRzLnNldCh0YXJnZXRJRCwgQXR0YWNoV3JhcHBlcjo6 T25NYWluVGhyZWFkKTsKKyAgICB9Cit9CisKIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZU5v ZGUoQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKIHsKICAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJl ZTo6dXBkYXRlTm9kZSJfcyk7CkBAIC01MDksNiArNTM2LDggQEAgdm9pZCBBWElzb2xhdGVkVHJl ZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgLy8gICAz LiBUaHVzLCB3ZSBkb24ndCB3YW50IHRvIGRlbGV0ZSBPYmplY3QgMTIzIGZyb20gdGhlIG5vZGVt YXAsIGluc3RlYWQgYWxsb3dpbmcgaXQgdG8gYmUgbW92ZWQuCiAgICAgICAgIHJlbW92ZVN1YnRy ZWVGcm9tTm9kZU1hcChheElELCBheEFuY2VzdG9yKTsKICAgICB9CisKKyAgICBjb2xsZWN0SWdu b3JlZFJlbGF0ZWROb2RlcygpOwogICAgIHF1ZXVlUmVtb3ZhbHNBbmRVbnJlc29sdmVkQ2hhbmdl cyhvbGRDaGlsZHJlbklEcyk7CiAKICAgICAvLyBBbHNvIHF1ZXVlIHVwZGF0ZXMgZm9yIHByb3Bl cnRpZXMgdGhhdCBkZXJpdmUgZnJvbSBjaGlsZHJlbigpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5k ZXggYWM0MDE5NmY5OTg5Li4xMDJhNzgyMzU0ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAt MzMyLDggKzMzMiw4IEBAIHB1YmxpYzoKIAogICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBy b290Tm9kZSgpOwogICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBmb2N1c2VkTm9kZSgpOwot ICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoQVhJRCkgY29uc3Q7Ci0gICAg VmVjdG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiBvYmplY3RzRm9ySURzKGNvbnN0IFZlY3RvcjxB WElEPiYpIGNvbnN0OworICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoY29u c3QgQVhJRCYpIGNvbnN0OworICAgIFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gb2JqZWN0 c0ZvcklEcyhjb25zdCBWZWN0b3I8QVhJRD4mKTsKIAogICAgIHN0cnVjdCBOb2RlQ2hhbmdlIHsK ICAgICAgICAgUmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGlzb2xhdGVkT2JqZWN0OwpAQCAtMzg1LDgg KzM4NSwxMCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBIYXNoTWFwPFBhZ2VJZGVudGlmaWVyLCBS ZWY8QVhJc29sYXRlZFRyZWU+PiYgdHJlZVBhZ2VDYWNoZSgpIFdURl9SRVFVSVJFU19MT0NLKHNf Y2FjaGVMb2NrKTsKIAogICAgIGVudW0gY2xhc3MgQXR0YWNoV3JhcHBlciA6IGJvb2wgeyBPbk1h aW5UaHJlYWQsIE9uQVhUaHJlYWQgfTsKLSAgICBzdGQ6Om9wdGlvbmFsPE5vZGVDaGFuZ2U+IG5v ZGVDaGFuZ2VGb3JPYmplY3QoQVhDb3JlT2JqZWN0JiwgQXR0YWNoV3JhcHBlciA9IEF0dGFjaFdy YXBwZXI6Ok9uTWFpblRocmVhZCk7CisgICAgZW51bSBjbGFzcyBBbGxvd0lnbm9yZWRPYmplY3Qg OiBib29sIHsgTm8sIFllcyB9OworICAgIHN0ZDo6b3B0aW9uYWw8Tm9kZUNoYW5nZT4gbm9kZUNo YW5nZUZvck9iamVjdChBWENvcmVPYmplY3QmLCBBdHRhY2hXcmFwcGVyID0gQXR0YWNoV3JhcHBl cjo6T25NYWluVGhyZWFkLCBBbGxvd0lnbm9yZWRPYmplY3QgPSBBbGxvd0lnbm9yZWRPYmplY3Q6 Ok5vKTsKICAgICB2b2lkIGNvbGxlY3ROb2RlQ2hhbmdlc0ZvclN1YnRyZWUoQVhDb3JlT2JqZWN0 Jik7CisgICAgdm9pZCBjb2xsZWN0SWdub3JlZFJlbGF0ZWROb2RlcygpOwogICAgIHZvaWQgcXVl dWVDaGFuZ2UoY29uc3QgTm9kZUNoYW5nZSYpIFdURl9SRVFVSVJFU19MT0NLKG1fY2hhbmdlTG9n TG9jayk7CiAgICAgdm9pZCBxdWV1ZVJlbW92YWxzKGNvbnN0IFZlY3RvcjxBWElEPiYpOwogICAg IHZvaWQgcXVldWVSZW1vdmFsc0xvY2tlZChjb25zdCBWZWN0b3I8QVhJRD4mKSBXVEZfUkVRVUlS RVNfTE9DSyhtX2NoYW5nZUxvZ0xvY2spOwpAQCAtNDEzLDYgKzQxNSw3IEBAIHByaXZhdGU6CiAg ICAgSGFzaE1hcDxBWElELCBBdHRhY2hXcmFwcGVyPiBtX3VucmVzb2x2ZWRQZW5kaW5nQXBwZW5k czsKICAgICAvLyBPbmx5IGFjY2Vzc2VkIG9uIHRoZSBtYWluIHRocmVhZC4KICAgICBib29sIG1f aXNDb2xsZWN0aW5nTm9kZUNoYW5nZXMgeyBmYWxzZSB9OworICAgIEhhc2hNYXA8QVhJRCwgQXR0 YWNoV3JhcHBlcj4gbV9pZ25vcmVkUGVuZGluZ0FwcGVuZHM7CiAKICAgICAvLyBPbmx5IGFjY2Vz c2VkIG9uIEFYIHRocmVhZCByZXF1ZXN0aW5nIGRhdGEuCiAgICAgSGFzaE1hcDxBWElELCBSZWY8 QVhJc29sYXRlZE9iamVjdD4+IG1fcmVhZGVyVGhyZWFkTm9kZU1hcDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXRMZWdhY3kvd2luL0FjY2Vzc2libGVCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXRM ZWdhY3kvd2luL0FjY2Vzc2libGVCYXNlLmNwcAppbmRleCBjMjkwZGFlMzc5NDMuLjZiNWY5MWNi YTA1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0FjY2Vzc2libGVCYXNlLmNwcApAQCAt MTAzOSw3ICsxMDM5LDcgQEAgSFJFU1VMVCBBY2Nlc3NpYmxlQmFzZTo6Z2V0QWNjZXNzaWJpbGl0 eU9iamVjdEZvckNoaWxkKFZBUklBTlQgdkNoaWxkLCBBY2Nlc3NpYmkKICAgICAgICAgaWYgKCFk b2N1bWVudCkKICAgICAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAKLSAgICAgICAgY2hpbGRPYmog PSBkb2N1bWVudC0+YXhPYmplY3RDYWNoZSgpLT5vYmplY3RGcm9tQVhJRChtYWtlT2JqZWN0SWRl bnRpZmllcjxBWElEVHlwZT4oLXZDaGlsZC5sVmFsKSk7CisgICAgICAgIGNoaWxkT2JqID0gZG9j dW1lbnQtPmF4T2JqZWN0Q2FjaGUoKS0+b2JqZWN0Rm9ySUQobWFrZU9iamVjdElkZW50aWZpZXI8 QVhJRFR5cGU+KC12Q2hpbGQubFZhbCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHNpemVfdCBj aGlsZEluZGV4ID0gc3RhdGljX2Nhc3Q8c2l6ZV90Pih2Q2hpbGQubFZhbCAtIDEpOwogCi0tIAoy LjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo= 460159 2022-06-10 07:07:19 -0700 2022-06-10 10:12:41 -0700 Patch bug-241398-20220610100717.patch text/plain 10222 andresg_22 RnJvbSBjZGU3ZWY4MTM1NGVjN2RkNGVlYWRhMjc1NjI5YzliZDk1YjJkMTdhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDcgSnVuIDIwMjIgMjE6MDU6NTIgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WCBJVE06IEZpeCBmb3IgYWNjZXNzaWJpbGl0eS9NYWMvYXJpYS1lcnJvcm1lc3NhZ2UuaHRtbCBp bgogaXNvbGF0ZWQgdHJlZSBtb2RlLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjQxMzk4CgpUZXN0OiBhY2Nlc3NpYmlsaXR5L01hYy9hcmlhLWVycm9ybWVzc2FnZS5o dG1sCgpSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaCBhbmQgVHlsZXIgV2lsY29jay4KClRoaXMg dGVzdCB3YXMgZmFpbGluZyBiZWNhdXNlIHRoZSBlbGVtZW50cyB0aGF0IGFyZSByZWZlcmVuY2Vk IGFzIGVycm9yIG1lc3NhZ2VzIGFyZSA8c3Bhbj4gZWxlbWVudHMsIHdoaWNoIGFyZSBpZ25vcmVk IG9uIHRoZSBtYWMgcGxhdGZvcm0uIFRoZXJlZm9yZSB0aGVyZSB3YXMgbm8gaXNvbGF0ZWQgb2Jq ZWN0IGNyZWF0ZWQgZm9yIHRob3NlIGVsZW1lbnRzIGFuZCBBWElzb2xhdGVkVHJlZTo6b2JqZWN0 c0ZvcklEcyB3aWxsIG5vdCByZXR1cm4gdGhlbS4gVGhpcyBwYXRjaCBzb2x2ZXMgdGhpcyBwcm9i bGVtIGJ5IGNyZWF0aW5nIG9ycGhhbiBpc29sYXRlZCBvYmplY3RzIGluIEFYSXNvbGF0ZWRUcmVl Om9iamVjdHNGb3JJRHMgaWYgdGhlcmUgaXMgbm8gaXNvbGF0ZWQgb2JqZWN0IGZvciB0aGUgcmVx dWVzdGVkIEFYSUQsIGFuZCB0aGUgY29ycmVzcG9uZGluZyBsaXZlIG9iamVjdHMgZXhpc3RzLgot LS0KIC4uLi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8IDEwICsr KysrLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggIHwgIDQg KystCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwICAgICAgICAgfCAgNCAr LS0KIC4uLi9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwICAgICAgICAgICB8IDM2ICsr KysrKysrKysrKysrKystLS0KIC4uLi9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCAgICAg ICAgICAgICB8ICA0ICstLQogU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2Uu Y3BwICAgIHwgIDIgKy0KIDYgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHAKaW5kZXggZmMwZmRiZWYyMzEwLi42ZTkzYTYzYzNhNzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtOTUyLDcgKzk1Miw3IEBA IFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gQVhPYmplY3RDYWNoZTo6b2JqZWN0c0ZvcklE cyhjb25zdCBWZWN0b3I8QVhJRD4mIGF4CiAKICAgICByZXR1cm4gYXhJRHMubWFwKFt0aGlzXSAo Y29uc3QgYXV0byYgYXhJRCkgLT4gUmVmUHRyPEFYQ29yZU9iamVjdD4gewogICAgICAgICBBU1NF UlQoYXhJRC5pc1ZhbGlkKCkpOwotICAgICAgICByZXR1cm4gb2JqZWN0RnJvbUFYSUQoYXhJRCk7 CisgICAgICAgIHJldHVybiBvYmplY3RGb3JJRChheElEKTsKICAgICB9KTsKIH0KIApAQCAtMzc4 NCw2ICszNzg0LDcgQEAgdm9pZCBBWE9iamVjdENhY2hlOjphZGRSZWxhdGlvbihBY2Nlc3NpYmls aXR5T2JqZWN0KiBvcmlnaW4sIEFjY2Vzc2liaWxpdHlPYmplY3QKICAgICAgICAgfQogICAgICAg ICB0YXJnZXRzSXRlcmF0b3ItPnZhbHVlLmFwcGVuZCh0YXJnZXQtPm9iamVjdElEKCkpOwogICAg IH0KKyAgICBtX3JlbGF0aW9uVGFyZ2V0cy5hcHBlbmQodGFyZ2V0LT5vYmplY3RJRCgpKTsKIAog ICAgIGlmIChhZGRpbmdTeW1tZXRyaWNSZWxhdGlvbiA9PSBBZGRpbmdTeW1tZXRyaWNSZWxhdGlv bjo6Tm8pIHsKICAgICAgICAgaWYgKGF1dG8gc3ltbWV0cmljID0gc3ltbWV0cmljUmVsYXRpb24o cmVsYXRpb25UeXBlKTsgc3ltbWV0cmljICE9IEFYUmVsYXRpb25UeXBlOjpOb25lKQpAQCAtMzgw MCw2ICszODAxLDcgQEAgdm9pZCBBWE9iamVjdENhY2hlOjp1cGRhdGVSZWxhdGlvbnNJZk5lZWRl ZCgpCiAgICAgcmVsYXRpb25zTmVlZFVwZGF0ZShmYWxzZSk7CiAgICAgQVhMT0coIlVwZGF0aW5n IHJlbGF0aW9ucy4iKTsKICAgICBtX3JlbGF0aW9ucy5jbGVhcigpOworICAgIG1fcmVsYXRpb25U YXJnZXRzLmNsZWFyKCk7CiAKICAgICBzdHJ1Y3QgUmVsYXRpb25PcmlnaW4gewogICAgICAgICBF bGVtZW50KiBvcmlnaW5FbGVtZW50IHsgbnVsbHB0ciB9OwpAQCAtMzg2MCw2ICszODYyLDEyIEBA IEhhc2hNYXA8QVhJRCwgQVhSZWxhdGlvbnM+IEFYT2JqZWN0Q2FjaGU6OnJlbGF0aW9ucygpCiAg ICAgcmV0dXJuIG1fcmVsYXRpb25zOwogfQogCitjb25zdCBWZWN0b3I8QVhJRD4mIEFYT2JqZWN0 Q2FjaGU6OnJlbGF0aW9uVGFyZ2V0SURzKCkKK3sKKyAgICB1cGRhdGVSZWxhdGlvbnNJZk5lZWRl ZCgpOworICAgIHJldHVybiBtX3JlbGF0aW9uVGFyZ2V0czsKK30KKwogc3RkOjpvcHRpb25hbDxW ZWN0b3I8QVhJRD4+IEFYT2JqZWN0Q2FjaGU6OnJlbGF0ZWRPYmplY3RJRHNGb3IoY29uc3QgQVhD b3JlT2JqZWN0JiBvYmplY3QsIEFYUmVsYXRpb25UeXBlIHJlbGF0aW9uVHlwZSkKIHsKICAgICB1 cGRhdGVSZWxhdGlvbnNJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuaAppbmRleCA4YTNjNDY3Y2MwOGEuLjFjYWYzNTM2ODgwMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTIyMyw3ICsy MjMsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBub2RlSXNUZXh0Q29udHJvbChjb25zdCBOb2RlKik7 CiAKICAgICBBWElEIHBsYXRmb3JtR2VuZXJhdGVBWElEKCkgY29uc3Q7Ci0gICAgQWNjZXNzaWJp bGl0eU9iamVjdCogb2JqZWN0RnJvbUFYSUQoQVhJRCBpZCkgY29uc3QgeyByZXR1cm4gbV9vYmpl Y3RzLmdldChpZCk7IH0KKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmplY3RGb3JJRChjb25z dCBBWElEJiBpZCkgY29uc3QgeyByZXR1cm4gbV9vYmplY3RzLmdldChpZCk7IH0KICAgICBWZWN0 b3I8UmVmUHRyPEFYQ29yZU9iamVjdD4+IG9iamVjdHNGb3JJRHMoY29uc3QgVmVjdG9yPEFYSUQ+ JikgY29uc3Q7CiAKICAgICAvLyBUZXh0IG1hcmtlciB1dGlsaXRpZXMuCkBAIC01MDIsNiArNTAy LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZVJlbGF0aW9uc0lmTmVlZGVkKCk7CiAgICAg dm9pZCByZWxhdGlvbnNOZWVkVXBkYXRlKGJvb2wpOwogICAgIEhhc2hNYXA8QVhJRCwgQVhSZWxh dGlvbnM+IHJlbGF0aW9ucygpOworICAgIGNvbnN0IFZlY3RvcjxBWElEPiYgcmVsYXRpb25UYXJn ZXRJRHMoKTsKIAogICAgIERvY3VtZW50JiBtX2RvY3VtZW50OwogICAgIGNvbnN0IHN0ZDo6b3B0 aW9uYWw8UGFnZUlkZW50aWZpZXI+IG1fcGFnZUlEOyAvLyBjb25zdGFudCBmb3Igb2JqZWN0J3Mg bGlmZXRpbWUuCkBAIC01NjEsNiArNTYyLDcgQEAgcHJpdmF0ZToKICAgICAvLyBSZWxhdGlvbnNo aXBzIGJldHdlZW4gb2JqZWN0cy4KICAgICBIYXNoTWFwPEFYSUQsIEFYUmVsYXRpb25zPiBtX3Jl bGF0aW9uczsKICAgICBib29sIG1fcmVsYXRpb25zTmVlZFVwZGF0ZSB7IHRydWUgfTsKKyAgICBW ZWN0b3I8QVhJRD4gbV9yZWxhdGlvblRhcmdldHM7CiAKICNpZiBVU0UoQVRTUEkpCiAgICAgTGlz dEhhc2hTZXQ8UmVmUHRyPEFYQ29yZU9iamVjdD4+IG1fZGVmZXJyZWRQYXJlbnRDaGFuZ2VkTGlz dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggOWEwMGY0ZTVlZjUyLi42ZjRiNGZk NDQ3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC03Niw4ICs3Niw2IEBAIHZv aWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZVByb3BlcnRpZXMoQVhDb3JlT2JqZWN0JiBj b3JlT2JqZWN0LCBJc1Jvb3QgaXNSCiB7CiAgICAgQVNTRVJUKGlzPEFjY2Vzc2liaWxpdHlPYmpl Y3Q+KGNvcmVPYmplY3QpKTsKICAgICBhdXRvJiBvYmplY3QgPSBkb3duY2FzdDxBY2Nlc3NpYmls aXR5T2JqZWN0Pihjb3JlT2JqZWN0KTsKLSAgICAvLyBXZSBzaG91bGQgbmV2ZXIgY3JlYXRlIGFu IGlzb2xhdGVkIG9iamVjdCBmcm9tIGFuIGlnbm9yZWQgb2JqZWN0LgotICAgIEFTU0VSVCghb2Jq ZWN0LmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSk7CiAKICAgICBzZXRQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6QVJJQUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uLCBvYmplY3QuYXJpYUxhbmRtYXJr Um9sZURlc2NyaXB0aW9uKCkuaXNvbGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJv cGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24sIG9iamVjdC5hY2Nlc3NpYmlsaXR5 RGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CkBAIC00MTMsNyArNDExLDcgQEAgQVhDb3Jl T2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojphc3NvY2lhdGVkQVhPYmplY3QoKSBjb25zdAogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGF1dG8qIGF4T2JqZWN0Q2FjaGUgPSB0aGlzLT5h eE9iamVjdENhY2hlKCk7Ci0gICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUgPyBheE9iamVjdENhY2hl LT5vYmplY3RGcm9tQVhJRChtX2lkKSA6IG51bGxwdHI7CisgICAgcmV0dXJuIGF4T2JqZWN0Q2Fj aGUgPyBheE9iamVjdENhY2hlLT5vYmplY3RGb3JJRChtX2lkKSA6IG51bGxwdHI7CiB9CiAKIHZv aWQgQVhJc29sYXRlZE9iamVjdDo6c2V0TWF0aHNjcmlwdHMoQVhQcm9wZXJ0eU5hbWUgcHJvcGVy dHlOYW1lLCBBWENvcmVPYmplY3QmIG9iamVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRl eCAyMTVmNzk2M2Q4NzIuLmNjYzI3ZTc3Y2U0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApA QCAtMTQ1LDcgKzE0NSw3IEBAIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gQVhJc29sYXRlZFRyZWU6 OnRyZWVGb3JQYWdlSUQoUGFnZUlkZW50aWZpZXIgcGFnZUlEKQogICAgIHJldHVybiBudWxscHRy OwogfQogCi1SZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVGb3JJ RChBWElEIGF4SUQpIGNvbnN0CitSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRy ZWU6Om5vZGVGb3JJRChjb25zdCBBWElEJiBheElEKSBjb25zdAogewogICAgIC8vIEluIGlzb2xh dGVkIHRyZWUgbW9kZSAyLCBvbmx5IGFjY2VzcyBtX3JlYWRlclRocmVhZE5vZGVNYXAgb24gdGhl IEFYIHRocmVhZC4KICAgICBBU1NFUlQobV91c2VkT25BWFRocmVhZCA/ICFpc01haW5UaHJlYWQo KSA6IGlzTWFpblRocmVhZCgpKTsKQEAgLTE1NSwxNyArMTU1LDQyIEBAIFJlZlB0cjxBWElzb2xh dGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6bm9kZUZvcklEKEFYSUQgYXhJRCkgY29uc3QKICAg ICByZXR1cm4gYXhJRC5pc1ZhbGlkKCkgPyBtX3JlYWRlclRocmVhZE5vZGVNYXAuZ2V0KGF4SUQp IDogbnVsbHB0cjsKIH0KIAotVmVjdG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiBBWElzb2xhdGVk VHJlZTo6b2JqZWN0c0ZvcklEcyhjb25zdCBWZWN0b3I8QVhJRD4mIGF4SURzKSBjb25zdAorVmVj dG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiBBWElzb2xhdGVkVHJlZTo6b2JqZWN0c0ZvcklEcyhj b25zdCBWZWN0b3I8QVhJRD4mIGF4SURzKQogewogICAgIEFYVFJBQ0UoIkFYSXNvbGF0ZWRUcmVl OjpvYmplY3RzRm9ySURzIl9zKTsKKyAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKwogICAg IFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gcmVzdWx0OwogICAgIHJlc3VsdC5yZXNlcnZl SW5pdGlhbENhcGFjaXR5KGF4SURzLnNpemUoKSk7CiAgICAgZm9yIChhdXRvJiBheElEIDogYXhJ RHMpIHsKLSAgICAgICAgaWYgKGF1dG8gb2JqZWN0ID0gbm9kZUZvcklEKGF4SUQpKQorICAgICAg ICBhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChheElEKTsKKyAgICAgICAgaWYgKG9iamVjdCkgewog ICAgICAgICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChvYmplY3QpOworICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIH0KKworICAgICAgICAvLyBUaGVyZSBpcyBubyBpc29sYXRlZCBv YmplY3QgZm9yIHRoaXMgQVhJRC4gVGhpcyBjYW4gaGFwcGVuIGlmIHRoZSBjb3JyZXNwb25kaW5n IGxpdmUgb2JqZWN0IGlzIGlnbm9yZWQuCisgICAgICAgIC8vIElmIHRoZXJlIGlzIGEgbGl2ZSBv YmplY3QgZm9yIHRoaXMgSUQgYW5kIGl0IGlzIGFuIGlnbm9yZWQgdGFyZ2V0IG9mIGEgcmVsYXRp b25zaGlwLCBjcmVhdGUgYW4gaXNvbGF0ZWQgb2JqZWN0IGZvciBpdC4KKyAgICAgICAgb2JqZWN0 ID0gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPFJlZlB0cjxBWElz b2xhdGVkT2JqZWN0Pj4oWyZheElELCB0aGlzXSAoKSAtPiBSZWZQdHI8QVhJc29sYXRlZE9iamVj dD4geworICAgICAgICAgICAgYXV0byogY2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgICAg ICAgICBpZiAoIWNhY2hlIHx8ICFjYWNoZS0+cmVsYXRpb25UYXJnZXRJRHMoKS5jb250YWlucyhh eElEKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICAgICAgYXV0 byogYXhPYmplY3QgPSBjYWNoZS0+b2JqZWN0Rm9ySUQoYXhJRCk7CisgICAgICAgICAgICBpZiAo IWF4T2JqZWN0IHx8ICFheE9iamVjdC0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpKQorICAgICAg ICAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgICAgICBhdXRvIG9iamVjdCA9IEFY SXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZSgqYXhPYmplY3QsIGNvbnN0X2Nhc3Q8QVhJc29sYXRlZFRy ZWUqPih0aGlzKSk7CisgICAgICAgICAgICBBU1NFUlQoYXhPYmplY3QtPndyYXBwZXIoKSk7Cisg ICAgICAgICAgICBvYmplY3QtPmF0dGFjaFBsYXRmb3JtV3JhcHBlcihheE9iamVjdC0+d3JhcHBl cigpKTsKKyAgICAgICAgICAgIHJldHVybiBvYmplY3Q7CisgICAgICAgIH0pOworICAgICAgICBp ZiAob2JqZWN0KSB7CisgICAgICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVNYXAuYWRkKGF4SUQs ICpvYmplY3QpOworICAgICAgICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChvYmplY3QpOwor ICAgICAgICB9CiAgICAgfQogICAgIHJlc3VsdC5zaHJpbmtUb0ZpdCgpOwotCiAgICAgcmV0dXJu IHJlc3VsdDsKIH0KIApAQCAtMjYzLDkgKzI4OCwxMCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpx dWV1ZVJlbW92YWxzQW5kVW5yZXNvbHZlZENoYW5nZXMoY29uc3QgVmVjdG9yPEFYSUQ+JiBzdWJ0 cgogICAgICAgICBpZiAoYXV0byogY2FjaGUgPSBheE9iamVjdENhY2hlKCkpIHsKICAgICAgICAg ICAgIHJlc29sdmVkQXBwZW5kcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fdW5yZXNvbHZlZFBl bmRpbmdBcHBlbmRzLnNpemUoKSk7CiAgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHVucmVz b2x2ZWRBcHBlbmQgOiBtX3VucmVzb2x2ZWRQZW5kaW5nQXBwZW5kcykgewotICAgICAgICAgICAg ICAgIGlmIChhdXRvKiBheE9iamVjdCA9IGNhY2hlLT5vYmplY3RGcm9tQVhJRCh1bnJlc29sdmVk QXBwZW5kLmtleSkpCisgICAgICAgICAgICAgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gY2FjaGUt Pm9iamVjdEZvcklEKHVucmVzb2x2ZWRBcHBlbmQua2V5KSkgewogICAgICAgICAgICAgICAgICAg ICBpZiAoYXV0byBub2RlQ2hhbmdlID0gbm9kZUNoYW5nZUZvck9iamVjdCgqYXhPYmplY3QsIHVu cmVzb2x2ZWRBcHBlbmQudmFsdWUpKQogICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZWRB cHBlbmRzLnVuY2hlY2tlZEFwcGVuZChXVEZNb3ZlKCpub2RlQ2hhbmdlKSk7CisgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgbV91bnJlc29sdmVkUGVuZGluZ0Fw cGVuZHMuY2xlYXIoKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggYWM0MDE5 NmY5OTg5Li5hZGZjMjNhMTE4NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtMzMyLDggKzMz Miw4IEBAIHB1YmxpYzoKIAogICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiByb290Tm9kZSgp OwogICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBmb2N1c2VkTm9kZSgpOwotICAgIFJlZlB0 cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoQVhJRCkgY29uc3Q7Ci0gICAgVmVjdG9yPFJl ZlB0cjxBWENvcmVPYmplY3Q+PiBvYmplY3RzRm9ySURzKGNvbnN0IFZlY3RvcjxBWElEPiYpIGNv bnN0OworICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoY29uc3QgQVhJRCYp IGNvbnN0OworICAgIFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gb2JqZWN0c0ZvcklEcyhj b25zdCBWZWN0b3I8QVhJRD4mKTsKIAogICAgIHN0cnVjdCBOb2RlQ2hhbmdlIHsKICAgICAgICAg UmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGlzb2xhdGVkT2JqZWN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwIGIvU291cmNlL1dlYktpdExlZ2Fj eS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwCmluZGV4IGMyOTBkYWUzNzk0My4uNmI1ZjkxY2JhMDU2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9BY2Nlc3NpYmxlQmFzZS5jcHAK KysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwCkBAIC0xMDM5 LDcgKzEwMzksNyBAQCBIUkVTVUxUIEFjY2Vzc2libGVCYXNlOjpnZXRBY2Nlc3NpYmlsaXR5T2Jq ZWN0Rm9yQ2hpbGQoVkFSSUFOVCB2Q2hpbGQsIEFjY2Vzc2liaQogICAgICAgICBpZiAoIWRvY3Vt ZW50KQogICAgICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAotICAgICAgICBjaGlsZE9iaiA9IGRv Y3VtZW50LT5heE9iamVjdENhY2hlKCktPm9iamVjdEZyb21BWElEKG1ha2VPYmplY3RJZGVudGlm aWVyPEFYSURUeXBlPigtdkNoaWxkLmxWYWwpKTsKKyAgICAgICAgY2hpbGRPYmogPSBkb2N1bWVu dC0+YXhPYmplY3RDYWNoZSgpLT5vYmplY3RGb3JJRChtYWtlT2JqZWN0SWRlbnRpZmllcjxBWElE VHlwZT4oLXZDaGlsZC5sVmFsKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgc2l6ZV90IGNoaWxk SW5kZXggPSBzdGF0aWNfY2FzdDxzaXplX3Q+KHZDaGlsZC5sVmFsIC0gMSk7CiAKLS0gCjIuMzIu MCAoQXBwbGUgR2l0LTEzMikKCg== 460161 2022-06-10 10:12:43 -0700 2022-06-13 10:15:26 -0700 Patch bug-241398-20220610131242.patch text/plain 10222 andresg_22 RnJvbSBhYjhlYWFhYzA2YzgyMmQwMDY2N2I5NzBjMzYwZGE3ODhjZmQxNGY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDcgSnVuIDIwMjIgMjE6MDU6NTIgLTA0MDAKU3ViamVjdDogW1BBVENIXSBB WCBJVE06IEZpeCBmb3IgYWNjZXNzaWJpbGl0eS9NYWMvYXJpYS1lcnJvcm1lc3NhZ2UuaHRtbCBp bgogaXNvbGF0ZWQgdHJlZSBtb2RlLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjQxMzk4CgpUZXN0OiBhY2Nlc3NpYmlsaXR5L01hYy9hcmlhLWVycm9ybWVzc2FnZS5o dG1sCgpSZXZpZXdlZCBieSBDaHJpcyBGbGVpemFjaCBhbmQgVHlsZXIgV2lsY29jay4KClRoaXMg dGVzdCB3YXMgZmFpbGluZyBiZWNhdXNlIHRoZSBlbGVtZW50cyB0aGF0IGFyZSByZWZlcmVuY2Vk IGFzIGVycm9yIG1lc3NhZ2VzIGFyZSA8c3Bhbj4gZWxlbWVudHMsIHdoaWNoIGFyZSBpZ25vcmVk IG9uIHRoZSBtYWMgcGxhdGZvcm0uIFRoZXJlZm9yZSB0aGVyZSB3YXMgbm8gaXNvbGF0ZWQgb2Jq ZWN0IGNyZWF0ZWQgZm9yIHRob3NlIGVsZW1lbnRzIGFuZCBBWElzb2xhdGVkVHJlZTo6b2JqZWN0 c0ZvcklEcyB3aWxsIG5vdCByZXR1cm4gdGhlbS4gVGhpcyBwYXRjaCBzb2x2ZXMgdGhpcyBwcm9i bGVtIGJ5IGNyZWF0aW5nIG9ycGhhbiBpc29sYXRlZCBvYmplY3RzIGluIEFYSXNvbGF0ZWRUcmVl Om9iamVjdHNGb3JJRHMgaWYgdGhlcmUgaXMgbm8gaXNvbGF0ZWQgb2JqZWN0IGZvciB0aGUgcmVx dWVzdGVkIEFYSUQsIGFuZCB0aGUgY29ycmVzcG9uZGluZyBsaXZlIG9iamVjdHMgZXhpc3RzLgot LS0KIC4uLi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8IDEwICsr KysrLQogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmggIHwgIDQg KystCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwICAgICAgICAgfCAgNCAr LS0KIC4uLi9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwICAgICAgICAgICB8IDM2ICsr KysrKysrKysrKysrKystLS0KIC4uLi9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCAgICAg ICAgICAgICB8ICA0ICstLQogU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2Uu Y3BwICAgIHwgIDIgKy0KIDYgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNo ZS5jcHAKaW5kZXggZmMwZmRiZWYyMzEwLi5mMzA1NGJkMTQwYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtOTUyLDcgKzk1Miw3IEBA IFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gQVhPYmplY3RDYWNoZTo6b2JqZWN0c0ZvcklE cyhjb25zdCBWZWN0b3I8QVhJRD4mIGF4CiAKICAgICByZXR1cm4gYXhJRHMubWFwKFt0aGlzXSAo Y29uc3QgYXV0byYgYXhJRCkgLT4gUmVmUHRyPEFYQ29yZU9iamVjdD4gewogICAgICAgICBBU1NF UlQoYXhJRC5pc1ZhbGlkKCkpOwotICAgICAgICByZXR1cm4gb2JqZWN0RnJvbUFYSUQoYXhJRCk7 CisgICAgICAgIHJldHVybiBvYmplY3RGb3JJRChheElEKTsKICAgICB9KTsKIH0KIApAQCAtMzc4 NCw2ICszNzg0LDcgQEAgdm9pZCBBWE9iamVjdENhY2hlOjphZGRSZWxhdGlvbihBY2Nlc3NpYmls aXR5T2JqZWN0KiBvcmlnaW4sIEFjY2Vzc2liaWxpdHlPYmplY3QKICAgICAgICAgfQogICAgICAg ICB0YXJnZXRzSXRlcmF0b3ItPnZhbHVlLmFwcGVuZCh0YXJnZXQtPm9iamVjdElEKCkpOwogICAg IH0KKyAgICBtX3JlbGF0aW9uVGFyZ2V0cy5hZGQodGFyZ2V0LT5vYmplY3RJRCgpKTsKIAogICAg IGlmIChhZGRpbmdTeW1tZXRyaWNSZWxhdGlvbiA9PSBBZGRpbmdTeW1tZXRyaWNSZWxhdGlvbjo6 Tm8pIHsKICAgICAgICAgaWYgKGF1dG8gc3ltbWV0cmljID0gc3ltbWV0cmljUmVsYXRpb24ocmVs YXRpb25UeXBlKTsgc3ltbWV0cmljICE9IEFYUmVsYXRpb25UeXBlOjpOb25lKQpAQCAtMzgwMCw2 ICszODAxLDcgQEAgdm9pZCBBWE9iamVjdENhY2hlOjp1cGRhdGVSZWxhdGlvbnNJZk5lZWRlZCgp CiAgICAgcmVsYXRpb25zTmVlZFVwZGF0ZShmYWxzZSk7CiAgICAgQVhMT0coIlVwZGF0aW5nIHJl bGF0aW9ucy4iKTsKICAgICBtX3JlbGF0aW9ucy5jbGVhcigpOworICAgIG1fcmVsYXRpb25UYXJn ZXRzLmNsZWFyKCk7CiAKICAgICBzdHJ1Y3QgUmVsYXRpb25PcmlnaW4gewogICAgICAgICBFbGVt ZW50KiBvcmlnaW5FbGVtZW50IHsgbnVsbHB0ciB9OwpAQCAtMzg2MCw2ICszODYyLDEyIEBAIEhh c2hNYXA8QVhJRCwgQVhSZWxhdGlvbnM+IEFYT2JqZWN0Q2FjaGU6OnJlbGF0aW9ucygpCiAgICAg cmV0dXJuIG1fcmVsYXRpb25zOwogfQogCitjb25zdCBIYXNoU2V0PEFYSUQ+JiBBWE9iamVjdENh Y2hlOjpyZWxhdGlvblRhcmdldElEcygpCit7CisgICAgdXBkYXRlUmVsYXRpb25zSWZOZWVkZWQo KTsKKyAgICByZXR1cm4gbV9yZWxhdGlvblRhcmdldHM7Cit9CisKIHN0ZDo6b3B0aW9uYWw8VmVj dG9yPEFYSUQ+PiBBWE9iamVjdENhY2hlOjpyZWxhdGVkT2JqZWN0SURzRm9yKGNvbnN0IEFYQ29y ZU9iamVjdCYgb2JqZWN0LCBBWFJlbGF0aW9uVHlwZSByZWxhdGlvblR5cGUpCiB7CiAgICAgdXBk YXRlUmVsYXRpb25zSWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmgKaW5kZXggOGEzYzQ2N2NjMDhhLi5iNDE3NDkxYzEyYmMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCkBAIC0yMjMsNyArMjIz LDcgQEAgcHVibGljOgogICAgIGJvb2wgbm9kZUlzVGV4dENvbnRyb2woY29uc3QgTm9kZSopOwog CiAgICAgQVhJRCBwbGF0Zm9ybUdlbmVyYXRlQVhJRCgpIGNvbnN0OwotICAgIEFjY2Vzc2liaWxp dHlPYmplY3QqIG9iamVjdEZyb21BWElEKEFYSUQgaWQpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0 cy5nZXQoaWQpOyB9CisgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0Rm9ySUQoY29uc3Qg QVhJRCYgaWQpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0cy5nZXQoaWQpOyB9CiAgICAgVmVjdG9y PFJlZlB0cjxBWENvcmVPYmplY3Q+PiBvYmplY3RzRm9ySURzKGNvbnN0IFZlY3RvcjxBWElEPiYp IGNvbnN0OwogCiAgICAgLy8gVGV4dCBtYXJrZXIgdXRpbGl0aWVzLgpAQCAtNTAyLDYgKzUwMiw3 IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVSZWxhdGlvbnNJZk5lZWRlZCgpOwogICAgIHZv aWQgcmVsYXRpb25zTmVlZFVwZGF0ZShib29sKTsKICAgICBIYXNoTWFwPEFYSUQsIEFYUmVsYXRp b25zPiByZWxhdGlvbnMoKTsKKyAgICBjb25zdCBIYXNoU2V0PEFYSUQ+JiByZWxhdGlvblRhcmdl dElEcygpOwogCiAgICAgRG9jdW1lbnQmIG1fZG9jdW1lbnQ7CiAgICAgY29uc3Qgc3RkOjpvcHRp b25hbDxQYWdlSWRlbnRpZmllcj4gbV9wYWdlSUQ7IC8vIGNvbnN0YW50IGZvciBvYmplY3QncyBs aWZldGltZS4KQEAgLTU2MSw2ICs1NjIsNyBAQCBwcml2YXRlOgogICAgIC8vIFJlbGF0aW9uc2hp cHMgYmV0d2VlbiBvYmplY3RzLgogICAgIEhhc2hNYXA8QVhJRCwgQVhSZWxhdGlvbnM+IG1fcmVs YXRpb25zOwogICAgIGJvb2wgbV9yZWxhdGlvbnNOZWVkVXBkYXRlIHsgdHJ1ZSB9OworICAgIEhh c2hTZXQ8QVhJRD4gbV9yZWxhdGlvblRhcmdldHM7CiAKICNpZiBVU0UoQVRTUEkpCiAgICAgTGlz dEhhc2hTZXQ8UmVmUHRyPEFYQ29yZU9iamVjdD4+IG1fZGVmZXJyZWRQYXJlbnRDaGFuZ2VkTGlz dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5jcHAKaW5kZXggOWEwMGY0ZTVlZjUyLi42ZjRiNGZk NDQ3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC03Niw4ICs3Niw2IEBAIHZv aWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZVByb3BlcnRpZXMoQVhDb3JlT2JqZWN0JiBj b3JlT2JqZWN0LCBJc1Jvb3QgaXNSCiB7CiAgICAgQVNTRVJUKGlzPEFjY2Vzc2liaWxpdHlPYmpl Y3Q+KGNvcmVPYmplY3QpKTsKICAgICBhdXRvJiBvYmplY3QgPSBkb3duY2FzdDxBY2Nlc3NpYmls aXR5T2JqZWN0Pihjb3JlT2JqZWN0KTsKLSAgICAvLyBXZSBzaG91bGQgbmV2ZXIgY3JlYXRlIGFu IGlzb2xhdGVkIG9iamVjdCBmcm9tIGFuIGlnbm9yZWQgb2JqZWN0LgotICAgIEFTU0VSVCghb2Jq ZWN0LmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSk7CiAKICAgICBzZXRQcm9wZXJ0eShBWFByb3Bl cnR5TmFtZTo6QVJJQUxhbmRtYXJrUm9sZURlc2NyaXB0aW9uLCBvYmplY3QuYXJpYUxhbmRtYXJr Um9sZURlc2NyaXB0aW9uKCkuaXNvbGF0ZWRDb3B5KCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJv cGVydHlOYW1lOjpBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24sIG9iamVjdC5hY2Nlc3NpYmlsaXR5 RGVzY3JpcHRpb24oKS5pc29sYXRlZENvcHkoKSk7CkBAIC00MTMsNyArNDExLDcgQEAgQVhDb3Jl T2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojphc3NvY2lhdGVkQVhPYmplY3QoKSBjb25zdAogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIGF1dG8qIGF4T2JqZWN0Q2FjaGUgPSB0aGlzLT5h eE9iamVjdENhY2hlKCk7Ci0gICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUgPyBheE9iamVjdENhY2hl LT5vYmplY3RGcm9tQVhJRChtX2lkKSA6IG51bGxwdHI7CisgICAgcmV0dXJuIGF4T2JqZWN0Q2Fj aGUgPyBheE9iamVjdENhY2hlLT5vYmplY3RGb3JJRChtX2lkKSA6IG51bGxwdHI7CiB9CiAKIHZv aWQgQVhJc29sYXRlZE9iamVjdDo6c2V0TWF0aHNjcmlwdHMoQVhQcm9wZXJ0eU5hbWUgcHJvcGVy dHlOYW1lLCBBWENvcmVPYmplY3QmIG9iamVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRl eCAyMTVmNzk2M2Q4NzIuLmNjYzI3ZTc3Y2U0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApA QCAtMTQ1LDcgKzE0NSw3IEBAIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gQVhJc29sYXRlZFRyZWU6 OnRyZWVGb3JQYWdlSUQoUGFnZUlkZW50aWZpZXIgcGFnZUlEKQogICAgIHJldHVybiBudWxscHRy OwogfQogCi1SZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRyZWU6Om5vZGVGb3JJ RChBWElEIGF4SUQpIGNvbnN0CitSZWZQdHI8QVhJc29sYXRlZE9iamVjdD4gQVhJc29sYXRlZFRy ZWU6Om5vZGVGb3JJRChjb25zdCBBWElEJiBheElEKSBjb25zdAogewogICAgIC8vIEluIGlzb2xh dGVkIHRyZWUgbW9kZSAyLCBvbmx5IGFjY2VzcyBtX3JlYWRlclRocmVhZE5vZGVNYXAgb24gdGhl IEFYIHRocmVhZC4KICAgICBBU1NFUlQobV91c2VkT25BWFRocmVhZCA/ICFpc01haW5UaHJlYWQo KSA6IGlzTWFpblRocmVhZCgpKTsKQEAgLTE1NSwxNyArMTU1LDQyIEBAIFJlZlB0cjxBWElzb2xh dGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6bm9kZUZvcklEKEFYSUQgYXhJRCkgY29uc3QKICAg ICByZXR1cm4gYXhJRC5pc1ZhbGlkKCkgPyBtX3JlYWRlclRocmVhZE5vZGVNYXAuZ2V0KGF4SUQp IDogbnVsbHB0cjsKIH0KIAotVmVjdG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiBBWElzb2xhdGVk VHJlZTo6b2JqZWN0c0ZvcklEcyhjb25zdCBWZWN0b3I8QVhJRD4mIGF4SURzKSBjb25zdAorVmVj dG9yPFJlZlB0cjxBWENvcmVPYmplY3Q+PiBBWElzb2xhdGVkVHJlZTo6b2JqZWN0c0ZvcklEcyhj b25zdCBWZWN0b3I8QVhJRD4mIGF4SURzKQogewogICAgIEFYVFJBQ0UoIkFYSXNvbGF0ZWRUcmVl OjpvYmplY3RzRm9ySURzIl9zKTsKKyAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKwogICAg IFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gcmVzdWx0OwogICAgIHJlc3VsdC5yZXNlcnZl SW5pdGlhbENhcGFjaXR5KGF4SURzLnNpemUoKSk7CiAgICAgZm9yIChhdXRvJiBheElEIDogYXhJ RHMpIHsKLSAgICAgICAgaWYgKGF1dG8gb2JqZWN0ID0gbm9kZUZvcklEKGF4SUQpKQorICAgICAg ICBhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChheElEKTsKKyAgICAgICAgaWYgKG9iamVjdCkgewog ICAgICAgICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChvYmplY3QpOworICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIH0KKworICAgICAgICAvLyBUaGVyZSBpcyBubyBpc29sYXRlZCBv YmplY3QgZm9yIHRoaXMgQVhJRC4gVGhpcyBjYW4gaGFwcGVuIGlmIHRoZSBjb3JyZXNwb25kaW5n IGxpdmUgb2JqZWN0IGlzIGlnbm9yZWQuCisgICAgICAgIC8vIElmIHRoZXJlIGlzIGEgbGl2ZSBv YmplY3QgZm9yIHRoaXMgSUQgYW5kIGl0IGlzIGFuIGlnbm9yZWQgdGFyZ2V0IG9mIGEgcmVsYXRp b25zaGlwLCBjcmVhdGUgYW4gaXNvbGF0ZWQgb2JqZWN0IGZvciBpdC4KKyAgICAgICAgb2JqZWN0 ID0gQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPFJlZlB0cjxBWElz b2xhdGVkT2JqZWN0Pj4oWyZheElELCB0aGlzXSAoKSAtPiBSZWZQdHI8QVhJc29sYXRlZE9iamVj dD4geworICAgICAgICAgICAgYXV0byogY2FjaGUgPSBheE9iamVjdENhY2hlKCk7CisgICAgICAg ICAgICBpZiAoIWNhY2hlIHx8ICFjYWNoZS0+cmVsYXRpb25UYXJnZXRJRHMoKS5jb250YWlucyhh eElEKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICAgICAgYXV0 byogYXhPYmplY3QgPSBjYWNoZS0+b2JqZWN0Rm9ySUQoYXhJRCk7CisgICAgICAgICAgICBpZiAo IWF4T2JqZWN0IHx8ICFheE9iamVjdC0+YWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpKQorICAgICAg ICAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgICAgICAgICBhdXRvIG9iamVjdCA9IEFY SXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZSgqYXhPYmplY3QsIGNvbnN0X2Nhc3Q8QVhJc29sYXRlZFRy ZWUqPih0aGlzKSk7CisgICAgICAgICAgICBBU1NFUlQoYXhPYmplY3QtPndyYXBwZXIoKSk7Cisg ICAgICAgICAgICBvYmplY3QtPmF0dGFjaFBsYXRmb3JtV3JhcHBlcihheE9iamVjdC0+d3JhcHBl cigpKTsKKyAgICAgICAgICAgIHJldHVybiBvYmplY3Q7CisgICAgICAgIH0pOworICAgICAgICBp ZiAob2JqZWN0KSB7CisgICAgICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVNYXAuYWRkKGF4SUQs ICpvYmplY3QpOworICAgICAgICAgICAgcmVzdWx0LnVuY2hlY2tlZEFwcGVuZChvYmplY3QpOwor ICAgICAgICB9CiAgICAgfQogICAgIHJlc3VsdC5zaHJpbmtUb0ZpdCgpOwotCiAgICAgcmV0dXJu IHJlc3VsdDsKIH0KIApAQCAtMjYzLDkgKzI4OCwxMCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjpx dWV1ZVJlbW92YWxzQW5kVW5yZXNvbHZlZENoYW5nZXMoY29uc3QgVmVjdG9yPEFYSUQ+JiBzdWJ0 cgogICAgICAgICBpZiAoYXV0byogY2FjaGUgPSBheE9iamVjdENhY2hlKCkpIHsKICAgICAgICAg ICAgIHJlc29sdmVkQXBwZW5kcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fdW5yZXNvbHZlZFBl bmRpbmdBcHBlbmRzLnNpemUoKSk7CiAgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHVucmVz b2x2ZWRBcHBlbmQgOiBtX3VucmVzb2x2ZWRQZW5kaW5nQXBwZW5kcykgewotICAgICAgICAgICAg ICAgIGlmIChhdXRvKiBheE9iamVjdCA9IGNhY2hlLT5vYmplY3RGcm9tQVhJRCh1bnJlc29sdmVk QXBwZW5kLmtleSkpCisgICAgICAgICAgICAgICAgaWYgKGF1dG8qIGF4T2JqZWN0ID0gY2FjaGUt Pm9iamVjdEZvcklEKHVucmVzb2x2ZWRBcHBlbmQua2V5KSkgewogICAgICAgICAgICAgICAgICAg ICBpZiAoYXV0byBub2RlQ2hhbmdlID0gbm9kZUNoYW5nZUZvck9iamVjdCgqYXhPYmplY3QsIHVu cmVzb2x2ZWRBcHBlbmQudmFsdWUpKQogICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZWRB cHBlbmRzLnVuY2hlY2tlZEFwcGVuZChXVEZNb3ZlKCpub2RlQ2hhbmdlKSk7CisgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgbV91bnJlc29sdmVkUGVuZGluZ0Fw cGVuZHMuY2xlYXIoKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggYWM0MDE5 NmY5OTg5Li5hZGZjMjNhMTE4NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtMzMyLDggKzMz Miw4IEBAIHB1YmxpYzoKIAogICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiByb290Tm9kZSgp OwogICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBmb2N1c2VkTm9kZSgpOwotICAgIFJlZlB0 cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoQVhJRCkgY29uc3Q7Ci0gICAgVmVjdG9yPFJl ZlB0cjxBWENvcmVPYmplY3Q+PiBvYmplY3RzRm9ySURzKGNvbnN0IFZlY3RvcjxBWElEPiYpIGNv bnN0OworICAgIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBub2RlRm9ySUQoY29uc3QgQVhJRCYp IGNvbnN0OworICAgIFZlY3RvcjxSZWZQdHI8QVhDb3JlT2JqZWN0Pj4gb2JqZWN0c0ZvcklEcyhj b25zdCBWZWN0b3I8QVhJRD4mKTsKIAogICAgIHN0cnVjdCBOb2RlQ2hhbmdlIHsKICAgICAgICAg UmVmPEFYSXNvbGF0ZWRPYmplY3Q+IGlzb2xhdGVkT2JqZWN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwIGIvU291cmNlL1dlYktpdExlZ2Fj eS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwCmluZGV4IGMyOTBkYWUzNzk0My4uNmI1ZjkxY2JhMDU2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9BY2Nlc3NpYmxlQmFzZS5jcHAK KysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vQWNjZXNzaWJsZUJhc2UuY3BwCkBAIC0xMDM5 LDcgKzEwMzksNyBAQCBIUkVTVUxUIEFjY2Vzc2libGVCYXNlOjpnZXRBY2Nlc3NpYmlsaXR5T2Jq ZWN0Rm9yQ2hpbGQoVkFSSUFOVCB2Q2hpbGQsIEFjY2Vzc2liaQogICAgICAgICBpZiAoIWRvY3Vt ZW50KQogICAgICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAotICAgICAgICBjaGlsZE9iaiA9IGRv Y3VtZW50LT5heE9iamVjdENhY2hlKCktPm9iamVjdEZyb21BWElEKG1ha2VPYmplY3RJZGVudGlm aWVyPEFYSURUeXBlPigtdkNoaWxkLmxWYWwpKTsKKyAgICAgICAgY2hpbGRPYmogPSBkb2N1bWVu dC0+YXhPYmplY3RDYWNoZSgpLT5vYmplY3RGb3JJRChtYWtlT2JqZWN0SWRlbnRpZmllcjxBWElE VHlwZT4oLXZDaGlsZC5sVmFsKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgc2l6ZV90IGNoaWxk SW5kZXggPSBzdGF0aWNfY2FzdDxzaXplX3Q+KHZDaGlsZC5sVmFsIC0gMSk7CiAKLS0gCjIuMzIu MCAoQXBwbGUgR2l0LTEzMikKCg==