234460 2021-12-17 20:48:18 -0800 [LFC][IFC] text-indent is treated as a margin applied to the start edge of the line box. 2021-12-19 11:47:18 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1825299 0 zalan 2021-12-17 20:48:18 -0800 https://drafts.csswg.org/css-text/#text-indent-property 1825300 1 447509 zalan 2021-12-17 21:01:43 -0800 Created attachment 447509 Patch 1825305 2 447512 zalan 2021-12-17 21:24:04 -0800 Created attachment 447512 Patch 1825447 3 447549 zalan 2021-12-19 09:32:29 -0800 Created attachment 447549 [fast-cq]Patch 1825452 4 ews-feeder 2021-12-19 10:42:30 -0800 ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. 1825453 5 447550 zalan 2021-12-19 10:43:24 -0800 Created attachment 447550 Patch 1825462 6 ews-feeder 2021-12-19 11:46:02 -0800 Committed r287244 (245402@main): <https://commits.webkit.org/245402@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447550. 1825463 7 webkit-bug-importer 2021-12-19 11:47:18 -0800 <rdar://problem/86697025> 447509 2021-12-17 21:01:43 -0800 2021-12-17 21:25:58 -0800 Patch bug-234460-20211217210143.patch text/plain 7466 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRiYjFjOWRjNjJjOGFm YzQyMGY4NGViYzIxY2QwOWU5ZGYzMjFiYS4uNjY5NjFkYmI2NWY5N2Y5YzMwOWVlY2Y3MWE1MmFj YmQxY2U2N2JkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIHRleHQtaW5k ZW50IGlzIHRyZWF0ZWQgYXMgYSBtYXJnaW4gYXBwbGllZCB0byB0aGUgc3RhcnQgZWRnZSBvZiB0 aGUgbGluZSBib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQ0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTZWUgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyN0ZXh0LWluZGVudC1w cm9wZXJ0eQorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIGFkanVzdGlu ZyB0aGUgZGlzcGxheSBsaW5lIGdlb21ldHJ5IHdoZW4gdGhlIGlubGluZSBheGlzIGRpcmVjdGlv biBpcyBydGwuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0Lmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJlY3Q6Om1vdmVMZWZ0QnkpOgorCiAyMDIxLTEyLTE3 ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFk anVzdCB0aGUgYm94IGdlb21ldHJ5IGZvciBhdG9taWMvZ2VuZXJpYyBpbmxpbmUgbGV2ZWwgYm94 ZXMgaW4gYmlkaSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAKaW5kZXggMzQyM2ZmMzc2OTRkYTcyOWUwMjI1YWM2NGEzMDYzNjY1NDE5YjlkMS4uNDNjNDUz YWRmNGUwZWQxYWU2MmFkYjVjODljNzljZTVjMDcxNGI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjg4LDYgKzI4OCwxMSBAQCBMaW5lQnVpbGRlcjo6 TGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRp bmdDb250ZXh0LAogewogfQogCitzdHJ1Y3QgVXNlZENvbnN0cmFpbnRzIHsKKyAgICBJbmxpbmVS ZWN0IGxvZ2ljYWxSZWN0OworICAgIElubGluZUxheW91dFVuaXQgbWFyZ2luU3RhcnQgeyAwIH07 CisgICAgYm9vbCBpc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07Cit9OwogTGluZUJ1aWxk ZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElu bGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5nZSwgc2l6ZV90IHBhcnRpYWxMZWFkaW5nQ29u dGVudExlbmd0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBvdmVyZmxvd2luZ0xv Z2ljYWxXaWR0aCwgY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgYm9v bCBpc0ZpcnN0TGluZSkKIHsKICAgICBpbml0aWFsaXplKGluaXRpYWxDb25zdHJhaW50c0Zvckxp bmUoaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgaXNGaXJzdExpbmUpLCBpc0ZpcnN0TGluZSwgbmVl ZHNMYXlvdXRSYW5nZS5zdGFydCwgcGFydGlhbExlYWRpbmdDb250ZW50TGVuZ3RoLCBvdmVyZmxv d2luZ0xvZ2ljYWxXaWR0aCk7CkBAIC0zMzIsNiArMzM3LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVD b250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1S YW5nZSYKICAgICAgICAgLCBjb21taXR0ZWRDb250ZW50Lm92ZXJmbG93TG9naWNhbFdpZHRoCiAg ICAgICAgICwgbV9mbG9hdHMKICAgICAgICAgLCBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9h dAorICAgICAgICAsIG1fbGluZU1hcmdpblN0YXJ0CiAgICAgICAgICwgbV9saW5lTG9naWNhbFJl Y3QudG9wTGVmdCgpCiAgICAgICAgICwgbV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKQogICAgICAg ICAsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkKQEAgLTM5NSw3ICs0MDEsOSBAQCB2b2lk IExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IFVzZWRDb25zdHJhaW50cyYgbGluZUNvbnN0 cmFpbnRzLCBib29sIGlzRmlycwogICAgIGNyZWF0ZUxpbmVTcGFubmluZ0lubGluZUJveGVzKCk7 CiAgICAgbV9saW5lLmluaXRpYWxpemUobV9saW5lU3Bhbm5pbmdJbmxpbmVCb3hlcyk7CiAKKyAg ICBtX2xpbmVNYXJnaW5TdGFydCA9IGxpbmVDb25zdHJhaW50cy5tYXJnaW5TdGFydDsKICAgICBt X2xpbmVMb2dpY2FsUmVjdCA9IGxpbmVDb25zdHJhaW50cy5sb2dpY2FsUmVjdDsKKyAgICBtX2xp bmVMb2dpY2FsUmVjdC5tb3ZlTGVmdEJ5KG1fbGluZU1hcmdpblN0YXJ0KTsKICAgICBtX2NvbnRl bnRJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IGxpbmVDb25zdHJhaW50cy5pc0NvbnN0cmFpbmVkQnlG bG9hdDsKIAogICAgIGlmIChwYXJ0aWFsTGVhZGluZ0NvbnRlbnRMZW5ndGgpIHsKQEAgLTU0Nyw3 ICs1NTUsNyBAQCBzdGQ6Om9wdGlvbmFsPEhvcml6b250YWxDb25zdHJhaW50cz4gTGluZUJ1aWxk ZXI6OmZsb2F0Q29uc3RyYWludHMoY29uc3QgSW5saW5lUgogICAgIHJldHVybiBIb3Jpem9udGFs Q29uc3RyYWludHMgeyB0b0xheW91dFVuaXQobGluZUxvZ2ljYWxMZWZ0KSwgdG9MYXlvdXRVbml0 KGxpbmVMb2dpY2FsUmlnaHQgLSBsaW5lTG9naWNhbExlZnQpIH07CiB9CiAKLUxpbmVCdWlsZGVy OjpVc2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6OmluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUo Y29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGlu ZSkgY29uc3QKK1VzZWRDb25zdHJhaW50cyBMaW5lQnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRz Rm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LCBib29sIGlz Rmlyc3RMaW5lKSBjb25zdAogewogICAgIGF1dG8gbGluZUxvZ2ljYWxMZWZ0ID0gaW5pdGlhbExp bmVMb2dpY2FsUmVjdC5sZWZ0KCk7CiAgICAgYXV0byBsaW5lTG9naWNhbFJpZ2h0ID0gaW5pdGlh bExpbmVMb2dpY2FsUmVjdC5yaWdodCgpOwpAQCAtNTk4LDggKzYwNiw3IEBAIExpbmVCdWlsZGVy OjpVc2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6OmluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUo Y29uc3QgSW5saW5lCiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHsgbWluaW11bVZhbHVlRm9y TGVuZ3RoKHRleHRJbmRlbnQsIGluaXRpYWxMaW5lTG9naWNhbFJlY3Qud2lkdGgoKSkgfTsKICAg ICB9OwotICAgIGxpbmVMb2dpY2FsTGVmdCArPSBjb21wdXRlZFRleHRJbmRlbnQoKTsKLSAgICBy ZXR1cm4gVXNlZENvbnN0cmFpbnRzIHsgeyBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LnRvcCgpLCBs aW5lTG9naWNhbExlZnQsIGxpbmVMb2dpY2FsUmlnaHQgLSBsaW5lTG9naWNhbExlZnQsIGluaXRp YWxMaW5lTG9naWNhbFJlY3QuaGVpZ2h0KCkgfSwgbGluZUlzQ29uc3RyYWluZWRCeUZsb2F0IH07 CisgICAgcmV0dXJuIFVzZWRDb25zdHJhaW50cyB7IHsgaW5pdGlhbExpbmVMb2dpY2FsUmVjdC50 b3AoKSwgbGluZUxvZ2ljYWxMZWZ0LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0 LCBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LmhlaWdodCgpIH0sIGNvbXB1dGVkVGV4dEluZGVudCgp LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgfTsKIH0KIAogdm9pZCBMaW5lQnVpbGRlcjo6Y2Fu ZGlkYXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSwgc2l6ZV90 IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgsIGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFu Z2UsIElubGluZUxheW91dFVuaXQgY3VycmVudExvZ2ljYWxSaWdodCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IDNhODc2NTA5NDhmOTc0ZDA5NmJjOGQzOWRjNTJl Y2FkOTNlZWM5ZmMuLjI5ODE4YzFiNWUyYTA0YWE0MGU0MDRjZTEyOWNjOGY3MjZkOWIxNjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtMzcsNiArMzcsNyBAQCBu YW1lc3BhY2UgTGF5b3V0IHsKIAogY2xhc3MgRmxvYXRpbmdDb250ZXh0Owogc3RydWN0IExpbmVD YW5kaWRhdGU7CitzdHJ1Y3QgVXNlZENvbnN0cmFpbnRzOwogCiBjbGFzcyBMaW5lQnVpbGRlciB7 CiBwdWJsaWM6CkBAIC01Niw3ICs1Nyw4IEBAIHB1YmxpYzoKICAgICAgICAgc3RkOjpvcHRpb25h bDxJbmxpbmVMYXlvdXRVbml0PiBvdmVyZmxvd0xvZ2ljYWxXaWR0aDsKICAgICAgICAgY29uc3Qg RmxvYXRMaXN0JiBmbG9hdHM7CiAgICAgICAgIGJvb2wgaGFzSW50cnVzaXZlRmxvYXQgeyBmYWxz ZSB9OwotICAgICAgICBJbmxpbmVMYXlvdXRQb2ludCBsb2dpY2FsVG9wTGVmdDsKKyAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBsaW5lTWFyZ2luU3RhcnQgeyAwIH07CisgICAgICAgIElubGluZUxh eW91dFBvaW50IGxpbmVMb2dpY2FsVG9wTGVmdDsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBs aW5lTG9naWNhbFdpZHRoIHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRM b2dpY2FsV2lkdGggeyAwIH07CiAgICAgICAgIElubGluZUxheW91dFVuaXQgaGFuZ2luZ1doaXRl c3BhY2VXaWR0aCB7IDAgfTsKQEAgLTg4LDEwICs5MCw2IEBAIHByaXZhdGU6CiAgICAgICAgIHNp emVfdCBwYXJ0aWFsVHJhaWxpbmdDb250ZW50TGVuZ3RoIHsgMCB9OwogICAgICAgICBzdGQ6Om9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IG92ZXJmbG93TG9naWNhbFdpZHRoIHsgfTsKICAgICB9 OwotICAgIHN0cnVjdCBVc2VkQ29uc3RyYWludHMgewotICAgICAgICBJbmxpbmVSZWN0IGxvZ2lj YWxSZWN0OwotICAgICAgICBib29sIGlzQ29uc3RyYWluZWRCeUZsb2F0IHsgZmFsc2UgfTsKLSAg ICB9OwogICAgIFVzZWRDb25zdHJhaW50cyBpbml0aWFsQ29uc3RyYWludHNGb3JMaW5lKGNvbnN0 IElubGluZVJlY3QmIGluaXRpYWxMaW5lTG9naWNhbFJlY3QsIGJvb2wgaXNGaXJzdExpbmUpIGNv bnN0OwogICAgIHN0ZDo6b3B0aW9uYWw8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiBmbG9hdENvbnN0 cmFpbnRzKGNvbnN0IElubGluZVJlY3QmIGxpbmVMb2dpY2FsUmVjdCkgY29uc3Q7CiAKQEAgLTEz Miw2ICsxMzAsNyBAQCBwcml2YXRlOgogCiAgICAgTGluZSBtX2xpbmU7CiAgICAgSW5saW5lUmVj dCBtX2xpbmVMb2dpY2FsUmVjdDsKKyAgICBJbmxpbmVMYXlvdXRVbml0IG1fbGluZU1hcmdpblN0 YXJ0IHsgMCB9OwogICAgIGNvbnN0IElubGluZUl0ZW1zJiBtX2lubGluZUl0ZW1zOwogICAgIEZs b2F0TGlzdCBtX2Zsb2F0czsKICAgICBzdGQ6Om9wdGlvbmFsPElubGluZVRleHRJdGVtPiBtX3Bh cnRpYWxMZWFkaW5nVGV4dEl0ZW07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0LmgKaW5kZXggZDZjMGM1 OWRiOTRjNjhjYTlkNzE2YTI4NTZkOGZjNzg4NWUyYjBmNi4uZmZiMDc3YmEyMTVmM2M5ODIyOGRi ZTRlZDE3MTRhNDQ3Y2JkMjY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lUmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVJlY3QuaApAQCAtNjIsNiAr NjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBtb3ZlSG9yaXpvbnRhbGx5KElubGluZUxheW91dFVu aXQpOwogICAgIHZvaWQgbW92ZVZlcnRpY2FsbHkoSW5saW5lTGF5b3V0VW5pdCk7CiAgICAgdm9p ZCBtb3ZlQnkoSW5saW5lTGF5b3V0UG9pbnQpOworICAgIHZvaWQgbW92ZUxlZnRCeShJbmxpbmVM YXlvdXRVbml0KTsKIAogICAgIHZvaWQgZXhwYW5kKHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0 VW5pdD4sIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4pOwogICAgIHZvaWQgZXhwYW5k VG9Db250YWluKGNvbnN0IElubGluZVJlY3QmKTsKQEAgLTI2OSw2ICsyNzAsMTMgQEAgaW5saW5l IHZvaWQgSW5saW5lUmVjdDo6bW92ZUJ5KElubGluZUxheW91dFBvaW50IG9mZnNldCkKICAgICBt X3JlY3QubW92ZUJ5KG9mZnNldCk7CiB9CiAKK2lubGluZSB2b2lkIElubGluZVJlY3Q6Om1vdmVM ZWZ0QnkoSW5saW5lTGF5b3V0VW5pdCBvZmZzZXQpCit7CisgICAgQVNTRVJUKG1faGFzVmFsaWRU b3ApOworICAgIEFTU0VSVChtX2hhc1ZhbGlkTGVmdCk7CisgICAgbV9yZWN0LnNoaWZ0WEVkZ2VC eShvZmZzZXQpOworfQorCiBpbmxpbmUgdm9pZCBJbmxpbmVSZWN0OjpleHBhbmQoc3RkOjpvcHRp b25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRV bml0PiBoZWlnaHQpCiB7CiAgICAgQVNTRVJUKCF3aWR0aCB8fCBtX2hhc1ZhbGlkV2lkdGgpOwo= 447512 2021-12-17 21:24:04 -0800 2021-12-19 09:32:27 -0800 Patch bug-234460-20211217212403.patch text/plain 8690 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRiYjFjOWRjNjJjOGFm YzQyMGY4NGViYzIxY2QwOWU5ZGYzMjFiYS4uNjY5NjFkYmI2NWY5N2Y5YzMwOWVlY2Y3MWE1MmFj YmQxY2U2N2JkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIHRleHQtaW5k ZW50IGlzIHRyZWF0ZWQgYXMgYSBtYXJnaW4gYXBwbGllZCB0byB0aGUgc3RhcnQgZWRnZSBvZiB0 aGUgbGluZSBib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQ0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTZWUgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyN0ZXh0LWluZGVudC1w cm9wZXJ0eQorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIGFkanVzdGlu ZyB0aGUgZGlzcGxheSBsaW5lIGdlb21ldHJ5IHdoZW4gdGhlIGlubGluZSBheGlzIGRpcmVjdGlv biBpcyBydGwuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0Lmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJlY3Q6Om1vdmVMZWZ0QnkpOgorCiAyMDIxLTEyLTE3 ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFk anVzdCB0aGUgYm94IGdlb21ldHJ5IGZvciBhdG9taWMvZ2VuZXJpYyBpbmxpbmUgbGV2ZWwgYm94 ZXMgaW4gYmlkaSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAKaW5kZXggNjIxZjdlMTJiMGEzNTRmZmQ2ODMyNGFhOWY2NzU3NDg5Yjg3MjdiZi4u ZDdhNzQ3NDAwYjQzZDJmN2ZhZDI5MWE4OGFmY2I4Y2Y2YTEyZDI3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMTEyLDcgKzExMiw3IEBAIExp bmVCb3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IGNv bnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBsaW5lQ29udGVudC5ydW5z LCBsaW5lSW5kZXgpOwogCiAgICAgYXV0byBsaW5lID0gWyZdIHsKLSAgICAgICAgYXV0byBsaW5l Qm94TG9naWNhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVCb3hMb2dpY2FsSGVpZ2h0IH07Cisg ICAgICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVDb250ZW50 LmxpbmVMb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aCwgbGluZUJv eExvZ2ljYWxIZWlnaHQgfTsKICAgICAgICAgYXV0byBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0ID0g bGluZUJveExvZ2ljYWxSZWN0OwogICAgICAgICBhdXRvJiByb290SW5saW5lQm94ID0gbGluZUJv eC5yb290SW5saW5lQm94KCk7CiAgICAgICAgIGF1dG8gZW5jbG9zaW5nVG9wQW5kQm90dG9tID0g SW5saW5lRGlzcGxheTo6TGluZTo6RW5jbG9zaW5nVG9wQW5kQm90dG9tIHsgbGluZUJveExvZ2lj YWxSZWN0LnRvcCgpICsgcm9vdElubGluZUJveC5sb2dpY2FsVG9wKCksIGxpbmVCb3hMb2dpY2Fs UmVjdC50b3AoKSArIHJvb3RJbmxpbmVCb3gubG9naWNhbEJvdHRvbSgpIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMzQyM2ZmMzc2OTRkYTcyOWUwMjI1 YWM2NGEzMDYzNjY1NDE5YjlkMS4uNDNjNDUzYWRmNGUwZWQxYWU2MmFkYjVjODljNzljZTVjMDcx NGI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjg4 LDYgKzI4OCwxMSBAQCBMaW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LAogewogfQogCitzdHJ1Y3QgVXNl ZENvbnN0cmFpbnRzIHsKKyAgICBJbmxpbmVSZWN0IGxvZ2ljYWxSZWN0OworICAgIElubGluZUxh eW91dFVuaXQgbWFyZ2luU3RhcnQgeyAwIH07CisgICAgYm9vbCBpc0NvbnN0cmFpbmVkQnlGbG9h dCB7IGZhbHNlIH07Cit9OwogTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjps YXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5n ZSwgc2l6ZV90IHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCwgc3RkOjpvcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiBvdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCwgY29uc3QgSW5saW5lUmVjdCYg aW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkKIHsKICAgICBpbml0aWFs aXplKGluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgaXNG aXJzdExpbmUpLCBpc0ZpcnN0TGluZSwgbmVlZHNMYXlvdXRSYW5nZS5zdGFydCwgcGFydGlhbExl YWRpbmdDb250ZW50TGVuZ3RoLCBvdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCk7CkBAIC0zMzIsNiAr MzM3LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxp bmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBjb21taXR0ZWRDb250 ZW50Lm92ZXJmbG93TG9naWNhbFdpZHRoCiAgICAgICAgICwgbV9mbG9hdHMKICAgICAgICAgLCBt X2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdAorICAgICAgICAsIG1fbGluZU1hcmdpblN0YXJ0 CiAgICAgICAgICwgbV9saW5lTG9naWNhbFJlY3QudG9wTGVmdCgpCiAgICAgICAgICwgbV9saW5l TG9naWNhbFJlY3Qud2lkdGgoKQogICAgICAgICAsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCkKQEAgLTM5NSw3ICs0MDEsOSBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0 IFVzZWRDb25zdHJhaW50cyYgbGluZUNvbnN0cmFpbnRzLCBib29sIGlzRmlycwogICAgIGNyZWF0 ZUxpbmVTcGFubmluZ0lubGluZUJveGVzKCk7CiAgICAgbV9saW5lLmluaXRpYWxpemUobV9saW5l U3Bhbm5pbmdJbmxpbmVCb3hlcyk7CiAKKyAgICBtX2xpbmVNYXJnaW5TdGFydCA9IGxpbmVDb25z dHJhaW50cy5tYXJnaW5TdGFydDsKICAgICBtX2xpbmVMb2dpY2FsUmVjdCA9IGxpbmVDb25zdHJh aW50cy5sb2dpY2FsUmVjdDsKKyAgICBtX2xpbmVMb2dpY2FsUmVjdC5tb3ZlTGVmdEJ5KG1fbGlu ZU1hcmdpblN0YXJ0KTsKICAgICBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IGxpbmVD b25zdHJhaW50cy5pc0NvbnN0cmFpbmVkQnlGbG9hdDsKIAogICAgIGlmIChwYXJ0aWFsTGVhZGlu Z0NvbnRlbnRMZW5ndGgpIHsKQEAgLTU0Nyw3ICs1NTUsNyBAQCBzdGQ6Om9wdGlvbmFsPEhvcml6 b250YWxDb25zdHJhaW50cz4gTGluZUJ1aWxkZXI6OmZsb2F0Q29uc3RyYWludHMoY29uc3QgSW5s aW5lUgogICAgIHJldHVybiBIb3Jpem9udGFsQ29uc3RyYWludHMgeyB0b0xheW91dFVuaXQobGlu ZUxvZ2ljYWxMZWZ0KSwgdG9MYXlvdXRVbml0KGxpbmVMb2dpY2FsUmlnaHQgLSBsaW5lTG9naWNh bExlZnQpIH07CiB9CiAKLUxpbmVCdWlsZGVyOjpVc2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6 OmluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVM b2dpY2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkgY29uc3QKK1VzZWRDb25zdHJhaW50cyBMaW5l QnVpbGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBpbml0 aWFsTGluZUxvZ2ljYWxSZWN0LCBib29sIGlzRmlyc3RMaW5lKSBjb25zdAogewogICAgIGF1dG8g bGluZUxvZ2ljYWxMZWZ0ID0gaW5pdGlhbExpbmVMb2dpY2FsUmVjdC5sZWZ0KCk7CiAgICAgYXV0 byBsaW5lTG9naWNhbFJpZ2h0ID0gaW5pdGlhbExpbmVMb2dpY2FsUmVjdC5yaWdodCgpOwpAQCAt NTk4LDggKzYwNiw3IEBAIExpbmVCdWlsZGVyOjpVc2VkQ29uc3RyYWludHMgTGluZUJ1aWxkZXI6 OmluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lCiAgICAgICAgIH0KICAgICAg ICAgcmV0dXJuIHsgbWluaW11bVZhbHVlRm9yTGVuZ3RoKHRleHRJbmRlbnQsIGluaXRpYWxMaW5l TG9naWNhbFJlY3Qud2lkdGgoKSkgfTsKICAgICB9OwotICAgIGxpbmVMb2dpY2FsTGVmdCArPSBj b21wdXRlZFRleHRJbmRlbnQoKTsKLSAgICByZXR1cm4gVXNlZENvbnN0cmFpbnRzIHsgeyBpbml0 aWFsTGluZUxvZ2ljYWxSZWN0LnRvcCgpLCBsaW5lTG9naWNhbExlZnQsIGxpbmVMb2dpY2FsUmln aHQgLSBsaW5lTG9naWNhbExlZnQsIGluaXRpYWxMaW5lTG9naWNhbFJlY3QuaGVpZ2h0KCkgfSwg bGluZUlzQ29uc3RyYWluZWRCeUZsb2F0IH07CisgICAgcmV0dXJuIFVzZWRDb25zdHJhaW50cyB7 IHsgaW5pdGlhbExpbmVMb2dpY2FsUmVjdC50b3AoKSwgbGluZUxvZ2ljYWxMZWZ0LCBsaW5lTG9n aWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0LCBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LmhlaWdo dCgpIH0sIGNvbXB1dGVkVGV4dEluZGVudCgpLCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgfTsK IH0KIAogdm9pZCBMaW5lQnVpbGRlcjo6Y2FuZGlkYXRlQ29udGVudEZvckxpbmUoTGluZUNhbmRp ZGF0ZSYgbGluZUNhbmRpZGF0ZSwgc2l6ZV90IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgsIGNvbnN0 IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UsIElubGluZUxheW91dFVuaXQgY3VycmVudExv Z2ljYWxSaWdodCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oCmluZGV4IDNh ODc2NTA5NDhmOTc0ZDA5NmJjOGQzOWRjNTJlY2FkOTNlZWM5ZmMuLjI5ODE4YzFiNWUyYTA0YWE0 MGU0MDRjZTEyOWNjOGY3MjZkOWIxNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1 aWxkZXIuaApAQCAtMzcsNiArMzcsNyBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIAogY2xhc3MgRmxv YXRpbmdDb250ZXh0Owogc3RydWN0IExpbmVDYW5kaWRhdGU7CitzdHJ1Y3QgVXNlZENvbnN0cmFp bnRzOwogCiBjbGFzcyBMaW5lQnVpbGRlciB7CiBwdWJsaWM6CkBAIC01Niw3ICs1Nyw4IEBAIHB1 YmxpYzoKICAgICAgICAgc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBvdmVyZmxvd0xv Z2ljYWxXaWR0aDsKICAgICAgICAgY29uc3QgRmxvYXRMaXN0JiBmbG9hdHM7CiAgICAgICAgIGJv b2wgaGFzSW50cnVzaXZlRmxvYXQgeyBmYWxzZSB9OwotICAgICAgICBJbmxpbmVMYXlvdXRQb2lu dCBsb2dpY2FsVG9wTGVmdDsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTWFyZ2luU3Rh cnQgeyAwIH07CisgICAgICAgIElubGluZUxheW91dFBvaW50IGxpbmVMb2dpY2FsVG9wTGVmdDsK ICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoIHsgMCB9OwogICAgICAg ICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGggeyAwIH07CiAgICAgICAgIElu bGluZUxheW91dFVuaXQgaGFuZ2luZ1doaXRlc3BhY2VXaWR0aCB7IDAgfTsKQEAgLTg4LDEwICs5 MCw2IEBAIHByaXZhdGU6CiAgICAgICAgIHNpemVfdCBwYXJ0aWFsVHJhaWxpbmdDb250ZW50TGVu Z3RoIHsgMCB9OwogICAgICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG92ZXJm bG93TG9naWNhbFdpZHRoIHsgfTsKICAgICB9OwotICAgIHN0cnVjdCBVc2VkQ29uc3RyYWludHMg ewotICAgICAgICBJbmxpbmVSZWN0IGxvZ2ljYWxSZWN0OwotICAgICAgICBib29sIGlzQ29uc3Ry YWluZWRCeUZsb2F0IHsgZmFsc2UgfTsKLSAgICB9OwogICAgIFVzZWRDb25zdHJhaW50cyBpbml0 aWFsQ29uc3RyYWludHNGb3JMaW5lKGNvbnN0IElubGluZVJlY3QmIGluaXRpYWxMaW5lTG9naWNh bFJlY3QsIGJvb2wgaXNGaXJzdExpbmUpIGNvbnN0OwogICAgIHN0ZDo6b3B0aW9uYWw8SG9yaXpv bnRhbENvbnN0cmFpbnRzPiBmbG9hdENvbnN0cmFpbnRzKGNvbnN0IElubGluZVJlY3QmIGxpbmVM b2dpY2FsUmVjdCkgY29uc3Q7CiAKQEAgLTEzMiw2ICsxMzAsNyBAQCBwcml2YXRlOgogCiAgICAg TGluZSBtX2xpbmU7CiAgICAgSW5saW5lUmVjdCBtX2xpbmVMb2dpY2FsUmVjdDsKKyAgICBJbmxp bmVMYXlvdXRVbml0IG1fbGluZU1hcmdpblN0YXJ0IHsgMCB9OwogICAgIGNvbnN0IElubGluZUl0 ZW1zJiBtX2lubGluZUl0ZW1zOwogICAgIEZsb2F0TGlzdCBtX2Zsb2F0czsKICAgICBzdGQ6Om9w dGlvbmFsPElubGluZVRleHRJdGVtPiBtX3BhcnRpYWxMZWFkaW5nVGV4dEl0ZW07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVSZWN0LmgKaW5kZXggZDZjMGM1OWRiOTRjNjhjYTlkNzE2YTI4NTZkOGZjNzg4NWUy YjBmNi4uZmZiMDc3YmEyMTVmM2M5ODIyOGRiZTRlZDE3MTRhNDQ3Y2JkMjY5MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l UmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZVJlY3QuaApAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBtb3Zl SG9yaXpvbnRhbGx5KElubGluZUxheW91dFVuaXQpOwogICAgIHZvaWQgbW92ZVZlcnRpY2FsbHko SW5saW5lTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBtb3ZlQnkoSW5saW5lTGF5b3V0UG9pbnQpOwor ICAgIHZvaWQgbW92ZUxlZnRCeShJbmxpbmVMYXlvdXRVbml0KTsKIAogICAgIHZvaWQgZXhwYW5k KHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4sIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5 b3V0VW5pdD4pOwogICAgIHZvaWQgZXhwYW5kVG9Db250YWluKGNvbnN0IElubGluZVJlY3QmKTsK QEAgLTI2OSw2ICsyNzAsMTMgQEAgaW5saW5lIHZvaWQgSW5saW5lUmVjdDo6bW92ZUJ5KElubGlu ZUxheW91dFBvaW50IG9mZnNldCkKICAgICBtX3JlY3QubW92ZUJ5KG9mZnNldCk7CiB9CiAKK2lu bGluZSB2b2lkIElubGluZVJlY3Q6Om1vdmVMZWZ0QnkoSW5saW5lTGF5b3V0VW5pdCBvZmZzZXQp Cit7CisgICAgQVNTRVJUKG1faGFzVmFsaWRUb3ApOworICAgIEFTU0VSVChtX2hhc1ZhbGlkTGVm dCk7CisgICAgbV9yZWN0LnNoaWZ0WEVkZ2VCeShvZmZzZXQpOworfQorCiBpbmxpbmUgdm9pZCBJ bmxpbmVSZWN0OjpleHBhbmQoc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCwg c3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBoZWlnaHQpCiB7CiAgICAgQVNTRVJUKCF3 aWR0aCB8fCBtX2hhc1ZhbGlkV2lkdGgpOwo= 447549 2021-12-19 09:32:29 -0800 2021-12-19 10:43:22 -0800 [fast-cq]Patch bug-234460-20211219093228.patch text/plain 8373 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRiYjFjOWRjNjJjOGFm YzQyMGY4NGViYzIxY2QwOWU5ZGYzMjFiYS4uNjY5NjFkYmI2NWY5N2Y5YzMwOWVlY2Y3MWE1MmFj YmQxY2U2N2JkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIHRleHQtaW5k ZW50IGlzIHRyZWF0ZWQgYXMgYSBtYXJnaW4gYXBwbGllZCB0byB0aGUgc3RhcnQgZWRnZSBvZiB0 aGUgbGluZSBib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQ0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTZWUgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyN0ZXh0LWluZGVudC1w cm9wZXJ0eQorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIGFkanVzdGlu ZyB0aGUgZGlzcGxheSBsaW5lIGdlb21ldHJ5IHdoZW4gdGhlIGlubGluZSBheGlzIGRpcmVjdGlv biBpcyBydGwuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0Lmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJlY3Q6Om1vdmVMZWZ0QnkpOgorCiAyMDIxLTEyLTE3 ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFk anVzdCB0aGUgYm94IGdlb21ldHJ5IGZvciBhdG9taWMvZ2VuZXJpYyBpbmxpbmUgbGV2ZWwgYm94 ZXMgaW4gYmlkaSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAKaW5kZXggNjIxZjdlMTJiMGEzNTRmZmQ2ODMyNGFhOWY2NzU3NDg5Yjg3MjdiZi4u ZDdhNzQ3NDAwYjQzZDJmN2ZhZDI5MWE4OGFmY2I4Y2Y2YTEyZDI3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMTEyLDcgKzExMiw3IEBAIExp bmVCb3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IGNv bnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBsaW5lQ29udGVudC5ydW5z LCBsaW5lSW5kZXgpOwogCiAgICAgYXV0byBsaW5lID0gWyZdIHsKLSAgICAgICAgYXV0byBsaW5l Qm94TG9naWNhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVCb3hMb2dpY2FsSGVpZ2h0IH07Cisg ICAgICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVDb250ZW50 LmxpbmVMb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aCwgbGluZUJv eExvZ2ljYWxIZWlnaHQgfTsKICAgICAgICAgYXV0byBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0ID0g bGluZUJveExvZ2ljYWxSZWN0OwogICAgICAgICBhdXRvJiByb290SW5saW5lQm94ID0gbGluZUJv eC5yb290SW5saW5lQm94KCk7CiAgICAgICAgIGF1dG8gZW5jbG9zaW5nVG9wQW5kQm90dG9tID0g SW5saW5lRGlzcGxheTo6TGluZTo6RW5jbG9zaW5nVG9wQW5kQm90dG9tIHsgbGluZUJveExvZ2lj YWxSZWN0LnRvcCgpICsgcm9vdElubGluZUJveC5sb2dpY2FsVG9wKCksIGxpbmVCb3hMb2dpY2Fs UmVjdC50b3AoKSArIHJvb3RJbmxpbmVCb3gubG9naWNhbEJvdHRvbSgpIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMzQyM2ZmMzc2OTRkYTcyOWUwMjI1 YWM2NGEzMDYzNjY1NDE5YjlkMS4uMDllZDRlZmFkYmU3YTgyMmE2ZDliZWIxMzJlM2NmNmYyY2M2 NWY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjg4 LDYgKzI4OCwxMSBAQCBMaW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LAogewogfQogCitzdHJ1Y3QgVXNl ZENvbnN0cmFpbnRzIHsKKyAgICBJbmxpbmVSZWN0IGxvZ2ljYWxSZWN0OworICAgIElubGluZUxh eW91dFVuaXQgbWFyZ2luU3RhcnQgeyAwIH07CisgICAgYm9vbCBpc0NvbnN0cmFpbmVkQnlGbG9h dCB7IGZhbHNlIH07Cit9OwogTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjps YXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5n ZSwgc2l6ZV90IHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCwgc3RkOjpvcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiBvdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCwgY29uc3QgSW5saW5lUmVjdCYg aW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkKIHsKICAgICBpbml0aWFs aXplKGluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgaXNG aXJzdExpbmUpLCBpc0ZpcnN0TGluZSwgbmVlZHNMYXlvdXRSYW5nZS5zdGFydCwgcGFydGlhbExl YWRpbmdDb250ZW50TGVuZ3RoLCBvdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCk7CkBAIC0zMzIsNiAr MzM3LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxp bmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBjb21taXR0ZWRDb250 ZW50Lm92ZXJmbG93TG9naWNhbFdpZHRoCiAgICAgICAgICwgbV9mbG9hdHMKICAgICAgICAgLCBt X2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdAorICAgICAgICAsIG1fbGluZU1hcmdpblN0YXJ0 CiAgICAgICAgICwgbV9saW5lTG9naWNhbFJlY3QudG9wTGVmdCgpCiAgICAgICAgICwgbV9saW5l TG9naWNhbFJlY3Qud2lkdGgoKQogICAgICAgICAsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCkKQEAgLTM1MSw3ICszNTcsNyBAQCBMaW5lQnVpbGRlcjo6SW50cmluc2ljQ29udGVudCBMaW5l QnVpbGRlcjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aChjb25zdCBJbmxpbmVJdAogCiAgICAgYXV0 byBjb21taXR0ZWRDb250ZW50ID0gcGxhY2VJbmxpbmVDb250ZW50KG5lZWRzTGF5b3V0UmFuZ2Up OwogICAgIGF1dG8gY29tbWl0dGVkUmFuZ2UgPSBjbG9zZShuZWVkc0xheW91dFJhbmdlLCBjb21t aXR0ZWRDb250ZW50KTsKLSAgICBhdXRvIGxpbmVXaWR0aCA9IGxpbmVDb25zdHJhaW50cy5sb2dp Y2FsUmVjdC5sZWZ0KCkgKyBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpOworICAgIGF1dG8g bGluZVdpZHRoID0gbGluZUNvbnN0cmFpbnRzLmxvZ2ljYWxSZWN0LmxlZnQoKSArIGxpbmVDb25z dHJhaW50cy5tYXJnaW5TdGFydCArIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCk7CiAgICAg cmV0dXJuIHsgY29tbWl0dGVkUmFuZ2UsIGxpbmVXaWR0aCwgbV9mbG9hdHMgfTsKIH0KIApAQCAt Mzk1LDcgKzQwMSwxMiBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IFVzZWRD b25zdHJhaW50cyYgbGluZUNvbnN0cmFpbnRzLCBib29sIGlzRmlycwogICAgIGNyZWF0ZUxpbmVT cGFubmluZ0lubGluZUJveGVzKCk7CiAgICAgbV9saW5lLmluaXRpYWxpemUobV9saW5lU3Bhbm5p bmdJbmxpbmVCb3hlcyk7CiAKKyAgICBtX2xpbmVNYXJnaW5TdGFydCA9IGxpbmVDb25zdHJhaW50 cy5tYXJnaW5TdGFydDsKICAgICBtX2xpbmVMb2dpY2FsUmVjdCA9IGxpbmVDb25zdHJhaW50cy5s b2dpY2FsUmVjdDsKKyAgICBtX2xpbmVMb2dpY2FsUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KG1fbGlu ZU1hcmdpblN0YXJ0KTsKKyAgICAvLyBXaGlsZSBuZWdhdGl2ZSBtYXJnaW5zIG5vcm1hbGx5IGRv bid0IGV4cGFuZCB0aGUgYXZhaWxhYmxlIHNwYWNlLCBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRp b24gZ2V0cyBjb25mdXNlZCBieSBuZWdhdGl2ZSB0ZXh0LWluZGVudAorICAgIC8vIChzaHJpbmsg dGhlIHNwYWNlIG5lZWRlZCBmb3IgdGhlIGNvbnRlbnQpIHdoaWNoIHdlIGhhdmUgdG8gYmFsYW5j ZSBpdCBoZXJlLgorICAgIG1fbGluZUxvZ2ljYWxSZWN0LmV4cGFuZEhvcml6b250YWxseSgtbV9s aW5lTWFyZ2luU3RhcnQpOwogICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0ID0gbGlu ZUNvbnN0cmFpbnRzLmlzQ29uc3RyYWluZWRCeUZsb2F0OwogCiAgICAgaWYgKHBhcnRpYWxMZWFk aW5nQ29udGVudExlbmd0aCkgewpAQCAtNTQ3LDcgKzU1OCw3IEBAIHN0ZDo6b3B0aW9uYWw8SG9y aXpvbnRhbENvbnN0cmFpbnRzPiBMaW5lQnVpbGRlcjo6ZmxvYXRDb25zdHJhaW50cyhjb25zdCBJ bmxpbmVSCiAgICAgcmV0dXJuIEhvcml6b250YWxDb25zdHJhaW50cyB7IHRvTGF5b3V0VW5pdChs aW5lTG9naWNhbExlZnQpLCB0b0xheW91dFVuaXQobGluZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dp Y2FsTGVmdCkgfTsKIH0KIAotTGluZUJ1aWxkZXI6OlVzZWRDb25zdHJhaW50cyBMaW5lQnVpbGRl cjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGlu ZUxvZ2ljYWxSZWN0LCBib29sIGlzRmlyc3RMaW5lKSBjb25zdAorVXNlZENvbnN0cmFpbnRzIExp bmVCdWlsZGVyOjppbml0aWFsQ29uc3RyYWludHNGb3JMaW5lKGNvbnN0IElubGluZVJlY3QmIGlu aXRpYWxMaW5lTG9naWNhbFJlY3QsIGJvb2wgaXNGaXJzdExpbmUpIGNvbnN0CiB7CiAgICAgYXV0 byBsaW5lTG9naWNhbExlZnQgPSBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LmxlZnQoKTsKICAgICBh dXRvIGxpbmVMb2dpY2FsUmlnaHQgPSBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LnJpZ2h0KCk7CkBA IC01OTgsOCArNjA5LDcgQEAgTGluZUJ1aWxkZXI6OlVzZWRDb25zdHJhaW50cyBMaW5lQnVpbGRl cjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmUKICAgICAgICAgfQogICAg ICAgICByZXR1cm4geyBtaW5pbXVtVmFsdWVGb3JMZW5ndGgodGV4dEluZGVudCwgaW5pdGlhbExp bmVMb2dpY2FsUmVjdC53aWR0aCgpKSB9OwogICAgIH07Ci0gICAgbGluZUxvZ2ljYWxMZWZ0ICs9 IGNvbXB1dGVkVGV4dEluZGVudCgpOwotICAgIHJldHVybiBVc2VkQ29uc3RyYWludHMgeyB7IGlu aXRpYWxMaW5lTG9naWNhbFJlY3QudG9wKCksIGxpbmVMb2dpY2FsTGVmdCwgbGluZUxvZ2ljYWxS aWdodCAtIGxpbmVMb2dpY2FsTGVmdCwgaW5pdGlhbExpbmVMb2dpY2FsUmVjdC5oZWlnaHQoKSB9 LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgfTsKKyAgICByZXR1cm4gVXNlZENvbnN0cmFpbnRz IHsgeyBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LnRvcCgpLCBsaW5lTG9naWNhbExlZnQsIGxpbmVM b2dpY2FsUmlnaHQgLSBsaW5lTG9naWNhbExlZnQsIGluaXRpYWxMaW5lTG9naWNhbFJlY3QuaGVp Z2h0KCkgfSwgY29tcHV0ZWRUZXh0SW5kZW50KCksIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB9 OwogfQogCiB2b2lkIExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9yTGluZShMaW5lQ2Fu ZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgY3VycmVudElubGluZUl0ZW1JbmRleCwgY29u c3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgSW5saW5lTGF5b3V0VW5pdCBjdXJyZW50 TG9naWNhbFJpZ2h0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXgg M2E4NzY1MDk0OGY5NzRkMDk2YmM4ZDM5ZGM1MmVjYWQ5M2VlYzlmYy4uMjk4MThjMWI1ZTJhMDRh YTQwZTQwNGNlMTI5Y2M4ZjcyNmQ5YjE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l QnVpbGRlci5oCkBAIC0zNyw2ICszNyw3IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBjbGFzcyBG bG9hdGluZ0NvbnRleHQ7CiBzdHJ1Y3QgTGluZUNhbmRpZGF0ZTsKK3N0cnVjdCBVc2VkQ29uc3Ry YWludHM7CiAKIGNsYXNzIExpbmVCdWlsZGVyIHsKIHB1YmxpYzoKQEAgLTU2LDcgKzU3LDggQEAg cHVibGljOgogICAgICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG92ZXJmbG93 TG9naWNhbFdpZHRoOwogICAgICAgICBjb25zdCBGbG9hdExpc3QmIGZsb2F0czsKICAgICAgICAg Ym9vbCBoYXNJbnRydXNpdmVGbG9hdCB7IGZhbHNlIH07Ci0gICAgICAgIElubGluZUxheW91dFBv aW50IGxvZ2ljYWxUb3BMZWZ0OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVNYXJnaW5T dGFydCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbGluZUxvZ2ljYWxUb3BMZWZ0 OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVMb2dpY2FsV2lkdGggeyAwIH07CiAgICAg ICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBoYW5naW5nV2hpdGVzcGFjZVdpZHRoIHsgMCB9OwpAQCAtODgsMTAg KzkwLDYgQEAgcHJpdmF0ZToKICAgICAgICAgc2l6ZV90IHBhcnRpYWxUcmFpbGluZ0NvbnRlbnRM ZW5ndGggeyAwIH07CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gb3Zl cmZsb3dMb2dpY2FsV2lkdGggeyB9OwogICAgIH07Ci0gICAgc3RydWN0IFVzZWRDb25zdHJhaW50 cyB7Ci0gICAgICAgIElubGluZVJlY3QgbG9naWNhbFJlY3Q7Ci0gICAgICAgIGJvb2wgaXNDb25z dHJhaW5lZEJ5RmxvYXQgeyBmYWxzZSB9OwotICAgIH07CiAgICAgVXNlZENvbnN0cmFpbnRzIGlu aXRpYWxDb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVMb2dp Y2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkgY29uc3Q7CiAgICAgc3RkOjpvcHRpb25hbDxIb3Jp em9udGFsQ29uc3RyYWludHM+IGZsb2F0Q29uc3RyYWludHMoY29uc3QgSW5saW5lUmVjdCYgbGlu ZUxvZ2ljYWxSZWN0KSBjb25zdDsKIApAQCAtMTMyLDYgKzEzMCw3IEBAIHByaXZhdGU6CiAKICAg ICBMaW5lIG1fbGluZTsKICAgICBJbmxpbmVSZWN0IG1fbGluZUxvZ2ljYWxSZWN0OworICAgIElu bGluZUxheW91dFVuaXQgbV9saW5lTWFyZ2luU3RhcnQgeyAwIH07CiAgICAgY29uc3QgSW5saW5l SXRlbXMmIG1faW5saW5lSXRlbXM7CiAgICAgRmxvYXRMaXN0IG1fZmxvYXRzOwogICAgIHN0ZDo6 b3B0aW9uYWw8SW5saW5lVGV4dEl0ZW0+IG1fcGFydGlhbExlYWRpbmdUZXh0SXRlbTsK 447550 2021-12-19 10:43:24 -0800 2021-12-19 11:46:03 -0800 Patch bug-234460-20211219104323.patch text/plain 8373 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRiYjFjOWRjNjJjOGFm YzQyMGY4NGViYzIxY2QwOWU5ZGYzMjFiYS4uOWE5NTRmMzk5MGZjOTg1OGU0MTNkZDEyOWE4ODlj NGJiZGZjNTE1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTEyLTE3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIHRleHQtaW5k ZW50IGlzIHRyZWF0ZWQgYXMgYSBtYXJnaW4gYXBwbGllZCB0byB0aGUgc3RhcnQgZWRnZSBvZiB0 aGUgbGluZSBib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzQ0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBTZWUgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyN0ZXh0LWluZGVudC1w cm9wZXJ0eQorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJlcGFyYXRpb24gZm9yIGFkanVzdGlu ZyB0aGUgZGlzcGxheSBsaW5lIGdlb21ldHJ5IHdoZW4gdGhlIGlubGluZSBheGlzIGRpcmVjdGlv biBpcyBydGwuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVp bGRlcjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaDoKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVSZWN0Lmg6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJlY3Q6Om1vdmVMZWZ0QnkpOgorCiAyMDIxLTEyLTE3 ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFk anVzdCB0aGUgYm94IGdlb21ldHJ5IGZvciBhdG9taWMvZ2VuZXJpYyBpbmxpbmUgbGV2ZWwgYm94 ZXMgaW4gYmlkaSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAKaW5kZXggNjIxZjdlMTJiMGEzNTRmZmQ2ODMyNGFhOWY2NzU3NDg5Yjg3MjdiZi4u ZDdhNzQ3NDAwYjQzZDJmN2ZhZDI5MWE4OGFmY2I4Y2Y2YTEyZDI3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJv eEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMTEyLDcgKzExMiw3IEBAIExp bmVCb3hCdWlsZGVyOjpMaW5lQW5kTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgYXV0byBsaW5lQm94TG9naWNhbEhlaWdodCA9IGNv bnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBsaW5lQ29udGVudC5ydW5z LCBsaW5lSW5kZXgpOwogCiAgICAgYXV0byBsaW5lID0gWyZdIHsKLSAgICAgICAgYXV0byBsaW5l Qm94TG9naWNhbFJlY3QgPSBJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVCb3hMb2dpY2FsSGVpZ2h0IH07Cisg ICAgICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVDb250ZW50 LmxpbmVMb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aCwgbGluZUJv eExvZ2ljYWxIZWlnaHQgfTsKICAgICAgICAgYXV0byBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0ID0g bGluZUJveExvZ2ljYWxSZWN0OwogICAgICAgICBhdXRvJiByb290SW5saW5lQm94ID0gbGluZUJv eC5yb290SW5saW5lQm94KCk7CiAgICAgICAgIGF1dG8gZW5jbG9zaW5nVG9wQW5kQm90dG9tID0g SW5saW5lRGlzcGxheTo6TGluZTo6RW5jbG9zaW5nVG9wQW5kQm90dG9tIHsgbGluZUJveExvZ2lj YWxSZWN0LnRvcCgpICsgcm9vdElubGluZUJveC5sb2dpY2FsVG9wKCksIGxpbmVCb3hMb2dpY2Fs UmVjdC50b3AoKSArIHJvb3RJbmxpbmVCb3gubG9naWNhbEJvdHRvbSgpIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMzQyM2ZmMzc2OTRkYTcyOWUwMjI1 YWM2NGEzMDYzNjY1NDE5YjlkMS4uMDllZDRlZmFkYmU3YTgyMmE2ZDliZWIxMzJlM2NmNmYyY2M2 NWY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjg4 LDYgKzI4OCwxMSBAQCBMaW5lQnVpbGRlcjo6TGluZUJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0LAogewogfQogCitzdHJ1Y3QgVXNl ZENvbnN0cmFpbnRzIHsKKyAgICBJbmxpbmVSZWN0IGxvZ2ljYWxSZWN0OworICAgIElubGluZUxh eW91dFVuaXQgbWFyZ2luU3RhcnQgeyAwIH07CisgICAgYm9vbCBpc0NvbnN0cmFpbmVkQnlGbG9h dCB7IGZhbHNlIH07Cit9OwogTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjps YXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5n ZSwgc2l6ZV90IHBhcnRpYWxMZWFkaW5nQ29udGVudExlbmd0aCwgc3RkOjpvcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiBvdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCwgY29uc3QgSW5saW5lUmVjdCYg aW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkKIHsKICAgICBpbml0aWFs aXplKGluaXRpYWxDb25zdHJhaW50c0ZvckxpbmUoaW5pdGlhbExpbmVMb2dpY2FsUmVjdCwgaXNG aXJzdExpbmUpLCBpc0ZpcnN0TGluZSwgbmVlZHNMYXlvdXRSYW5nZS5zdGFydCwgcGFydGlhbExl YWRpbmdDb250ZW50TGVuZ3RoLCBvdmVyZmxvd2luZ0xvZ2ljYWxXaWR0aCk7CkBAIC0zMzIsNiAr MzM3LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxp bmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBjb21taXR0ZWRDb250 ZW50Lm92ZXJmbG93TG9naWNhbFdpZHRoCiAgICAgICAgICwgbV9mbG9hdHMKICAgICAgICAgLCBt X2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdAorICAgICAgICAsIG1fbGluZU1hcmdpblN0YXJ0 CiAgICAgICAgICwgbV9saW5lTG9naWNhbFJlY3QudG9wTGVmdCgpCiAgICAgICAgICwgbV9saW5l TG9naWNhbFJlY3Qud2lkdGgoKQogICAgICAgICAsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCkKQEAgLTM1MSw3ICszNTcsNyBAQCBMaW5lQnVpbGRlcjo6SW50cmluc2ljQ29udGVudCBMaW5l QnVpbGRlcjo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aChjb25zdCBJbmxpbmVJdAogCiAgICAgYXV0 byBjb21taXR0ZWRDb250ZW50ID0gcGxhY2VJbmxpbmVDb250ZW50KG5lZWRzTGF5b3V0UmFuZ2Up OwogICAgIGF1dG8gY29tbWl0dGVkUmFuZ2UgPSBjbG9zZShuZWVkc0xheW91dFJhbmdlLCBjb21t aXR0ZWRDb250ZW50KTsKLSAgICBhdXRvIGxpbmVXaWR0aCA9IGxpbmVDb25zdHJhaW50cy5sb2dp Y2FsUmVjdC5sZWZ0KCkgKyBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpOworICAgIGF1dG8g bGluZVdpZHRoID0gbGluZUNvbnN0cmFpbnRzLmxvZ2ljYWxSZWN0LmxlZnQoKSArIGxpbmVDb25z dHJhaW50cy5tYXJnaW5TdGFydCArIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCk7CiAgICAg cmV0dXJuIHsgY29tbWl0dGVkUmFuZ2UsIGxpbmVXaWR0aCwgbV9mbG9hdHMgfTsKIH0KIApAQCAt Mzk1LDcgKzQwMSwxMiBAQCB2b2lkIExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IFVzZWRD b25zdHJhaW50cyYgbGluZUNvbnN0cmFpbnRzLCBib29sIGlzRmlycwogICAgIGNyZWF0ZUxpbmVT cGFubmluZ0lubGluZUJveGVzKCk7CiAgICAgbV9saW5lLmluaXRpYWxpemUobV9saW5lU3Bhbm5p bmdJbmxpbmVCb3hlcyk7CiAKKyAgICBtX2xpbmVNYXJnaW5TdGFydCA9IGxpbmVDb25zdHJhaW50 cy5tYXJnaW5TdGFydDsKICAgICBtX2xpbmVMb2dpY2FsUmVjdCA9IGxpbmVDb25zdHJhaW50cy5s b2dpY2FsUmVjdDsKKyAgICBtX2xpbmVMb2dpY2FsUmVjdC5tb3ZlSG9yaXpvbnRhbGx5KG1fbGlu ZU1hcmdpblN0YXJ0KTsKKyAgICAvLyBXaGlsZSBuZWdhdGl2ZSBtYXJnaW5zIG5vcm1hbGx5IGRv bid0IGV4cGFuZCB0aGUgYXZhaWxhYmxlIHNwYWNlLCBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRp b24gZ2V0cyBjb25mdXNlZCBieSBuZWdhdGl2ZSB0ZXh0LWluZGVudAorICAgIC8vIChzaHJpbmsg dGhlIHNwYWNlIG5lZWRlZCBmb3IgdGhlIGNvbnRlbnQpIHdoaWNoIHdlIGhhdmUgdG8gYmFsYW5j ZSBpdCBoZXJlLgorICAgIG1fbGluZUxvZ2ljYWxSZWN0LmV4cGFuZEhvcml6b250YWxseSgtbV9s aW5lTWFyZ2luU3RhcnQpOwogICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0ID0gbGlu ZUNvbnN0cmFpbnRzLmlzQ29uc3RyYWluZWRCeUZsb2F0OwogCiAgICAgaWYgKHBhcnRpYWxMZWFk aW5nQ29udGVudExlbmd0aCkgewpAQCAtNTQ3LDcgKzU1OCw3IEBAIHN0ZDo6b3B0aW9uYWw8SG9y aXpvbnRhbENvbnN0cmFpbnRzPiBMaW5lQnVpbGRlcjo6ZmxvYXRDb25zdHJhaW50cyhjb25zdCBJ bmxpbmVSCiAgICAgcmV0dXJuIEhvcml6b250YWxDb25zdHJhaW50cyB7IHRvTGF5b3V0VW5pdChs aW5lTG9naWNhbExlZnQpLCB0b0xheW91dFVuaXQobGluZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dp Y2FsTGVmdCkgfTsKIH0KIAotTGluZUJ1aWxkZXI6OlVzZWRDb25zdHJhaW50cyBMaW5lQnVpbGRl cjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmVSZWN0JiBpbml0aWFsTGlu ZUxvZ2ljYWxSZWN0LCBib29sIGlzRmlyc3RMaW5lKSBjb25zdAorVXNlZENvbnN0cmFpbnRzIExp bmVCdWlsZGVyOjppbml0aWFsQ29uc3RyYWludHNGb3JMaW5lKGNvbnN0IElubGluZVJlY3QmIGlu aXRpYWxMaW5lTG9naWNhbFJlY3QsIGJvb2wgaXNGaXJzdExpbmUpIGNvbnN0CiB7CiAgICAgYXV0 byBsaW5lTG9naWNhbExlZnQgPSBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LmxlZnQoKTsKICAgICBh dXRvIGxpbmVMb2dpY2FsUmlnaHQgPSBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LnJpZ2h0KCk7CkBA IC01OTgsOCArNjA5LDcgQEAgTGluZUJ1aWxkZXI6OlVzZWRDb25zdHJhaW50cyBMaW5lQnVpbGRl cjo6aW5pdGlhbENvbnN0cmFpbnRzRm9yTGluZShjb25zdCBJbmxpbmUKICAgICAgICAgfQogICAg ICAgICByZXR1cm4geyBtaW5pbXVtVmFsdWVGb3JMZW5ndGgodGV4dEluZGVudCwgaW5pdGlhbExp bmVMb2dpY2FsUmVjdC53aWR0aCgpKSB9OwogICAgIH07Ci0gICAgbGluZUxvZ2ljYWxMZWZ0ICs9 IGNvbXB1dGVkVGV4dEluZGVudCgpOwotICAgIHJldHVybiBVc2VkQ29uc3RyYWludHMgeyB7IGlu aXRpYWxMaW5lTG9naWNhbFJlY3QudG9wKCksIGxpbmVMb2dpY2FsTGVmdCwgbGluZUxvZ2ljYWxS aWdodCAtIGxpbmVMb2dpY2FsTGVmdCwgaW5pdGlhbExpbmVMb2dpY2FsUmVjdC5oZWlnaHQoKSB9 LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgfTsKKyAgICByZXR1cm4gVXNlZENvbnN0cmFpbnRz IHsgeyBpbml0aWFsTGluZUxvZ2ljYWxSZWN0LnRvcCgpLCBsaW5lTG9naWNhbExlZnQsIGxpbmVM b2dpY2FsUmlnaHQgLSBsaW5lTG9naWNhbExlZnQsIGluaXRpYWxMaW5lTG9naWNhbFJlY3QuaGVp Z2h0KCkgfSwgY29tcHV0ZWRUZXh0SW5kZW50KCksIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB9 OwogfQogCiB2b2lkIExpbmVCdWlsZGVyOjpjYW5kaWRhdGVDb250ZW50Rm9yTGluZShMaW5lQ2Fu ZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3QgY3VycmVudElubGluZUl0ZW1JbmRleCwgY29u c3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgSW5saW5lTGF5b3V0VW5pdCBjdXJyZW50 TG9naWNhbFJpZ2h0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXgg M2E4NzY1MDk0OGY5NzRkMDk2YmM4ZDM5ZGM1MmVjYWQ5M2VlYzlmYy4uMjk4MThjMWI1ZTJhMDRh YTQwZTQwNGNlMTI5Y2M4ZjcyNmQ5YjE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l QnVpbGRlci5oCkBAIC0zNyw2ICszNyw3IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBjbGFzcyBG bG9hdGluZ0NvbnRleHQ7CiBzdHJ1Y3QgTGluZUNhbmRpZGF0ZTsKK3N0cnVjdCBVc2VkQ29uc3Ry YWludHM7CiAKIGNsYXNzIExpbmVCdWlsZGVyIHsKIHB1YmxpYzoKQEAgLTU2LDcgKzU3LDggQEAg cHVibGljOgogICAgICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG92ZXJmbG93 TG9naWNhbFdpZHRoOwogICAgICAgICBjb25zdCBGbG9hdExpc3QmIGZsb2F0czsKICAgICAgICAg Ym9vbCBoYXNJbnRydXNpdmVGbG9hdCB7IGZhbHNlIH07Ci0gICAgICAgIElubGluZUxheW91dFBv aW50IGxvZ2ljYWxUb3BMZWZ0OworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVNYXJnaW5T dGFydCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0UG9pbnQgbGluZUxvZ2ljYWxUb3BMZWZ0 OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVMb2dpY2FsV2lkdGggeyAwIH07CiAgICAg ICAgIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKICAgICAgICAg SW5saW5lTGF5b3V0VW5pdCBoYW5naW5nV2hpdGVzcGFjZVdpZHRoIHsgMCB9OwpAQCAtODgsMTAg KzkwLDYgQEAgcHJpdmF0ZToKICAgICAgICAgc2l6ZV90IHBhcnRpYWxUcmFpbGluZ0NvbnRlbnRM ZW5ndGggeyAwIH07CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gb3Zl cmZsb3dMb2dpY2FsV2lkdGggeyB9OwogICAgIH07Ci0gICAgc3RydWN0IFVzZWRDb25zdHJhaW50 cyB7Ci0gICAgICAgIElubGluZVJlY3QgbG9naWNhbFJlY3Q7Ci0gICAgICAgIGJvb2wgaXNDb25z dHJhaW5lZEJ5RmxvYXQgeyBmYWxzZSB9OwotICAgIH07CiAgICAgVXNlZENvbnN0cmFpbnRzIGlu aXRpYWxDb25zdHJhaW50c0ZvckxpbmUoY29uc3QgSW5saW5lUmVjdCYgaW5pdGlhbExpbmVMb2dp Y2FsUmVjdCwgYm9vbCBpc0ZpcnN0TGluZSkgY29uc3Q7CiAgICAgc3RkOjpvcHRpb25hbDxIb3Jp em9udGFsQ29uc3RyYWludHM+IGZsb2F0Q29uc3RyYWludHMoY29uc3QgSW5saW5lUmVjdCYgbGlu ZUxvZ2ljYWxSZWN0KSBjb25zdDsKIApAQCAtMTMyLDYgKzEzMCw3IEBAIHByaXZhdGU6CiAKICAg ICBMaW5lIG1fbGluZTsKICAgICBJbmxpbmVSZWN0IG1fbGluZUxvZ2ljYWxSZWN0OworICAgIElu bGluZUxheW91dFVuaXQgbV9saW5lTWFyZ2luU3RhcnQgeyAwIH07CiAgICAgY29uc3QgSW5saW5l SXRlbXMmIG1faW5saW5lSXRlbXM7CiAgICAgRmxvYXRMaXN0IG1fZmxvYXRzOwogICAgIHN0ZDo6 b3B0aW9uYWw8SW5saW5lVGV4dEl0ZW0+IG1fcGFydGlhbExlYWRpbmdUZXh0SXRlbTsK