271016 2024-03-14 16:01:30 -0700 [IFC][Intrinsic width] Add support for content with fixed (logical) width 2024-03-17 08:38:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 2021166 0 zalan 2024-03-14 16:01:30 -0700 ssia 2021180 1 470372 zalan 2024-03-14 16:27:59 -0700 Created attachment 470372 Patch 2021213 2 470377 zalan 2024-03-14 20:22:12 -0700 Created attachment 470377 Patch 2021441 3 470393 zalan 2024-03-15 13:44:19 -0700 Created attachment 470393 Patch 2021638 4 470402 zalan 2024-03-17 06:04:59 -0700 Created attachment 470402 [fast-cq]Patch 2021650 5 ews-feeder 2024-03-17 08:37:44 -0700 Committed 276250@main (2e16d7121d64): <https://commits.webkit.org/276250@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 470402. 2021651 6 webkit-bug-importer 2024-03-17 08:38:13 -0700 <rdar://problem/124855478> 470372 2024-03-14 16:27:59 -0700 2024-03-14 20:22:10 -0700 Patch bug-271016-20240314162758.patch text/plain 4781 zalan RnJvbSAxOWE1NGE2Y2Q5ZThjZWNiOGIxMTUxN2EzZmY2ZWFjYWY5MDk5ODA0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMTQgTWFyIDIwMjQgMTY6MDE6MzggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtJ bnRyaW5zaWMgd2lkdGhdIEFkZCBzdXBwb3J0IGZvciBjb250ZW50IHdpdGggZml4ZWQKIChsb2dp Y2FsKSB3aWR0aCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcxMDE2 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OmNhblVzZUZvclByZWZlcnJlZFdpZHRoQ29tcHV0YXRpb24pOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hH ZW9tZXRyeVVwZGF0ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveEdlb21l dHJ5VXBkYXRlcjo6c2V0R2VvbWV0cmllc0ZvckludHJpbnNpY1dpZHRoKToKKiBTb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29tcHV0ZUlu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwOgooV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojp0cnlDb21wdXRlUHJl ZmVycmVkV2lkdGhzVXNpbmdNb2Rlcm5QYXRoKToKLS0tCiAuLi4vbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwICAgICAgICB8IDIgKysKIC4uLi9pbmxpbmUv TGF5b3V0SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuY3BwICAgICAgICAgIHwgNiArKysr KysKIC4uLi9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNw cCAgICAgIHwgNCArKystCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcCAgICAgICAgICAgICAgICB8IDIgLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9u cygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKaW5kZXgg NDE0YjAwOTYzYTE2Li5kMjk3Y2NlYjJjODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5j cHAKQEAgLTEyMSw2ICsxMjEsOCBAQCBib29sIGNhblVzZUZvclByZWZlcnJlZFdpZHRoQ29tcHV0 YXRpb24oY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0NvbnRhaW5lcikKICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICBpZiAoaXM8UmVuZGVySW5saW5lPihyZW5kZXJlcikpCiAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKHJlbmRlcmVyLmlzSW5GbG93KCkgJiYgcmVu ZGVyZXIuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0ZpeGVkKCkpCisgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0 SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5j cHAKaW5kZXggMjIyMDZlNWRlZjkxLi4zZjBkZTJmMmNiYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hHZW9t ZXRyeVVwZGF0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9p bmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuY3BwCkBAIC0zNjYsNiAr MzY2LDEyIEBAIHZvaWQgQm94R2VvbWV0cnlVcGRhdGVyOjpzZXRHZW9tZXRyaWVzRm9ySW50cmlu c2ljV2lkdGgoTGF5b3V0OjpJbnRyaW5zaWNXaWR0aE1vCiAgICAgICAgICAgICB1cGRhdGVJbmxp bmVCb3hEaW1lbnNpb25zKCpyZW5kZXJJbmxpbmUsIGludHJpbnNpY1dpZHRoTW9kZSk7CiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorICAgICAgICBpZiAoYXV0byogcmVuZGVyQm94 ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpKSB7CisgICAgICAgICAgICAv LyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIGZsZXhpbmcgYm94ZXMuCisgICAgICAgICAgICBBU1NF UlQocmVuZGVyQm94LT5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSk7CisgICAgICAg ICAgICB1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKCpyZW5kZXJCb3gsIGludHJpbnNpY1dpZHRo TW9kZSk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBBU1NFUlQo aXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5kZXggYjlmNWE4YWM3NzczLi45OTVhZGZlM2Uz NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUv TGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKQEAg LTI2MCw3ICsyNjAsOSBAQCBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gTGluZUxh eW91dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKQogICAgIGF1dG8gaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0IHsgcm9v dExheW91dEJveCgpLCBsYXlvdXRTdGF0ZSgpLCBwYXJlbnRCbG9ja0xheW91dFN0YXRlIH07CiAg ICAgaWYgKG1fbGluZURhbWFnZSkKICAgICAgICAgbV9pbmxpbmVDb250ZW50Q2FjaGUucmVzZXRN aW5pbXVtTWF4aW11bUNvbnRlbnRTaXplcygpOwotICAgIC8vIEZJWE1FOiBUaGlzIGlzIHdoZXJl IHdlIG5lZWQgdG8gc3dpdGNoIGJldHdlZW4gbWluaW11bSBhbmQgbWF4aW11bSBib3ggZ2VvbWV0 cmllcy4KKworICAgIC8vIEZJWE1FOiBUaGlzIGlzIHdoZXJlIHdlIG5lZWQgdG8gc3dpdGNoIGJl dHdlZW4gbWluaW11bSBhbmQgbWF4aW11bSBib3ggZ2VvbWV0cmllcyAocmlnaHQgbm93IG1pbiA9 PSBtYXggYXMgZmFyIGFzIGlubGluZSBsZXZlbCBib3hlcyBhcmUgY29uY2VybmVkKQorICAgIG1f Ym94R2VvbWV0cnlVcGRhdGVyLnNldEdlb21ldHJpZXNGb3JJbnRyaW5zaWNXaWR0aChMYXlvdXQ6 OkludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSk7CiAgICAgYXV0byBbbWluaW11bUNvbnRlbnRT aXplLCBtYXhpbXVtQ29udGVudFNpemVdID0gaW5saW5lRm9ybWF0dGluZ0NvbnRleHQubWluaW11 bU1heGltdW1Db250ZW50U2l6ZShtX2xpbmVEYW1hZ2UuZ2V0KCkpOwogICAgIHJldHVybiB7IG1p bmltdW1Db250ZW50U2l6ZSwgbWF4aW11bUNvbnRlbnRTaXplIH07CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDczZTE4ZWQ0YTJiNC4uNWYw YzRlMTJlOWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcApAQCAtNDk5OCw4ICs0OTk4LDYgQEAgYm9vbCBSZW5kZXJCbG9ja0Zsb3c6OnRyeUNvbXB1 dGVQcmVmZXJyZWRXaWR0aHNVc2luZ01vZGVyblBhdGgoTGF5b3V0VW5pdCYgbWluTG8KICAgICBp ZiAoIW1vZGVybkxpbmVMYXlvdXQoKSkKICAgICAgICAgbV9saW5lTGF5b3V0ID0gbWFrZVVuaXF1 ZTxMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dD4oKnRoaXMpOwogCi0gICAgbW9kZXJuTGlu ZUxheW91dCgpLT51cGRhdGVJbmxpbmVDb250ZW50RGltZW5zaW9ucygpOwotCiAgICAgc3RkOjp0 aWUobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpID0gbW9kZXJuTGluZUxheW91dCgp LT5jb21wdXRlSW50cmluc2ljV2lkdGhDb25zdHJhaW50cygpOwogICAgIGZvciAoYXV0byB3YWxr ZXIgPSBJbmxpbmVXYWxrZXIoKnRoaXMpOyAhd2Fsa2VyLmF0RW5kKCk7IHdhbGtlci5hZHZhbmNl KCkpIHsKICAgICAgICAgYXV0byogcmVuZGVyZXIgPSB3YWxrZXIuY3VycmVudCgpOwo= 470377 2024-03-14 20:22:12 -0700 2024-03-15 13:44:18 -0700 Patch bug-271016-20240314202211.patch text/plain 11442 zalan RnJvbSA1OTg5YTIzNzM1OTY4MTM5MGYwNmIyM2ZjNDU5ZTgwNzYyNTUyZGQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMTQgTWFyIDIwMjQgMTY6MDE6MzggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtJ bnRyaW5zaWMgd2lkdGhdIEFkZCBzdXBwb3J0IGZvciBjb250ZW50IHdpdGggZml4ZWQKIChsb2dp Y2FsKSB3aWR0aCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcxMDE2 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OmNhblVzZUZvclByZWZlcnJlZFdpZHRoQ29tcHV0YXRpb24pOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hH ZW9tZXRyeVVwZGF0ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveEdlb21l dHJ5VXBkYXRlcjo6c2V0R2VvbWV0cmllc0ZvckludHJpbnNpY1dpZHRoKToKKiBTb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29tcHV0ZUlu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwOgooV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojp0cnlDb21wdXRlUHJl ZmVycmVkV2lkdGhzVXNpbmdNb2Rlcm5QYXRoKToKLS0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAgfCAgNyArKysKIC4uLi9MYXlvdXRJbnRlZ3JhdGlvbkJv eEdlb21ldHJ5VXBkYXRlci5jcHAgICB8IDQzICsrKysrKysrKystLS0tLS0tLS0KIC4uLi9MYXlv dXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5oICAgICB8ICA0ICstCiAuLi4vaW5saW5l L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgICAgfCAgNCArLQogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgIDIgLQogNSBmaWxlcyBjaGFuZ2Vk LCAzNCBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3Zl cmFnZS5jcHAKaW5kZXggNDE0YjAwOTYzYTE2Li5hYjcxZmNmNjM0MTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25Db3ZlcmFnZS5jcHAKQEAgLTEyMSw2ICsxMjEsMTMgQEAgYm9vbCBjYW5Vc2VGb3JQcmVm ZXJyZWRXaWR0aENvbXB1dGF0aW9uKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgYmxvY2tDb250YWlu ZXIpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKGlzPFJlbmRlcklubGluZT4o cmVuZGVyZXIpKQogICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGlmIChyZW5kZXJlci5p c0luRmxvdygpICYmIHJlbmRlcmVyLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNGaXhlZCgpKSB7 CisgICAgICAgICAgICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMgaW4gbGluZSBidWlsZGVyCisg ICAgICAgICAgICBhdXRvIGFsbG93SW1hZ2VzVG9CcmVhayA9ICFibG9ja0NvbnRhaW5lci5kb2N1 bWVudCgpLmluUXVpcmtzTW9kZSgpIHx8ICFibG9ja0NvbnRhaW5lci5pc1JlbmRlclRhYmxlQ2Vs bCgpOworICAgICAgICAgICAgaWYgKCFhbGxvd0ltYWdlc1RvQnJlYWspCisgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25C b3hHZW9tZXRyeVVwZGF0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5jcHAKaW5kZXggMjIy MDZlNWRlZjkxLi45MDI2MDQxYzc0NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0 SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuY3BwCkBAIC02NiwxMSArNjYsOSBAQCBCb3hH ZW9tZXRyeVVwZGF0ZXI6OkJveEdlb21ldHJ5VXBkYXRlcihCb3hUcmVlJiBib3hUcmVlLCBMYXlv dXQ6OkxheW91dFN0YXRlJiBsYQogewogfQogCi12b2lkIEJveEdlb21ldHJ5VXBkYXRlcjo6dXBk YXRlTGlzdE1hcmtlckRpbWVuc2lvbnMoY29uc3QgUmVuZGVyTGlzdE1hcmtlciYgbGlzdE1hcmtl ciwgc3RkOjpvcHRpb25hbDxMYXlvdXQ6OkludHJpbnNpY1dpZHRoTW9kZT4gaW50cmluc2ljV2lk dGhNb2RlKQordm9pZCBCb3hHZW9tZXRyeVVwZGF0ZXI6OnVwZGF0ZUxpc3RNYXJrZXJEaW1lbnNp b25zKGNvbnN0IFJlbmRlckxpc3RNYXJrZXImIGxpc3RNYXJrZXIpCiB7Ci0gICAgdXBkYXRlTGF5 b3V0Qm94RGltZW5zaW9ucyhsaXN0TWFya2VyLCBpbnRyaW5zaWNXaWR0aE1vZGUpOwotICAgIGlm IChpbnRyaW5zaWNXaWR0aE1vZGUpCi0gICAgICAgIHJldHVybjsKKyAgICB1cGRhdGVMYXlvdXRC b3hEaW1lbnNpb25zKGxpc3RNYXJrZXIpOwogCiAgICAgYXV0byYgbGF5b3V0Qm94ID0gYm94VHJl ZSgpLmxheW91dEJveEZvclJlbmRlcmVyKGxpc3RNYXJrZXIpOwogICAgIGlmIChsYXlvdXRCb3gu aXNMaXN0TWFya2VyT3V0c2lkZSgpKSB7CkBAIC0xNjUsMTAgKzE2MywxMCBAQCBlbnVtIGNsYXNz IElzUGFydE9mRm9ybWF0dGluZ0NvbnRleHQgOiBib29sIHsgTm8sIFllcyB9Owogc3RhdGljIGlu bGluZSBMYXlvdXQ6OkJveEdlb21ldHJ5OjpFZGdlcyBsb2dpY2FsQm9yZGVyKGNvbnN0IFJlbmRl ckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0 aW9uLCBCbG9ja0Zsb3dEaXJlY3Rpb24gYmxvY2tGbG93RGlyZWN0aW9uLCBVc2VDb21wdXRlZFZh bHVlcyB1c2VDb21wdXRlZFZhbHVlcyA9IFVzZUNvbXB1dGVkVmFsdWVzOjpObywgSXNQYXJ0T2ZG b3JtYXR0aW5nQ29udGV4dCBpc1BhcnRPZkZvcm1hdHRpbmdDb250ZXh0ID0gSXNQYXJ0T2ZGb3Jt YXR0aW5nQ29udGV4dDo6Tm8sIGJvb2wgcmV0YWluQm9yZGVyU3RhcnQgPSB0cnVlLCBib29sIHJl dGFpbkJvcmRlckVuZCA9IHRydWUpCiB7CiAgICAgYXV0byYgc3R5bGUgPSByZW5kZXJlci5zdHls ZSgpOwotICAgIGF1dG8gYm9yZGVyTGVmdCA9IHVzZUNvbXB1dGVkVmFsdWVzID09IFVzZUNvbXB1 dGVkVmFsdWVzOjpObyA/IHJlbmRlcmVyLmJvcmRlckxlZnQoKSA6IExheW91dFVuaXQoc3R5bGUu Ym9yZGVyTGVmdCgpLndpZHRoKCkpOwotICAgIGF1dG8gYm9yZGVyUmlnaHQgPSB1c2VDb21wdXRl ZFZhbHVlcyA9PSBVc2VDb21wdXRlZFZhbHVlczo6Tm8gPyByZW5kZXJlci5ib3JkZXJSaWdodCgp IDogTGF5b3V0VW5pdChzdHlsZS5ib3JkZXJSaWdodCgpLndpZHRoKCkpOwotICAgIGF1dG8gYm9y ZGVyVG9wID0gdXNlQ29tcHV0ZWRWYWx1ZXMgPT0gVXNlQ29tcHV0ZWRWYWx1ZXM6Ok5vID8gcmVu ZGVyZXIuYm9yZGVyVG9wKCkgOiBMYXlvdXRVbml0KHN0eWxlLmJvcmRlclRvcCgpLndpZHRoKCkp OwotICAgIGF1dG8gYm9yZGVyQm90dG9tID0gdXNlQ29tcHV0ZWRWYWx1ZXMgPT0gVXNlQ29tcHV0 ZWRWYWx1ZXM6Ok5vID8gcmVuZGVyZXIuYm9yZGVyQm90dG9tKCkgOiBMYXlvdXRVbml0KHN0eWxl LmJvcmRlckJvdHRvbSgpLndpZHRoKCkpOworICAgIGF1dG8gYm9yZGVyTGVmdCA9IHVzZUNvbXB1 dGVkVmFsdWVzID09IFVzZUNvbXB1dGVkVmFsdWVzOjpObyA/IHJlbmRlcmVyLmJvcmRlckxlZnQo KSA6IExheW91dFVuaXQoc3R5bGUuYm9yZGVyTGVmdFdpZHRoKCkpOworICAgIGF1dG8gYm9yZGVy UmlnaHQgPSB1c2VDb21wdXRlZFZhbHVlcyA9PSBVc2VDb21wdXRlZFZhbHVlczo6Tm8gPyByZW5k ZXJlci5ib3JkZXJSaWdodCgpIDogTGF5b3V0VW5pdChzdHlsZS5ib3JkZXJSaWdodFdpZHRoKCkp OworICAgIGF1dG8gYm9yZGVyVG9wID0gdXNlQ29tcHV0ZWRWYWx1ZXMgPT0gVXNlQ29tcHV0ZWRW YWx1ZXM6Ok5vID8gcmVuZGVyZXIuYm9yZGVyVG9wKCkgOiBMYXlvdXRVbml0KHN0eWxlLmJvcmRl clRvcFdpZHRoKCkpOworICAgIGF1dG8gYm9yZGVyQm90dG9tID0gdXNlQ29tcHV0ZWRWYWx1ZXMg PT0gVXNlQ29tcHV0ZWRWYWx1ZXM6Ok5vID8gcmVuZGVyZXIuYm9yZGVyQm90dG9tKCkgOiBMYXlv dXRVbml0KHN0eWxlLmJvcmRlckJvdHRvbVdpZHRoKCkpOwogCiAgICAgaWYgKGJsb2NrRmxvd0Rp cmVjdGlvbiA9PSBCbG9ja0Zsb3dEaXJlY3Rpb246OlRvcFRvQm90dG9tIHx8IGJsb2NrRmxvd0Rp cmVjdGlvbiA9PSBCbG9ja0Zsb3dEaXJlY3Rpb246OkJvdHRvbVRvVG9wKSB7CiAgICAgICAgIGlm IChpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uKQpAQCAtMjE2LDcgKzIxNCw3IEBAIHN0YXRp YyBpbmxpbmUgTGF5b3V0U2l6ZSBzY3JvbGxiYXJMb2dpY2FsU2l6ZShjb25zdCBSZW5kZXJCb3gm IHJlbmRlcmVyKQogICAgIHJldHVybiB7IGhvcml6b250YWxTcGFjZVJlc2VydmVkRm9yU2Nyb2xs YmFyLCB2ZXJ0aWNhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIgfTsKIH0KIAotdm9pZCBCb3hH ZW9tZXRyeVVwZGF0ZXI6OnVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMoY29uc3QgUmVuZGVyQm94 JiByZW5kZXJCb3gsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0OjpJbnRyaW5zaWNXaWR0aE1vZGU+IGlu dHJpbnNpY1dpZHRoTW9kZSkKK3ZvaWQgQm94R2VvbWV0cnlVcGRhdGVyOjp1cGRhdGVMYXlvdXRC b3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyQm94KQogewogICAgIGF1dG8mIGxh eW91dEJveCA9IGJveFRyZWUoKS5sYXlvdXRCb3hGb3JSZW5kZXJlcihyZW5kZXJCb3gpOwogICAg IGF1dG8gaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiA9IHJlbmRlckJveC5wYXJlbnQoKS0+ c3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CkBAIC0yMjQsMjAgKzIyMiwxMSBAQCB2 b2lkIEJveEdlb21ldHJ5VXBkYXRlcjo6dXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyhjb25zdCBS ZW5kZXJCb3gmIHJlbmRlckJveCwgcwogICAgIGF1dG8gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUg PSBibG9ja0Zsb3dEaXJlY3Rpb24gPT0gQmxvY2tGbG93RGlyZWN0aW9uOjpUb3BUb0JvdHRvbSB8 fCBibG9ja0Zsb3dEaXJlY3Rpb24gPT0gQmxvY2tGbG93RGlyZWN0aW9uOjpCb3R0b21Ub1RvcDsK IAogICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gbGF5b3V0U3RhdGUoKS5lbnN1cmVHZW9tZXRyeUZv ckJveChsYXlvdXRCb3gpOwotICAgIGF1dG8gaW5saW5lTWFyZ2luID0gaG9yaXpvbnRhbExvZ2lj YWxNYXJnaW4ocmVuZGVyQm94LCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCBpc0hvcml6 b250YWxXcml0aW5nTW9kZSwgaW50cmluc2ljV2lkdGhNb2RlID8gVXNlQ29tcHV0ZWRWYWx1ZXM6 OlllcyA6IFVzZUNvbXB1dGVkVmFsdWVzOjpObyk7Ci0gICAgYXV0byBib3JkZXIgPSBsb2dpY2Fs Qm9yZGVyKHJlbmRlckJveCwgaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiwgYmxvY2tGbG93 RGlyZWN0aW9uLCBpbnRyaW5zaWNXaWR0aE1vZGUgPyBVc2VDb21wdXRlZFZhbHVlczo6WWVzIDog VXNlQ29tcHV0ZWRWYWx1ZXM6Ok5vKTsKLSAgICBhdXRvIHBhZGRpbmcgPSBsb2dpY2FsUGFkZGlu ZyhyZW5kZXJCb3gsIGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIGJsb2NrRmxvd0RpcmVj dGlvbiwgaW50cmluc2ljV2lkdGhNb2RlID8gVXNlQ29tcHV0ZWRWYWx1ZXM6OlllcyA6IFVzZUNv bXB1dGVkVmFsdWVzOjpObyk7CisgICAgYXV0byBpbmxpbmVNYXJnaW4gPSBob3Jpem9udGFsTG9n aWNhbE1hcmdpbihyZW5kZXJCb3gsIGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIGlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKTsKKyAgICBhdXRvIGJvcmRlciA9IGxvZ2ljYWxCb3JkZXIocmVu ZGVyQm94LCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCBibG9ja0Zsb3dEaXJlY3Rpb24p OworICAgIGF1dG8gcGFkZGluZyA9IGxvZ2ljYWxQYWRkaW5nKHJlbmRlckJveCwgaXNMZWZ0VG9S aWdodElubGluZURpcmVjdGlvbiwgYmxvY2tGbG93RGlyZWN0aW9uKTsKICAgICBhdXRvIHNjcm9s bGJhclNpemUgPSBzY3JvbGxiYXJMb2dpY2FsU2l6ZShyZW5kZXJCb3gpOwogCi0gICAgaWYgKGlu dHJpbnNpY1dpZHRoTW9kZSkgewotICAgICAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsU3Bh Y2VGb3JTY3JvbGxiYXIoc2Nyb2xsYmFyU2l6ZS53aWR0aCgpKTsKLSAgICAgICAgYm94R2VvbWV0 cnkuc2V0Q29udGVudEJveFdpZHRoKCppbnRyaW5zaWNXaWR0aE1vZGUgPT0gTGF5b3V0OjpJbnRy aW5zaWNXaWR0aE1vZGU6Ok1pbmltdW0gPyByZW5kZXJCb3gubWluUHJlZmVycmVkTG9naWNhbFdp ZHRoKCkgOiByZW5kZXJCb3gubWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkpOwotICAgICAgICBi b3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsTWFyZ2luKGlubGluZU1hcmdpbik7Ci0gICAgICAgIGJv eEdlb21ldHJ5LnNldEhvcml6b250YWxCb3JkZXIoYm9yZGVyLmhvcml6b250YWwpOwotICAgICAg ICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsUGFkZGluZyhwYWRkaW5nLmhvcml6b250YWwpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbFNw YWNlRm9yU2Nyb2xsYmFyKHNjcm9sbGJhclNpemUud2lkdGgoKSk7CiAgICAgYm94R2VvbWV0cnku c2V0VmVydGljYWxTcGFjZUZvclNjcm9sbGJhcihzY3JvbGxiYXJTaXplLmhlaWdodCgpKTsKIApA QCAtMzY2LDYgKzM1NSwxOCBAQCB2b2lkIEJveEdlb21ldHJ5VXBkYXRlcjo6c2V0R2VvbWV0cmll c0ZvckludHJpbnNpY1dpZHRoKExheW91dDo6SW50cmluc2ljV2lkdGhNbwogICAgICAgICAgICAg dXBkYXRlSW5saW5lQm94RGltZW5zaW9ucygqcmVuZGVySW5saW5lLCBpbnRyaW5zaWNXaWR0aE1v ZGUpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGF1dG8q IHJlbmRlckJveCA9IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKSkgeworICAg ICAgICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBmbGV4aW5nIGJveGVzLgorICAgICAg ICAgICAgQVNTRVJUKHJlbmRlckJveC0+c3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0ZpeGVkKCkp OworCisgICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGxheW91dFN0YXRlKCkuZW5zdXJl R2VvbWV0cnlGb3JCb3goYm94VHJlZSgpLmxheW91dEJveEZvclJlbmRlcmVyKCpyZW5kZXJCb3gp KTsKKyAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldENvbnRlbnRCb3hXaWR0aChpbnRyaW5zaWNX aWR0aE1vZGUgPT0gTGF5b3V0OjpJbnRyaW5zaWNXaWR0aE1vZGU6Ok1pbmltdW0gPyByZW5kZXJC b3gtPm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIDogcmVuZGVyQm94LT5tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGgoKSk7CisgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsU3Bh Y2VGb3JTY3JvbGxiYXIoeyB9KTsKKyAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250 YWxNYXJnaW4oeyB9KTsKKyAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxCb3Jk ZXIoeyB9KTsKKyAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxQYWRkaW5nKHsg fSk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBBU1NFUlQoaXM8 UmVuZGVyVGV4dD4ocmVuZGVyZXIpKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uQm94R2VvbWV0 cnlVcGRhdGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xh eW91dEludGVncmF0aW9uQm94R2VvbWV0cnlVcGRhdGVyLmgKaW5kZXggOThkNTA5NDU3ZjljLi5j NDhiMzk2M2YxNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uQm94 R2VvbWV0cnlVcGRhdGVyLmgKQEAgLTUzLDEwICs1MywxMCBAQCBwdWJsaWM6CiAgICAgSGFzaE1h cDxjb25zdCBMYXlvdXQ6OkVsZW1lbnRCb3gqLCBMYXlvdXRVbml0PiB0YWtlTmVzdGVkTGlzdE1h cmtlck9mZnNldHMoKSB7IHJldHVybiBXVEZNb3ZlKG1fbmVzdGVkTGlzdE1hcmtlck9mZnNldHMp OyB9CiAKIHByaXZhdGU6Ci0gICAgdm9pZCB1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0 IFJlbmRlckJveCYsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0OjpJbnRyaW5zaWNXaWR0aE1vZGU+ID0g c3RkOjpudWxsb3B0KTsKKyAgICB2b2lkIHVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMoY29uc3Qg UmVuZGVyQm94Jik7CiAgICAgdm9pZCB1cGRhdGVMaW5lQnJlYWtCb3hEaW1lbnNpb25zKGNvbnN0 IFJlbmRlckxpbmVCcmVhayYpOwogICAgIHZvaWQgdXBkYXRlSW5saW5lQm94RGltZW5zaW9ucyhj b25zdCBSZW5kZXJJbmxpbmUmLCBzdGQ6Om9wdGlvbmFsPExheW91dDo6SW50cmluc2ljV2lkdGhN b2RlPiA9IHN0ZDo6bnVsbG9wdCk7Ci0gICAgdm9pZCB1cGRhdGVMaXN0TWFya2VyRGltZW5zaW9u cyhjb25zdCBSZW5kZXJMaXN0TWFya2VyJiwgc3RkOjpvcHRpb25hbDxMYXlvdXQ6OkludHJpbnNp Y1dpZHRoTW9kZT4gPSBzdGQ6Om51bGxvcHQpOworICAgIHZvaWQgdXBkYXRlTGlzdE1hcmtlckRp bWVuc2lvbnMoY29uc3QgUmVuZGVyTGlzdE1hcmtlciYpOwogCiAgICAgQm94VHJlZSYgYm94VHJl ZSgpIHsgcmV0dXJuICptX2JveFRyZWU7IH0KICAgICBjb25zdCBCb3hUcmVlJiBib3hUcmVlKCkg Y29uc3QgeyByZXR1cm4gKm1fYm94VHJlZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IGI5ZjVhOGFjNzc3My4uOTk1YWRmZTNlMzRjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dElu dGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0yNjAsNyAr MjYwLDkgQEAgc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IExpbmVMYXlvdXQ6OmNv bXB1dGVJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkKICAgICBhdXRvIGlubGluZUZvcm1hdHRp bmdDb250ZXh0ID0gTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCB7IHJvb3RMYXlvdXRC b3goKSwgbGF5b3V0U3RhdGUoKSwgcGFyZW50QmxvY2tMYXlvdXRTdGF0ZSB9OwogICAgIGlmICht X2xpbmVEYW1hZ2UpCiAgICAgICAgIG1faW5saW5lQ29udGVudENhY2hlLnJlc2V0TWluaW11bU1h eGltdW1Db250ZW50U2l6ZXMoKTsKLSAgICAvLyBGSVhNRTogVGhpcyBpcyB3aGVyZSB3ZSBuZWVk IHRvIHN3aXRjaCBiZXR3ZWVuIG1pbmltdW0gYW5kIG1heGltdW0gYm94IGdlb21ldHJpZXMuCisK KyAgICAvLyBGSVhNRTogVGhpcyBpcyB3aGVyZSB3ZSBuZWVkIHRvIHN3aXRjaCBiZXR3ZWVuIG1p bmltdW0gYW5kIG1heGltdW0gYm94IGdlb21ldHJpZXMgKHJpZ2h0IG5vdyBtaW4gPT0gbWF4IGFz IGZhciBhcyBpbmxpbmUgbGV2ZWwgYm94ZXMgYXJlIGNvbmNlcm5lZCkKKyAgICBtX2JveEdlb21l dHJ5VXBkYXRlci5zZXRHZW9tZXRyaWVzRm9ySW50cmluc2ljV2lkdGgoTGF5b3V0OjpJbnRyaW5z aWNXaWR0aE1vZGU6Ok1pbmltdW0pOwogICAgIGF1dG8gW21pbmltdW1Db250ZW50U2l6ZSwgbWF4 aW11bUNvbnRlbnRTaXplXSA9IGlubGluZUZvcm1hdHRpbmdDb250ZXh0Lm1pbmltdW1NYXhpbXVt Q29udGVudFNpemUobV9saW5lRGFtYWdlLmdldCgpKTsKICAgICByZXR1cm4geyBtaW5pbXVtQ29u dGVudFNpemUsIG1heGltdW1Db250ZW50U2l6ZSB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCA3M2UxOGVkNGEyYjQuLjVmMGM0ZTEyZTlm YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAg LTQ5OTgsOCArNDk5OCw2IEBAIGJvb2wgUmVuZGVyQmxvY2tGbG93Ojp0cnlDb21wdXRlUHJlZmVy cmVkV2lkdGhzVXNpbmdNb2Rlcm5QYXRoKExheW91dFVuaXQmIG1pbkxvCiAgICAgaWYgKCFtb2Rl cm5MaW5lTGF5b3V0KCkpCiAgICAgICAgIG1fbGluZUxheW91dCA9IG1ha2VVbmlxdWU8TGF5b3V0 SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ+KCp0aGlzKTsKIAotICAgIG1vZGVybkxpbmVMYXlvdXQo KS0+dXBkYXRlSW5saW5lQ29udGVudERpbWVuc2lvbnMoKTsKLQogICAgIHN0ZDo6dGllKG1pbkxv Z2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKSA9IG1vZGVybkxpbmVMYXlvdXQoKS0+Y29tcHV0 ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKTsKICAgICBmb3IgKGF1dG8gd2Fsa2VyID0gSW5s aW5lV2Fsa2VyKCp0aGlzKTsgIXdhbGtlci5hdEVuZCgpOyB3YWxrZXIuYWR2YW5jZSgpKSB7CiAg ICAgICAgIGF1dG8qIHJlbmRlcmVyID0gd2Fsa2VyLmN1cnJlbnQoKTsK 470393 2024-03-15 13:44:19 -0700 2024-03-17 06:04:57 -0700 Patch bug-271016-20240315134419.patch text/plain 11656 zalan RnJvbSAwZDdjMzQ3MjJlZTcyMWE4OGU5ZWMwZDczN2JhYTgxMDM1ZTNhZDcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFRodSwgMTQgTWFyIDIwMjQgMTY6MDE6MzggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtJ bnRyaW5zaWMgd2lkdGhdIEFkZCBzdXBwb3J0IGZvciBjb250ZW50IHdpdGggZml4ZWQKIChsb2dp Y2FsKSB3aWR0aCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcxMDE2 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OmNhblVzZUZvclByZWZlcnJlZFdpZHRoQ29tcHV0YXRpb24pOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hH ZW9tZXRyeVVwZGF0ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveEdlb21l dHJ5VXBkYXRlcjo6c2V0R2VvbWV0cmllc0ZvckludHJpbnNpY1dpZHRoKToKKiBTb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHA6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29tcHV0ZUlu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwOgooV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojp0cnlDb21wdXRlUHJl ZmVycmVkV2lkdGhzVXNpbmdNb2Rlcm5QYXRoKToKLS0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAgfCAgNyArKysKIC4uLi9MYXlvdXRJbnRlZ3JhdGlvbkJv eEdlb21ldHJ5VXBkYXRlci5jcHAgICB8IDQzICsrKysrKysrKystLS0tLS0tLS0KIC4uLi9MYXlv dXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5oICAgICB8ICA0ICstCiAuLi4vaW5saW5l L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgICAgfCAgNCArLQogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgIDIgLQogNSBmaWxlcyBjaGFuZ2Vk LCAzNCBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3Zl cmFnZS5jcHAKaW5kZXggNDE0YjAwOTYzYTE2Li4yNzIzNDRiYWM4OTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25Db3ZlcmFnZS5jcHAKQEAgLTEyMSw2ICsxMjEsMTMgQEAgYm9vbCBjYW5Vc2VGb3JQcmVm ZXJyZWRXaWR0aENvbXB1dGF0aW9uKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgYmxvY2tDb250YWlu ZXIpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKGlzPFJlbmRlcklubGluZT4o cmVuZGVyZXIpKQogICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGlmIChyZW5kZXJlci5p c0luRmxvdygpICYmIHJlbmRlcmVyLnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAm JiByZW5kZXJlci5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSkgeworICAgICAgICAg ICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlzIGluIGxpbmUgYnVpbGRlci4KKyAgICAgICAgICAg IGF1dG8gYWxsb3dJbWFnZXNUb0JyZWFrID0gIWJsb2NrQ29udGFpbmVyLmRvY3VtZW50KCkuaW5R dWlya3NNb2RlKCkgfHwgIWJsb2NrQ29udGFpbmVyLmlzUmVuZGVyVGFibGVDZWxsKCk7CisgICAg ICAgICAgICBpZiAoIWFsbG93SW1hZ2VzVG9CcmVhaykKKyAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5 VXBkYXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xh eW91dEludGVncmF0aW9uQm94R2VvbWV0cnlVcGRhdGVyLmNwcAppbmRleCAyMjIwNmU1ZGVmOTEu LmVhZTI1MTU4ZTA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlv bkJveEdlb21ldHJ5VXBkYXRlci5jcHAKQEAgLTY2LDExICs2Niw5IEBAIEJveEdlb21ldHJ5VXBk YXRlcjo6Qm94R2VvbWV0cnlVcGRhdGVyKEJveFRyZWUmIGJveFRyZWUsIExheW91dDo6TGF5b3V0 U3RhdGUmIGxhCiB7CiB9CiAKLXZvaWQgQm94R2VvbWV0cnlVcGRhdGVyOjp1cGRhdGVMaXN0TWFy a2VyRGltZW5zaW9ucyhjb25zdCBSZW5kZXJMaXN0TWFya2VyJiBsaXN0TWFya2VyLCBzdGQ6Om9w dGlvbmFsPExheW91dDo6SW50cmluc2ljV2lkdGhNb2RlPiBpbnRyaW5zaWNXaWR0aE1vZGUpCit2 b2lkIEJveEdlb21ldHJ5VXBkYXRlcjo6dXBkYXRlTGlzdE1hcmtlckRpbWVuc2lvbnMoY29uc3Qg UmVuZGVyTGlzdE1hcmtlciYgbGlzdE1hcmtlcikKIHsKLSAgICB1cGRhdGVMYXlvdXRCb3hEaW1l bnNpb25zKGxpc3RNYXJrZXIsIGludHJpbnNpY1dpZHRoTW9kZSk7Ci0gICAgaWYgKGludHJpbnNp Y1dpZHRoTW9kZSkKLSAgICAgICAgcmV0dXJuOworICAgIHVwZGF0ZUxheW91dEJveERpbWVuc2lv bnMobGlzdE1hcmtlcik7CiAKICAgICBhdXRvJiBsYXlvdXRCb3ggPSBib3hUcmVlKCkubGF5b3V0 Qm94Rm9yUmVuZGVyZXIobGlzdE1hcmtlcik7CiAgICAgaWYgKGxheW91dEJveC5pc0xpc3RNYXJr ZXJPdXRzaWRlKCkpIHsKQEAgLTE2NSwxMCArMTYzLDEwIEBAIGVudW0gY2xhc3MgSXNQYXJ0T2ZG b3JtYXR0aW5nQ29udGV4dCA6IGJvb2wgeyBObywgWWVzIH07CiBzdGF0aWMgaW5saW5lIExheW91 dDo6Qm94R2VvbWV0cnk6OkVkZ2VzIGxvZ2ljYWxCb3JkZXIoY29uc3QgUmVuZGVyQm94TW9kZWxP YmplY3QmIHJlbmRlcmVyLCBib29sIGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIEJsb2Nr Rmxvd0RpcmVjdGlvbiBibG9ja0Zsb3dEaXJlY3Rpb24sIFVzZUNvbXB1dGVkVmFsdWVzIHVzZUNv bXB1dGVkVmFsdWVzID0gVXNlQ29tcHV0ZWRWYWx1ZXM6Ok5vLCBJc1BhcnRPZkZvcm1hdHRpbmdD b250ZXh0IGlzUGFydE9mRm9ybWF0dGluZ0NvbnRleHQgPSBJc1BhcnRPZkZvcm1hdHRpbmdDb250 ZXh0OjpObywgYm9vbCByZXRhaW5Cb3JkZXJTdGFydCA9IHRydWUsIGJvb2wgcmV0YWluQm9yZGVy RW5kID0gdHJ1ZSkKIHsKICAgICBhdXRvJiBzdHlsZSA9IHJlbmRlcmVyLnN0eWxlKCk7Ci0gICAg YXV0byBib3JkZXJMZWZ0ID0gdXNlQ29tcHV0ZWRWYWx1ZXMgPT0gVXNlQ29tcHV0ZWRWYWx1ZXM6 Ok5vID8gcmVuZGVyZXIuYm9yZGVyTGVmdCgpIDogTGF5b3V0VW5pdChzdHlsZS5ib3JkZXJMZWZ0 KCkud2lkdGgoKSk7Ci0gICAgYXV0byBib3JkZXJSaWdodCA9IHVzZUNvbXB1dGVkVmFsdWVzID09 IFVzZUNvbXB1dGVkVmFsdWVzOjpObyA/IHJlbmRlcmVyLmJvcmRlclJpZ2h0KCkgOiBMYXlvdXRV bml0KHN0eWxlLmJvcmRlclJpZ2h0KCkud2lkdGgoKSk7Ci0gICAgYXV0byBib3JkZXJUb3AgPSB1 c2VDb21wdXRlZFZhbHVlcyA9PSBVc2VDb21wdXRlZFZhbHVlczo6Tm8gPyByZW5kZXJlci5ib3Jk ZXJUb3AoKSA6IExheW91dFVuaXQoc3R5bGUuYm9yZGVyVG9wKCkud2lkdGgoKSk7Ci0gICAgYXV0 byBib3JkZXJCb3R0b20gPSB1c2VDb21wdXRlZFZhbHVlcyA9PSBVc2VDb21wdXRlZFZhbHVlczo6 Tm8gPyByZW5kZXJlci5ib3JkZXJCb3R0b20oKSA6IExheW91dFVuaXQoc3R5bGUuYm9yZGVyQm90 dG9tKCkud2lkdGgoKSk7CisgICAgYXV0byBib3JkZXJMZWZ0ID0gdXNlQ29tcHV0ZWRWYWx1ZXMg PT0gVXNlQ29tcHV0ZWRWYWx1ZXM6Ok5vID8gcmVuZGVyZXIuYm9yZGVyTGVmdCgpIDogTGF5b3V0 VW5pdChzdHlsZS5ib3JkZXJMZWZ0V2lkdGgoKSk7CisgICAgYXV0byBib3JkZXJSaWdodCA9IHVz ZUNvbXB1dGVkVmFsdWVzID09IFVzZUNvbXB1dGVkVmFsdWVzOjpObyA/IHJlbmRlcmVyLmJvcmRl clJpZ2h0KCkgOiBMYXlvdXRVbml0KHN0eWxlLmJvcmRlclJpZ2h0V2lkdGgoKSk7CisgICAgYXV0 byBib3JkZXJUb3AgPSB1c2VDb21wdXRlZFZhbHVlcyA9PSBVc2VDb21wdXRlZFZhbHVlczo6Tm8g PyByZW5kZXJlci5ib3JkZXJUb3AoKSA6IExheW91dFVuaXQoc3R5bGUuYm9yZGVyVG9wV2lkdGgo KSk7CisgICAgYXV0byBib3JkZXJCb3R0b20gPSB1c2VDb21wdXRlZFZhbHVlcyA9PSBVc2VDb21w dXRlZFZhbHVlczo6Tm8gPyByZW5kZXJlci5ib3JkZXJCb3R0b20oKSA6IExheW91dFVuaXQoc3R5 bGUuYm9yZGVyQm90dG9tV2lkdGgoKSk7CiAKICAgICBpZiAoYmxvY2tGbG93RGlyZWN0aW9uID09 IEJsb2NrRmxvd0RpcmVjdGlvbjo6VG9wVG9Cb3R0b20gfHwgYmxvY2tGbG93RGlyZWN0aW9uID09 IEJsb2NrRmxvd0RpcmVjdGlvbjo6Qm90dG9tVG9Ub3ApIHsKICAgICAgICAgaWYgKGlzTGVmdFRv UmlnaHRJbmxpbmVEaXJlY3Rpb24pCkBAIC0yMTYsNyArMjE0LDcgQEAgc3RhdGljIGlubGluZSBM YXlvdXRTaXplIHNjcm9sbGJhckxvZ2ljYWxTaXplKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIp CiAgICAgcmV0dXJuIHsgaG9yaXpvbnRhbFNwYWNlUmVzZXJ2ZWRGb3JTY3JvbGxiYXIsIHZlcnRp Y2FsU3BhY2VSZXNlcnZlZEZvclNjcm9sbGJhciB9OwogfQogCi12b2lkIEJveEdlb21ldHJ5VXBk YXRlcjo6dXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyhjb25zdCBSZW5kZXJCb3gmIHJlbmRlckJv eCwgc3RkOjpvcHRpb25hbDxMYXlvdXQ6OkludHJpbnNpY1dpZHRoTW9kZT4gaW50cmluc2ljV2lk dGhNb2RlKQordm9pZCBCb3hHZW9tZXRyeVVwZGF0ZXI6OnVwZGF0ZUxheW91dEJveERpbWVuc2lv bnMoY29uc3QgUmVuZGVyQm94JiByZW5kZXJCb3gpCiB7CiAgICAgYXV0byYgbGF5b3V0Qm94ID0g Ym94VHJlZSgpLmxheW91dEJveEZvclJlbmRlcmVyKHJlbmRlckJveCk7CiAgICAgYXV0byBpc0xl ZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uID0gcmVuZGVyQm94LnBhcmVudCgpLT5zdHlsZSgpLmlz TGVmdFRvUmlnaHREaXJlY3Rpb24oKTsKQEAgLTIyNCwyMCArMjIyLDExIEBAIHZvaWQgQm94R2Vv bWV0cnlVcGRhdGVyOjp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYg cmVuZGVyQm94LCBzCiAgICAgYXV0byBpc0hvcml6b250YWxXcml0aW5nTW9kZSA9IGJsb2NrRmxv d0RpcmVjdGlvbiA9PSBCbG9ja0Zsb3dEaXJlY3Rpb246OlRvcFRvQm90dG9tIHx8IGJsb2NrRmxv d0RpcmVjdGlvbiA9PSBCbG9ja0Zsb3dEaXJlY3Rpb246OkJvdHRvbVRvVG9wOwogCiAgICAgYXV0 byYgYm94R2VvbWV0cnkgPSBsYXlvdXRTdGF0ZSgpLmVuc3VyZUdlb21ldHJ5Rm9yQm94KGxheW91 dEJveCk7Ci0gICAgYXV0byBpbmxpbmVNYXJnaW4gPSBob3Jpem9udGFsTG9naWNhbE1hcmdpbihy ZW5kZXJCb3gsIGlzTGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIGlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlLCBpbnRyaW5zaWNXaWR0aE1vZGUgPyBVc2VDb21wdXRlZFZhbHVlczo6WWVzIDogVXNl Q29tcHV0ZWRWYWx1ZXM6Ok5vKTsKLSAgICBhdXRvIGJvcmRlciA9IGxvZ2ljYWxCb3JkZXIocmVu ZGVyQm94LCBpc0xlZnRUb1JpZ2h0SW5saW5lRGlyZWN0aW9uLCBibG9ja0Zsb3dEaXJlY3Rpb24s IGludHJpbnNpY1dpZHRoTW9kZSA/IFVzZUNvbXB1dGVkVmFsdWVzOjpZZXMgOiBVc2VDb21wdXRl ZFZhbHVlczo6Tm8pOwotICAgIGF1dG8gcGFkZGluZyA9IGxvZ2ljYWxQYWRkaW5nKHJlbmRlckJv eCwgaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiwgYmxvY2tGbG93RGlyZWN0aW9uLCBpbnRy aW5zaWNXaWR0aE1vZGUgPyBVc2VDb21wdXRlZFZhbHVlczo6WWVzIDogVXNlQ29tcHV0ZWRWYWx1 ZXM6Ok5vKTsKKyAgICBhdXRvIGlubGluZU1hcmdpbiA9IGhvcml6b250YWxMb2dpY2FsTWFyZ2lu KHJlbmRlckJveCwgaXNMZWZ0VG9SaWdodElubGluZURpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUpOworICAgIGF1dG8gYm9yZGVyID0gbG9naWNhbEJvcmRlcihyZW5kZXJCb3gsIGlz TGVmdFRvUmlnaHRJbmxpbmVEaXJlY3Rpb24sIGJsb2NrRmxvd0RpcmVjdGlvbik7CisgICAgYXV0 byBwYWRkaW5nID0gbG9naWNhbFBhZGRpbmcocmVuZGVyQm94LCBpc0xlZnRUb1JpZ2h0SW5saW5l RGlyZWN0aW9uLCBibG9ja0Zsb3dEaXJlY3Rpb24pOwogICAgIGF1dG8gc2Nyb2xsYmFyU2l6ZSA9 IHNjcm9sbGJhckxvZ2ljYWxTaXplKHJlbmRlckJveCk7CiAKLSAgICBpZiAoaW50cmluc2ljV2lk dGhNb2RlKSB7Ci0gICAgICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxTcGFjZUZvclNjcm9s bGJhcihzY3JvbGxiYXJTaXplLndpZHRoKCkpOwotICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250 ZW50Qm94V2lkdGgoKmludHJpbnNpY1dpZHRoTW9kZSA9PSBMYXlvdXQ6OkludHJpbnNpY1dpZHRo TW9kZTo6TWluaW11bSA/IHJlbmRlckJveC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSA6IHJl bmRlckJveC5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSk7Ci0gICAgICAgIGJveEdlb21ldHJ5 LnNldEhvcml6b250YWxNYXJnaW4oaW5saW5lTWFyZ2luKTsKLSAgICAgICAgYm94R2VvbWV0cnku c2V0SG9yaXpvbnRhbEJvcmRlcihib3JkZXIuaG9yaXpvbnRhbCk7Ci0gICAgICAgIGJveEdlb21l dHJ5LnNldEhvcml6b250YWxQYWRkaW5nKHBhZGRpbmcuaG9yaXpvbnRhbCk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0KICAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsU3BhY2VGb3JTY3Jv bGxiYXIoc2Nyb2xsYmFyU2l6ZS53aWR0aCgpKTsKICAgICBib3hHZW9tZXRyeS5zZXRWZXJ0aWNh bFNwYWNlRm9yU2Nyb2xsYmFyKHNjcm9sbGJhclNpemUuaGVpZ2h0KCkpOwogCkBAIC0zNjYsNiAr MzU1LDE4IEBAIHZvaWQgQm94R2VvbWV0cnlVcGRhdGVyOjpzZXRHZW9tZXRyaWVzRm9ySW50cmlu c2ljV2lkdGgoTGF5b3V0OjpJbnRyaW5zaWNXaWR0aE1vCiAgICAgICAgICAgICB1cGRhdGVJbmxp bmVCb3hEaW1lbnNpb25zKCpyZW5kZXJJbmxpbmUsIGludHJpbnNpY1dpZHRoTW9kZSk7CiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorICAgICAgICBpZiAoYXV0byogcmVuZGVyQm94 ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIpKSB7CisgICAgICAgICAgICAv LyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIGZsZXhpbmcgYm94ZXMuCisgICAgICAgICAgICBBU1NF UlQocmVuZGVyQm94LT5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzRml4ZWQoKSk7CisKKyAgICAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gbGF5b3V0U3RhdGUoKS5lbnN1cmVHZW9tZXRyeUZv ckJveChib3hUcmVlKCkubGF5b3V0Qm94Rm9yUmVuZGVyZXIoKnJlbmRlckJveCkpOworICAgICAg ICAgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdpbihob3Jpem9udGFsTG9naWNhbE1h cmdpbigqcmVuZGVyQm94LCByZW5kZXJCb3gtPnBhcmVudCgpLT5zdHlsZSgpLmlzTGVmdFRvUmln aHREaXJlY3Rpb24oKSwgcmVuZGVyQm94LT5wYXJlbnQoKS0+c3R5bGUoKS5pc0hvcml6b250YWxX cml0aW5nTW9kZSgpLCBVc2VDb21wdXRlZFZhbHVlczo6WWVzKSk7CisgICAgICAgICAgICBib3hH ZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoaW50cmluc2ljV2lkdGhNb2RlID09IExheW91dDo6 SW50cmluc2ljV2lkdGhNb2RlOjpNaW5pbXVtID8gcmVuZGVyQm94LT5taW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGgoKSA6IHJlbmRlckJveC0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkpOworICAg ICAgICAgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbFNwYWNlRm9yU2Nyb2xsYmFyKHsgfSk7 CisgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsQm9yZGVyKHsgfSk7CisgICAg ICAgICAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsUGFkZGluZyh7IH0pOworICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgIH0KICAgICAgICAgQVNTRVJUKGlzPFJlbmRlclRleHQ+KHJl bmRlcmVyKSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlv bkJveEdlb21ldHJ5VXBkYXRlci5oCmluZGV4IDk4ZDUwOTQ1N2Y5Yy4uYzQ4YjM5NjNmMTUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vaW5saW5lL0xheW91 dEludGVncmF0aW9uQm94R2VvbWV0cnlVcGRhdGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRl ci5oCkBAIC01MywxMCArNTMsMTAgQEAgcHVibGljOgogICAgIEhhc2hNYXA8Y29uc3QgTGF5b3V0 OjpFbGVtZW50Qm94KiwgTGF5b3V0VW5pdD4gdGFrZU5lc3RlZExpc3RNYXJrZXJPZmZzZXRzKCkg eyByZXR1cm4gV1RGTW92ZShtX25lc3RlZExpc3RNYXJrZXJPZmZzZXRzKTsgfQogCiBwcml2YXRl OgotICAgIHZvaWQgdXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyhjb25zdCBSZW5kZXJCb3gmLCBz dGQ6Om9wdGlvbmFsPExheW91dDo6SW50cmluc2ljV2lkdGhNb2RlPiA9IHN0ZDo6bnVsbG9wdCk7 CisgICAgdm9pZCB1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYpOwog ICAgIHZvaWQgdXBkYXRlTGluZUJyZWFrQm94RGltZW5zaW9ucyhjb25zdCBSZW5kZXJMaW5lQnJl YWsmKTsKICAgICB2b2lkIHVwZGF0ZUlubGluZUJveERpbWVuc2lvbnMoY29uc3QgUmVuZGVySW5s aW5lJiwgc3RkOjpvcHRpb25hbDxMYXlvdXQ6OkludHJpbnNpY1dpZHRoTW9kZT4gPSBzdGQ6Om51 bGxvcHQpOwotICAgIHZvaWQgdXBkYXRlTGlzdE1hcmtlckRpbWVuc2lvbnMoY29uc3QgUmVuZGVy TGlzdE1hcmtlciYsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0OjpJbnRyaW5zaWNXaWR0aE1vZGU+ID0g c3RkOjpudWxsb3B0KTsKKyAgICB2b2lkIHVwZGF0ZUxpc3RNYXJrZXJEaW1lbnNpb25zKGNvbnN0 IFJlbmRlckxpc3RNYXJrZXImKTsKIAogICAgIEJveFRyZWUmIGJveFRyZWUoKSB7IHJldHVybiAq bV9ib3hUcmVlOyB9CiAgICAgY29uc3QgQm94VHJlZSYgYm94VHJlZSgpIGNvbnN0IHsgcmV0dXJu ICptX2JveFRyZWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0 LmNwcAppbmRleCBiOWY1YThhYzc3NzMuLjk5NWFkZmUzZTM0YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVM YXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUv TGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtMjYwLDcgKzI2MCw5IEBAIHN0ZDo6 cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBMaW5lTGF5b3V0Ojpjb21wdXRlSW50cmluc2lj V2lkdGhDb25zdHJhaW50cygpCiAgICAgYXV0byBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCA9IExh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQgeyByb290TGF5b3V0Qm94KCksIGxheW91dFN0 YXRlKCksIHBhcmVudEJsb2NrTGF5b3V0U3RhdGUgfTsKICAgICBpZiAobV9saW5lRGFtYWdlKQog ICAgICAgICBtX2lubGluZUNvbnRlbnRDYWNoZS5yZXNldE1pbmltdW1NYXhpbXVtQ29udGVudFNp emVzKCk7Ci0gICAgLy8gRklYTUU6IFRoaXMgaXMgd2hlcmUgd2UgbmVlZCB0byBzd2l0Y2ggYmV0 d2VlbiBtaW5pbXVtIGFuZCBtYXhpbXVtIGJveCBnZW9tZXRyaWVzLgorCisgICAgLy8gRklYTUU6 IFRoaXMgaXMgd2hlcmUgd2UgbmVlZCB0byBzd2l0Y2ggYmV0d2VlbiBtaW5pbXVtIGFuZCBtYXhp bXVtIGJveCBnZW9tZXRyaWVzIChyaWdodCBub3cgbWluID09IG1heCBhcyBmYXIgYXMgaW5saW5l IGxldmVsIGJveGVzIGFyZSBjb25jZXJuZWQpCisgICAgbV9ib3hHZW9tZXRyeVVwZGF0ZXIuc2V0 R2VvbWV0cmllc0ZvckludHJpbnNpY1dpZHRoKExheW91dDo6SW50cmluc2ljV2lkdGhNb2RlOjpN aW5pbXVtKTsKICAgICBhdXRvIFttaW5pbXVtQ29udGVudFNpemUsIG1heGltdW1Db250ZW50U2l6 ZV0gPSBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5taW5pbXVtTWF4aW11bUNvbnRlbnRTaXplKG1f bGluZURhbWFnZS5nZXQoKSk7CiAgICAgcmV0dXJuIHsgbWluaW11bUNvbnRlbnRTaXplLCBtYXhp bXVtQ29udGVudFNpemUgfTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHAKaW5kZXggNzNlMThlZDRhMmI0Li41ZjBjNGUxMmU5ZmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC00OTk4LDggKzQ5OTgs NiBAQCBib29sIFJlbmRlckJsb2NrRmxvdzo6dHJ5Q29tcHV0ZVByZWZlcnJlZFdpZHRoc1VzaW5n TW9kZXJuUGF0aChMYXlvdXRVbml0JiBtaW5MbwogICAgIGlmICghbW9kZXJuTGluZUxheW91dCgp KQogICAgICAgICBtX2xpbmVMYXlvdXQgPSBtYWtlVW5pcXVlPExheW91dEludGVncmF0aW9uOjpM aW5lTGF5b3V0PigqdGhpcyk7CiAKLSAgICBtb2Rlcm5MaW5lTGF5b3V0KCktPnVwZGF0ZUlubGlu ZUNvbnRlbnREaW1lbnNpb25zKCk7Ci0KICAgICBzdGQ6OnRpZShtaW5Mb2dpY2FsV2lkdGgsIG1h eExvZ2ljYWxXaWR0aCkgPSBtb2Rlcm5MaW5lTGF5b3V0KCktPmNvbXB1dGVJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzKCk7CiAgICAgZm9yIChhdXRvIHdhbGtlciA9IElubGluZVdhbGtlcigqdGhp cyk7ICF3YWxrZXIuYXRFbmQoKTsgd2Fsa2VyLmFkdmFuY2UoKSkgewogICAgICAgICBhdXRvKiBy ZW5kZXJlciA9IHdhbGtlci5jdXJyZW50KCk7Cg== 470402 2024-03-17 06:04:59 -0700 2024-03-17 08:37:45 -0700 [fast-cq]Patch bug-271016-20240317060458.patch text/plain 3758 zalan RnJvbSBkMWIxYmRhZTkzNWQyNGM2MzgwZDg1ZmViMWI2OTVjMGQyN2FjNzc1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFN1biwgMTcgTWFyIDIwMjQgMDY6MDM6NDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtJ bnRyaW5zaWMgd2lkdGhdIEFkZCBzdXBwb3J0IGZvciBjb250ZW50IHdpdGggZml4ZWQKIChsb2dp Y2FsKSB3aWR0aCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjcxMDE2 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwOgooV2ViQ29yZTo6TGF5b3V0 SW50ZWdyYXRpb246OmNhblVzZUZvclByZWZlcnJlZFdpZHRoQ29tcHV0YXRpb24pOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hH ZW9tZXRyeVVwZGF0ZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveEdlb21l dHJ5VXBkYXRlcjo6dXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyk6CihXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6Qm94R2VvbWV0cnlVcGRhdGVyOjpzZXRHZW9tZXRyaWVzRm9ySW50cmluc2lj V2lkdGgpOgotLS0KIC4uLi9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3Zl cmFnZS5jcHAgIHwgIDcgKysrKysrKwogLi4uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdl b21ldHJ5VXBkYXRlci5jcHAgICAgfCAxMSArKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAx NyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2Uu Y3BwCmluZGV4IDU0ZmViMWY4ZDMwOS4uYjU1MzBhMjRjMDVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Q292ZXJhZ2UuY3BwCkBAIC03OCw2ICs3OCwxMyBAQCBib29sIGNhblVzZUZvclByZWZlcnJlZFdp ZHRoQ29tcHV0YXRpb24oY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9ja0NvbnRhaW5lcikKICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBpZiAoaXM8UmVuZGVySW5saW5lPihyZW5kZXJl cikpCiAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKHJlbmRlcmVyLmlzSW5GbG93 KCkgJiYgcmVuZGVyZXIuc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYmIHJlbmRl cmVyLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNGaXhlZCgpKSB7CisgICAgICAgICAgICAvLyBG SVhNRTogSW1wbGVtZW50IHRoaXMgaW1hZ2Ugc3BlY2lhbCBpbiBsaW5lIGJ1aWxkZXIuCisgICAg ICAgICAgICBhdXRvIGFsbG93SW1hZ2VzVG9CcmVhayA9ICFibG9ja0NvbnRhaW5lci5kb2N1bWVu dCgpLmluUXVpcmtzTW9kZSgpIHx8ICFibG9ja0NvbnRhaW5lci5pc1JlbmRlclRhYmxlQ2VsbCgp OworICAgICAgICAgICAgaWYgKCFhbGxvd0ltYWdlc1RvQnJlYWspCisgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hH ZW9tZXRyeVVwZGF0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lu bGluZS9MYXlvdXRJbnRlZ3JhdGlvbkJveEdlb21ldHJ5VXBkYXRlci5jcHAKaW5kZXggMDdkMmVl ODc0YjAzLi40MGY1MThhZDkyMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50 ZWdyYXRpb25Cb3hHZW9tZXRyeVVwZGF0ZXIuY3BwCkBAIC0yMzEsNyArMjMxLDExIEBAIHZvaWQg Qm94R2VvbWV0cnlVcGRhdGVyOjp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRl ckJveCYgcmVuZGVyQm94LCBzCiAKICAgICBpZiAoaW50cmluc2ljV2lkdGhNb2RlKSB7CiAgICAg ICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxTcGFjZUZvclNjcm9sbGJhcihzY3JvbGxiYXJT aXplLndpZHRoKCkpOwotICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoKmlu dHJpbnNpY1dpZHRoTW9kZSA9PSBMYXlvdXQ6OkludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSA/ IHJlbmRlckJveC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSA6IHJlbmRlckJveC5tYXhQcmVm ZXJyZWRMb2dpY2FsV2lkdGgoKSk7CisgICAgICAgIGF1dG8gY29udGVudEJveExvZ2ljYWxXaWR0 aCA9IFsmXSB7CisgICAgICAgICAgICBhdXRvIHByZWZlcnJlZFdpZHRoID0gKmludHJpbnNpY1dp ZHRoTW9kZSA9PSBMYXlvdXQ6OkludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSA/IHJlbmRlckJv eC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSA6IHJlbmRlckJveC5tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGgoKTsKKyAgICAgICAgICAgIHJldHVybiBwcmVmZXJyZWRXaWR0aCAtIChib3JkZXIu aG9yaXpvbnRhbC5zdGFydCArIGJvcmRlci5ob3Jpem9udGFsLmVuZCArIHBhZGRpbmcuaG9yaXpv bnRhbC5zdGFydCArIHBhZGRpbmcuaG9yaXpvbnRhbC5lbmQpOworICAgICAgICB9OworICAgICAg ICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94V2lkdGgoY29udGVudEJveExvZ2ljYWxXaWR0aCgp KTsKICAgICAgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdpbihpbmxpbmVNYXJnaW4p OwogICAgICAgICBib3hHZW9tZXRyeS5zZXRIb3Jpem9udGFsQm9yZGVyKGJvcmRlci5ob3Jpem9u dGFsKTsKICAgICAgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbFBhZGRpbmcocGFkZGluZy5o b3Jpem9udGFsKTsKQEAgLTM3Miw2ICszNzYsMTEgQEAgdm9pZCBCb3hHZW9tZXRyeVVwZGF0ZXI6 OnNldEdlb21ldHJpZXNGb3JJbnRyaW5zaWNXaWR0aChMYXlvdXQ6OkludHJpbnNpY1dpZHRoTW8K ICAgICAgICAgICAgIHVwZGF0ZUlubGluZUJveERpbWVuc2lvbnMoKnJlbmRlcklubGluZSwgaW50 cmluc2ljV2lkdGhNb2RlKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CisgICAg ICAgIGlmIChhdXRvKiByZW5kZXJCb3ggPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyQm94PihyZW5k ZXJlcikpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgZmxleGluZyBi b3hlcy4KKyAgICAgICAgICAgIEFTU0VSVChyZW5kZXJCb3gtPnN0eWxlKCkubG9naWNhbFdpZHRo KCkuaXNGaXhlZCgpKTsKKyAgICAgICAgICAgIHVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMoKnJl bmRlckJveCwgaW50cmluc2ljV2lkdGhNb2RlKTsKKyAgICAgICAgfQogICAgIH0KIH0KIAo=