230930 2021-09-28 18:50:14 -0700 [LFC][IFC] LineBoxBuilder should use the first-line style when applicable 2021-09-29 13:54:16 -0700 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 1798136 0 zalan 2021-09-28 18:50:14 -0700 ssia 1798137 1 439553 zalan 2021-09-28 18:56:14 -0700 Created attachment 439553 Patch 1798139 2 439554 zalan 2021-09-28 19:20:48 -0700 Created attachment 439554 Patch 1798144 3 439556 zalan 2021-09-28 19:30:28 -0700 Created attachment 439556 Patch 1798505 4 439645 zalan 2021-09-29 12:39:06 -0700 Created attachment 439645 Patch 1798545 5 ews-feeder 2021-09-29 13:54:00 -0700 Committed r283260 (242289@main): <https://commits.webkit.org/242289@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439645. 1798546 6 webkit-bug-importer 2021-09-29 13:54:16 -0700 <rdar://problem/83687055> 439553 2021-09-28 18:56:14 -0700 2021-09-28 19:24:35 -0700 Patch bug-230930-20210928185613.patch text/plain 9524 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQwZGUxNjIwYzU1NTc3 MDBiY2I4ZGY3M2EwOWM3MzJmMmJlMWZlZi4uNGJhYzVmMjVmN2I5ZWMzY2JmYjhjODZmZWVhNGQz MmNiMjAxNGMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCb3hC dWlsZGVyIHNob3VsZCB1c2UgdGhlIGZpcnN0LWxpbmUgc3R5bGUgd2hlbiBhcHBsaWNhYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGlu IHByZXBhcmF0aW9uIGZvciBzdXBwb3J0IGZpcnN0LWxpbmUgc3R5bGUuCisKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojps aW5lTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmJ1aWxk KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFu ZEFsaWduSW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMS0wOS0yOCAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBVc2UgdGhlIGZp cnN0LWxpbmUgc3R5bGUgd2hlbiBtZWFzdXJpbmcgdGV4dCBjb250ZW50IHdoZW4gYXBwbGljYWJs ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmlu ZGV4IDhiMmJhN2QxZWI2ZmQ1ZWNlYTFmMjk2ZjhmNmYzODg1Y2I3Yzk3M2QuLjE4NTZkNzljN2Ix ZmM3NzdlZGE2OTMxZGJiMmZlMmM2MDJkMGI3OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTIwNyw3ICsyMDcsNyBAQCB2b2lkIElu bGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KElubGluZUl0ZW1zJiBpbmxpbmVJdGVt cywgTGluZUJ1aWxkZXI6OgogICAgICAgICB9KCk7CiAgICAgICAgIGF1dG8gaW5pdGlhbExpbmVD b25zdHJhaW50cyA9IElubGluZVJlY3QgeyBsaW5lTG9naWNhbFRvcCwgY29uc3RyYWludHMuaG9y aXpvbnRhbCgpLmxvZ2ljYWxMZWZ0LCBjb25zdHJhaW50cy5ob3Jpem9udGFsKCkubG9naWNhbFdp ZHRoLCBpbml0aWFsTGluZUhlaWdodCB9OwogICAgICAgICBhdXRvIGxpbmVDb250ZW50ID0gbGlu ZUJ1aWxkZXIubGF5b3V0SW5saW5lQ29udGVudChuZWVkc0xheW91dFJhbmdlLCBwYXJ0aWFsTGVh ZGluZ0NvbnRlbnRMZW5ndGgsIGxlYWRpbmdMb2dpY2FsV2lkdGgsIGluaXRpYWxMaW5lQ29uc3Ry YWludHMsIGlzRmlyc3RMaW5lKTsKLSAgICAgICAgYXV0byBsaW5lTG9naWNhbFJlY3QgPSBjb21w dXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChsaW5lQ29udGVudCk7CisgICAgICAgIGF1dG8gbGlu ZUxvZ2ljYWxSZWN0ID0gY29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQobGluZUNvbnRlbnQs IGlzRmlyc3RMaW5lKTsKIAogICAgICAgICBhdXRvIGxpbmVDb250ZW50UmFuZ2UgPSBsaW5lQ29u dGVudC5pbmxpbmVJdGVtUmFuZ2U7CiAgICAgICAgIGlmICghbGluZUNvbnRlbnRSYW5nZS5pc0Vt cHR5KCkpIHsKQEAgLTU2OSwxMCArNTY5LDEwIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbGxlY3RDb250ZW50SWZOZWVkZWQoKQogICAgIH0KIH0KIAotSW5saW5lUmVjdCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKK0lubGluZVJlY3QgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnN0IExp bmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGJvb2wgaXNGaXJzdExpbmUpCiB7 CiAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7Ci0g ICAgYXV0byBsaW5lQW5kTGluZUJveCA9IExpbmVCb3hCdWlsZGVyKCp0aGlzKS5idWlsZChsaW5l Q29udGVudCk7CisgICAgYXV0byBsaW5lQW5kTGluZUJveCA9IExpbmVCb3hCdWlsZGVyKCp0aGlz KS5idWlsZChsaW5lQ29udGVudCwgaXNGaXJzdExpbmUpOwogICAgIGF1dG8gbGluZUJveExvZ2lj YWxSZWN0ID0gbGluZUFuZExpbmVCb3gubGluZS5saW5lQm94TG9naWNhbFJlY3QoKTsKIAogICAg IGF1dG8gaW5saW5lQ29udGVudEJ1aWxkZXIgPSBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIg eyByb290KCksIGZvcm1hdHRpbmdTdGF0ZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNTY4MmI4Nzg3YTEzZGI5YWZiZTZiZDdlOWE4NjQ5 ZjJjNmNiMTEzZi4uMmVlODljOGRkMmJlYTBkNzkzY2QwZmRiM2JkMWFmNzM4NTZhNGYwMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC03Miw3 ICs3Miw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3Qg Qm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJik7CiAKICAgICB2b2lkIGNvbGxlY3RD b250ZW50SWZOZWVkZWQoKTsKLSAgICBJbmxpbmVSZWN0IGNvbXB1dGVHZW9tZXRyeUZvckxpbmVD b250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYpOworICAgIElubGluZVJlY3Qg Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250 ZW50JiwgYm9vbCBpc0ZpcnN0TGluZSk7CiAgICAgdm9pZCBpbnZhbGlkYXRlRm9ybWF0dGluZ1N0 YXRlKCk7CiAKICAgICBjb25zdCBJbmxpbmVEYW1hZ2UqIG1fbGluZURhbWFnZSB7IG51bGxwdHIg fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRleCA3 MDVhMTI5ZGQxY2FhMDZhMjU4YzY1NmMzNTg1NDVjYzA2MTU2OGRhLi5iOWM0MTViMjRlNmYxODVh NGNkN2QxMTdiNTNmYzY0YmI4ZmU3ZWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveEJ1aWxkZXIuY3BwCkBAIC0xMDksMTQgKzEwOSwxNSBAQCBMaW5lQm94QnVpbGRlcjo6 TGluZUJveEJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1h dHRpbmdDbwogewogfQogCi1MaW5lQm94QnVpbGRlcjo6TGluZUFuZExpbmVCb3ggTGluZUJveEJ1 aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQp CitMaW5lQm94QnVpbGRlcjo6TGluZUFuZExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNv bnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGJvb2wgaXNGaXJzdExp bmUpCiB7CiAgICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBjb250 ZW50TG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQuY29udGVudExvZ2ljYWxXaWR0aDsKLSAgICBh dXRvIGNvbnRlbnRMb2dpY2FsTGVmdCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNl dChydW5zLCByb290Qm94KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSwgbGluZUNvbnRlbnQubGluZUxv Z2ljYWxXaWR0aCwgY29udGVudExvZ2ljYWxXaWR0aCwgbGluZUNvbnRlbnQuaXNMYXN0TGluZVdp dGhJbmxpbmVDb250ZW50KS52YWx1ZV9vcihJbmxpbmVMYXlvdXRVbml0IHsgfSk7CisgICAgYXV0 byB0ZXh0QWxpZ24gPSBpc0ZpcnN0TGluZSA/IHJvb3RCb3goKS5maXJzdExpbmVTdHlsZSgpLnRl eHRBbGlnbigpIDogcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCk7CisgICAgYXV0byBjb250 ZW50TG9naWNhbExlZnQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQocnVucywg dGV4dEFsaWduLCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9naWNhbFdp ZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpLnZhbHVlX29yKElu bGluZUxheW91dFVuaXQgeyB9KTsKICAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgcm9vdEJv eCgpLCBjb250ZW50TG9naWNhbExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVDb250ZW50 Lm5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCB9OwogCi0gICAgYXV0byBsaW5lQm94TG9n aWNhbEhlaWdodCA9IGNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBy dW5zKTsKKyAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gY29uc3RydWN0QW5kQWxpZ25J bmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMsIGlzRmlyc3RMaW5lKTsKIAogICAgIGF1dG8g bGluZSA9IFsmXSB7CiAgICAgICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gSW5saW5lUmVj dCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdp ZHRoLCBsaW5lQm94TG9naWNhbEhlaWdodCB9OwpAQCAtMjIyLDcgKzIyMyw3IEBAIHZvaWQgTGlu ZUJveEJ1aWxkZXI6OnNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KElubGlu ZUxldmVsQm94JiBpbmxpCiAgICAgaW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91bmRzKElubGlu ZUxldmVsQm94OjpMYXlvdXRCb3VuZHMgeyBmbG9vcmYoYXNjZW50KSwgY2VpbGYoZGVzY2VudCkg fSk7CiB9CiAKLUlubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFs aWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW5MaXN0 JiBydW5zKQorSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxp Z25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3Qm IHJ1bnMsIGJvb2wgaXNGaXJzdExpbmUpCiB7CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9IGxp bmVCb3gucm9vdElubGluZUJveCgpOwogICAgIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9y SW5saW5lQm94KHJvb3RJbmxpbmVCb3gpOwpAQCAtMjM2LDYgKzIzNywxMCBAQCBJbmxpbmVMYXlv dXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMo TGluZUJveCYgbGluZQogICAgICAgICBjYW5Vc2VTaW1wbGlmaWVkQWxpZ25tZW50ID0gTGluZUJv eFZlcnRpY2FsQWxpZ25lcjo6Y2FuVXNlU2ltcGxpZmllZEFsaWdubWVudEZvcklubGluZUxldmVs Qm94KHJvb3RJbmxpbmVCb3gsIGlubGluZUxldmVsQm94LCBib3hHZW9tZXRyeSk7CiAgICAgfTsK IAorICAgIGF1dG8gc3R5bGVUb1VzZSA9IFsmXSAoY29uc3QgYXV0byYgbGF5b3V0Qm94KSAtPiBj b25zdCBSZW5kZXJTdHlsZSYgeworICAgICAgICByZXR1cm4gaXNGaXJzdExpbmUgPyBsYXlvdXRC b3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpOworICAgIH07CisKICAgICBh dXRvIGNyZWF0ZUxpbmVTcGFubmluZ0lubGluZUJveGVzID0gWyZdIHsKICAgICAgICAgaWYgKHJ1 bnMuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjY1LDcgKzI3MCw3IEBAIElu bGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2 ZWxCb3hlcyhMaW5lQm94JiBsaW5lCiAgICAgICAgIH0KICAgICAgICAgLy8gQ29uc3RydWN0IHRo ZSBtaXNzaW5nIExpbmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGggdGhlIHRvcG1vc3Qg bGF5b3V0IGJveC4KICAgICAgICAgZm9yIChhdXRvKiBsYXlvdXRCb3ggOiBXVEY6Om1ha2VSZXZl cnNlZFJhbmdlKGxheW91dEJveGVzV2l0aG91dElubGluZUJveGVzKSkgewotICAgICAgICAgICAg YXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KCpsYXlvdXRC b3gsIGxheW91dEJveC0+c3R5bGUoKSwgcm9vdElubGluZUJveC5sb2dpY2FsTGVmdCgpLCByb290 SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpLCBJbmxpbmVMZXZlbEJveDo6TGluZVNwYW5uaW5nSW5s aW5lQm94OjpZZXMpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJv eDo6Y3JlYXRlSW5saW5lQm94KCpsYXlvdXRCb3gsIHN0eWxlVG9Vc2UoKmxheW91dEJveCksIHJv b3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElubGluZUJveC5sb2dpY2FsV2lkdGgoKSwg SW5saW5lTGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJveDo6WWVzKTsKICAgICAgICAgICAg IHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KGlubGluZUJveCk7CiAgICAg ICAgICAgICB1cGRhdGVDYW5Vc2VTaW1wbGlmaWVkQWxpZ25tZW50KGlubGluZUJveCk7CiAgICAg ICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94KSk7CkBA IC0yNzYsOCArMjgxLDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6Y29uc3Ry dWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmUKICAgICBhdXRvIGxpbmVI YXNDb250ZW50ID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBydW4gOiBydW5zKSB7CiAgICAgICAg IGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKLSAgICAgICAgLy8gRklYTUU6IE1h a2UgdGhpcyBsaW5lIGluZGV4IGRlcGVuZGVudCB0byBzdXBwb3J0IGZpcnN0LWxpbmUgc3R5bGUu Ci0gICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CisgICAgICAgIGF1dG8m IHN0eWxlID0gc3R5bGVUb1VzZShsYXlvdXRCb3gpOwogICAgICAgICBhdXRvIHJ1bkhhc0NvbnRl bnQgPSBbJl0gKCkgLT4gYm9vbCB7CiAgICAgICAgICAgICBBU1NFUlQoIWxpbmVIYXNDb250ZW50 KTsKICAgICAgICAgICAgIGlmIChydW4uaXNUZXh0KCkgfHwgcnVuLmlzQm94KCkgfHwgcnVuLmlz U29mdExpbmVCcmVhaygpIHx8IHJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC b3hCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCmluZGV4IGY5NjlkZDk4NjMxYTAzY2ZlNDYyZDY2 NWI4Y2NiNGViNWViOTMwY2YuLjRiNTQwZDE0ZDY5ZWE2N2M1OGU5ODU0MGExNjI0ZjUwNDU5YWJm MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaApAQCAtNDgs MTIgKzQ4LDEyIEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lRGlzcGxheTo6TGluZSBsaW5lOwog ICAgICAgICBMaW5lQm94IGxpbmVCb3g7CiAgICAgfTsKLSAgICBMaW5lQW5kTGluZUJveCBidWls ZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmKTsKKyAgICBMaW5lQW5kTGluZUJveCBi dWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmLCBib29sIGlzRmlyc3RMaW5lKTsK IAogcHJpdmF0ZToKICAgICB2b2lkIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5l Qm94KElubGluZUxldmVsQm94JikgY29uc3Q7CiAgICAgdm9pZCBhZGp1c3RWZXJ0aWNhbEdlb21l dHJ5Rm9ySW5saW5lQm94V2l0aEZhbGxiYWNrRm9udHMoSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBU ZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCYpIGNvbnN0OwotICAgIElubGluZUxheW91dFVuaXQg Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmLCBjb25zdCBMaW5lOjpS dW5MaXN0Jik7CisgICAgSW5saW5lTGF5b3V0VW5pdCBjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxl dmVsQm94ZXMoTGluZUJveCYsIGNvbnN0IExpbmU6OlJ1bkxpc3QmLCBib29sIGlzRmlyc3RMaW5l KTsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4 dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7IH0KICAgICBjb25z dCBCb3gmIHJvb3RCb3goKSBjb25zdCB7IHJldHVybiBmb3JtYXR0aW5nQ29udGV4dCgpLnJvb3Qo KTsgfQo= 439554 2021-09-28 19:20:48 -0700 2021-09-28 19:37:23 -0700 Patch bug-230930-20210928192047.patch text/plain 8219 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQwZGUxNjIwYzU1NTc3 MDBiY2I4ZGY3M2EwOWM3MzJmMmJlMWZlZi4uNGJhYzVmMjVmN2I5ZWMzY2JmYjhjODZmZWVhNGQz MmNiMjAxNGMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCb3hC dWlsZGVyIHNob3VsZCB1c2UgdGhlIGZpcnN0LWxpbmUgc3R5bGUgd2hlbiBhcHBsaWNhYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGlu IHByZXBhcmF0aW9uIGZvciBzdXBwb3J0IGZpcnN0LWxpbmUgc3R5bGUuCisKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojps aW5lTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmJ1aWxk KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFu ZEFsaWduSW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMS0wOS0yOCAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBVc2UgdGhlIGZp cnN0LWxpbmUgc3R5bGUgd2hlbiBtZWFzdXJpbmcgdGV4dCBjb250ZW50IHdoZW4gYXBwbGljYWJs ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmlu ZGV4IDhiMmJhN2QxZWI2ZmQ1ZWNlYTFmMjk2ZjhmNmYzODg1Y2I3Yzk3M2QuLjEzMjYwMzM4M2Nm NTAxNzA3ODc4MTA5NjYxNGY4YWY5NzczN2E1ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU3MiwxMSArNTcyLDEyIEBAIHZvaWQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RDb250ZW50SWZOZWVkZWQoKQogSW5saW5l UmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRl bnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKIHsKICAgICBh dXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5nU3RhdGUoKTsKLSAgICBhdXRv IGxpbmVBbmRMaW5lQm94ID0gTGluZUJveEJ1aWxkZXIoKnRoaXMpLmJ1aWxkKGxpbmVDb250ZW50 KTsKKyAgICBhdXRvIGN1cnJlbnRMaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5z aXplKCk7CisKKyAgICBhdXRvIGxpbmVBbmRMaW5lQm94ID0gTGluZUJveEJ1aWxkZXIoKnRoaXMp LmJ1aWxkKGxpbmVDb250ZW50LCBjdXJyZW50TGluZUluZGV4KTsKICAgICBhdXRvIGxpbmVCb3hM b2dpY2FsUmVjdCA9IGxpbmVBbmRMaW5lQm94LmxpbmUubGluZUJveExvZ2ljYWxSZWN0KCk7CiAK ICAgICBhdXRvIGlubGluZUNvbnRlbnRCdWlsZGVyID0gSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyIHsgcm9vdCgpLCBmb3JtYXR0aW5nU3RhdGUgfTsKLSAgICBhdXRvIGN1cnJlbnRMaW5lSW5k ZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXplKCk7CiAgICAgZm9ybWF0dGluZ1N0YXRl LmFkZEJveGVzKGlubGluZUNvbnRlbnRCdWlsZGVyLmJ1aWxkKGxpbmVDb250ZW50LCBsaW5lQW5k TGluZUJveC5saW5lQm94LCBsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpLCBjdXJyZW50TGlu ZUluZGV4KSk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goV1RGTW92ZShsaW5lQW5k TGluZUJveC5saW5lQm94KSk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmUobGluZUFuZExp bmVCb3gubGluZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5j cHAKaW5kZXggNzA1YTEyOWRkMWNhYTA2YTI1OGM2NTZjMzU4NTQ1Y2MwNjE1NjhkYS4uMGJkYTk0 MGM5OTI5ZjhmNzRiYmM2ODMyNmQwYTlkNWFkYmJmNzJmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMTA5LDE0ICsxMDksMTUgQEAgTGluZUJv eEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBp bmxpbmVGb3JtYXR0aW5nQ28KIHsKIH0KIAotTGluZUJveEJ1aWxkZXI6OkxpbmVBbmRMaW5lQm94 IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxp bmVDb250ZW50KQorTGluZUJveEJ1aWxkZXI6OkxpbmVBbmRMaW5lQm94IExpbmVCb3hCdWlsZGVy OjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBzaXpl X3QgbGluZUluZGV4KQogewogICAgIGF1dG8mIHJ1bnMgPSBsaW5lQ29udGVudC5ydW5zOwogICAg IGF1dG8gY29udGVudExvZ2ljYWxXaWR0aCA9IGxpbmVDb250ZW50LmNvbnRlbnRMb2dpY2FsV2lk dGg7Ci0gICAgYXV0byBjb250ZW50TG9naWNhbExlZnQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGln bm1lbnRPZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCksIGxpbmVDb250 ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVDb250ZW50Lmlz TGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkudmFsdWVfb3IoSW5saW5lTGF5b3V0VW5pdCB7IH0p OworICAgIGF1dG8gdGV4dEFsaWduID0gIWxpbmVJbmRleCA/IHJvb3RCb3goKS5maXJzdExpbmVT dHlsZSgpLnRleHRBbGlnbigpIDogcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCk7CisgICAg YXV0byBjb250ZW50TG9naWNhbExlZnQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRPZmZz ZXQocnVucywgdGV4dEFsaWduLCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBjb250ZW50 TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpLnZh bHVlX29yKElubGluZUxheW91dFVuaXQgeyB9KTsKICAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94 IHsgcm9vdEJveCgpLCBjb250ZW50TG9naWNhbExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxp bmVDb250ZW50Lm5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCB9OwogCi0gICAgYXV0byBs aW5lQm94TG9naWNhbEhlaWdodCA9IGNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhs aW5lQm94LCBydW5zKTsKKyAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gY29uc3RydWN0 QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMsIGxpbmVJbmRleCk7CiAKICAg ICBhdXRvIGxpbmUgPSBbJl0gewogICAgICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsUmVjdCA9IElu bGluZVJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxv Z2ljYWxXaWR0aCwgbGluZUJveExvZ2ljYWxIZWlnaHQgfTsKQEAgLTIyMiw3ICsyMjMsNyBAQCB2 b2lkIExpbmVCb3hCdWlsZGVyOjpzZXRJbml0aWFsVmVydGljYWxHZW9tZXRyeUZvcklubGluZUJv eChJbmxpbmVMZXZlbEJveCYgaW5saQogICAgIGlubGluZUxldmVsQm94LnNldExheW91dEJvdW5k cyhJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsgZmxvb3JmKGFzY2VudCksIGNlaWxmKGRl c2NlbnQpIH0pOwogfQogCi1JbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6 UnVuTGlzdCYgcnVucykKK0lubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVj dEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpS dW5MaXN0JiBydW5zLCBzaXplX3QgbGluZUluZGV4KQogewogICAgIGF1dG8mIHJvb3RJbmxpbmVC b3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBzZXRJbml0aWFsVmVydGljYWxHZW9t ZXRyeUZvcklubGluZUJveChyb290SW5saW5lQm94KTsKQEAgLTIzNiw2ICsyMzcsMTAgQEAgSW5s aW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZl bEJveGVzKExpbmVCb3gmIGxpbmUKICAgICAgICAgY2FuVXNlU2ltcGxpZmllZEFsaWdubWVudCA9 IExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNhblVzZVNpbXBsaWZpZWRBbGlnbm1lbnRGb3JJbmxp bmVMZXZlbEJveChyb290SW5saW5lQm94LCBpbmxpbmVMZXZlbEJveCwgYm94R2VvbWV0cnkpOwog ICAgIH07CiAKKyAgICBhdXRvIHN0eWxlVG9Vc2UgPSBbJl0gKGNvbnN0IGF1dG8mIGxheW91dEJv eCkgLT4gY29uc3QgUmVuZGVyU3R5bGUmIHsKKyAgICAgICAgcmV0dXJuICFsaW5lSW5kZXggPyBs YXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpOworICAgIH07CisK ICAgICBhdXRvIGNyZWF0ZUxpbmVTcGFubmluZ0lubGluZUJveGVzID0gWyZdIHsKICAgICAgICAg aWYgKHJ1bnMuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjY1LDcgKzI3MCw3 IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lCiAgICAgICAgIH0KICAgICAgICAgLy8gQ29uc3Ry dWN0IHRoZSBtaXNzaW5nIExpbmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGggdGhlIHRv cG1vc3QgbGF5b3V0IGJveC4KICAgICAgICAgZm9yIChhdXRvKiBsYXlvdXRCb3ggOiBXVEY6Om1h a2VSZXZlcnNlZFJhbmdlKGxheW91dEJveGVzV2l0aG91dElubGluZUJveGVzKSkgewotICAgICAg ICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KCps YXlvdXRCb3gsIGxheW91dEJveC0+c3R5bGUoKSwgcm9vdElubGluZUJveC5sb2dpY2FsTGVmdCgp LCByb290SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpLCBJbmxpbmVMZXZlbEJveDo6TGluZVNwYW5u aW5nSW5saW5lQm94OjpZZXMpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVM ZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KCpsYXlvdXRCb3gsIHN0eWxlVG9Vc2UoKmxheW91dEJv eCksIHJvb3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElubGluZUJveC5sb2dpY2FsV2lk dGgoKSwgSW5saW5lTGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJveDo6WWVzKTsKICAgICAg ICAgICAgIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KGlubGluZUJveCk7 CiAgICAgICAgICAgICB1cGRhdGVDYW5Vc2VTaW1wbGlmaWVkQWxpZ25tZW50KGlubGluZUJveCk7 CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5lQm94 KSk7CkBAIC0yNzYsOCArMjgxLDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6 Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmUKICAgICBhdXRv IGxpbmVIYXNDb250ZW50ID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBydW4gOiBydW5zKSB7CiAg ICAgICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKLSAgICAgICAgLy8gRklY TUU6IE1ha2UgdGhpcyBsaW5lIGluZGV4IGRlcGVuZGVudCB0byBzdXBwb3J0IGZpcnN0LWxpbmUg c3R5bGUuCi0gICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CisgICAgICAg IGF1dG8mIHN0eWxlID0gc3R5bGVUb1VzZShsYXlvdXRCb3gpOwogICAgICAgICBhdXRvIHJ1bkhh c0NvbnRlbnQgPSBbJl0gKCkgLT4gYm9vbCB7CiAgICAgICAgICAgICBBU1NFUlQoIWxpbmVIYXND b250ZW50KTsKICAgICAgICAgICAgIGlmIChydW4uaXNUZXh0KCkgfHwgcnVuLmlzQm94KCkgfHwg cnVuLmlzU29mdExpbmVCcmVhaygpIHx8IHJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCb3hCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCmluZGV4IGY5NjlkZDk4NjMxYTAzY2Zl NDYyZDY2NWI4Y2NiNGViNWViOTMwY2YuLmZlMDJjYjM2Mjk5YjU2MTYyODg3OTk0OTE2ZWM5ZjY2 NGU2NWRjMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaApA QCAtNDgsMTIgKzQ4LDEyIEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lRGlzcGxheTo6TGluZSBs aW5lOwogICAgICAgICBMaW5lQm94IGxpbmVCb3g7CiAgICAgfTsKLSAgICBMaW5lQW5kTGluZUJv eCBidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmKTsKKyAgICBMaW5lQW5kTGlu ZUJveCBidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmLCBzaXplX3QgbGluZUlu ZGV4KTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9y SW5saW5lQm94KElubGluZUxldmVsQm94JikgY29uc3Q7CiAgICAgdm9pZCBhZGp1c3RWZXJ0aWNh bEdlb21ldHJ5Rm9ySW5saW5lQm94V2l0aEZhbGxiYWNrRm9udHMoSW5saW5lTGV2ZWxCb3gmLCBj b25zdCBUZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCYpIGNvbnN0OwotICAgIElubGluZUxheW91 dFVuaXQgY29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmLCBjb25zdCBM aW5lOjpSdW5MaXN0Jik7CisgICAgSW5saW5lTGF5b3V0VW5pdCBjb25zdHJ1Y3RBbmRBbGlnbklu bGluZUxldmVsQm94ZXMoTGluZUJveCYsIGNvbnN0IExpbmU6OlJ1bkxpc3QmLCBzaXplX3QgbGlu ZUluZGV4KTsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5n Q29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7IH0KICAg ICBjb25zdCBCb3gmIHJvb3RCb3goKSBjb25zdCB7IHJldHVybiBmb3JtYXR0aW5nQ29udGV4dCgp LnJvb3QoKTsgfQo= 439556 2021-09-28 19:30:28 -0700 2021-09-29 12:39:04 -0700 Patch bug-230930-20210928193027.patch text/plain 8222 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQwZGUxNjIwYzU1NTc3 MDBiY2I4ZGY3M2EwOWM3MzJmMmJlMWZlZi4uMTY2NzY3ZDc2ZmU0ODRiYWI3NGNjNjNlNGQyMmFk MGYzZWFhODQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCb3hC dWlsZGVyIHNob3VsZCB1c2UgdGhlIGZpcnN0LWxpbmUgc3R5bGUgd2hlbiBhcHBsaWNhYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGlu IHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIGZpcnN0LWxpbmUgc3R5bGUuCisKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpsaW5lTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmJ1 aWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVj dEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMS0wOS0yOCAgQWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBVc2UgdGhl IGZpcnN0LWxpbmUgc3R5bGUgd2hlbiBtZWFzdXJpbmcgdGV4dCBjb250ZW50IHdoZW4gYXBwbGlj YWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IDhiMmJhN2QxZWI2ZmQ1ZWNlYTFmMjk2ZjhmNmYzODg1Y2I3Yzk3M2QuLjEzMjYwMzM4 M2NmNTAxNzA3ODc4MTA5NjYxNGY4YWY5NzczN2E1ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU3MiwxMSArNTcyLDEyIEBAIHZv aWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RDb250ZW50SWZOZWVkZWQoKQogSW5s aW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNv bnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKIHsKICAg ICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0aW5nU3RhdGUoKTsKLSAgICBh dXRvIGxpbmVBbmRMaW5lQm94ID0gTGluZUJveEJ1aWxkZXIoKnRoaXMpLmJ1aWxkKGxpbmVDb250 ZW50KTsKKyAgICBhdXRvIGN1cnJlbnRMaW5lSW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMo KS5zaXplKCk7CisKKyAgICBhdXRvIGxpbmVBbmRMaW5lQm94ID0gTGluZUJveEJ1aWxkZXIoKnRo aXMpLmJ1aWxkKGxpbmVDb250ZW50LCBjdXJyZW50TGluZUluZGV4KTsKICAgICBhdXRvIGxpbmVC b3hMb2dpY2FsUmVjdCA9IGxpbmVBbmRMaW5lQm94LmxpbmUubGluZUJveExvZ2ljYWxSZWN0KCk7 CiAKICAgICBhdXRvIGlubGluZUNvbnRlbnRCdWlsZGVyID0gSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyIHsgcm9vdCgpLCBmb3JtYXR0aW5nU3RhdGUgfTsKLSAgICBhdXRvIGN1cnJlbnRMaW5l SW5kZXggPSBmb3JtYXR0aW5nU3RhdGUubGluZXMoKS5zaXplKCk7CiAgICAgZm9ybWF0dGluZ1N0 YXRlLmFkZEJveGVzKGlubGluZUNvbnRlbnRCdWlsZGVyLmJ1aWxkKGxpbmVDb250ZW50LCBsaW5l QW5kTGluZUJveC5saW5lQm94LCBsaW5lQm94TG9naWNhbFJlY3QudG9wTGVmdCgpLCBjdXJyZW50 TGluZUluZGV4KSk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goV1RGTW92ZShsaW5l QW5kTGluZUJveC5saW5lQm94KSk7CiAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmUobGluZUFu ZExpbmVCb3gubGluZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRl ci5jcHAKaW5kZXggNzA1YTEyOWRkMWNhYTA2YTI1OGM2NTZjMzU4NTQ1Y2MwNjE1NjhkYS4uMGJk YTk0MGM5OTI5ZjhmNzRiYmM2ODMyNmQwYTlkNWFkYmJmNzJmZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1 aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAtMTA5LDE0ICsxMDksMTUgQEAgTGlu ZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 JiBpbmxpbmVGb3JtYXR0aW5nQ28KIHsKIH0KIAotTGluZUJveEJ1aWxkZXI6OkxpbmVBbmRMaW5l Qm94IExpbmVCb3hCdWlsZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm IGxpbmVDb250ZW50KQorTGluZUJveEJ1aWxkZXI6OkxpbmVBbmRMaW5lQm94IExpbmVCb3hCdWls ZGVyOjpidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBz aXplX3QgbGluZUluZGV4KQogewogICAgIGF1dG8mIHJ1bnMgPSBsaW5lQ29udGVudC5ydW5zOwog ICAgIGF1dG8gY29udGVudExvZ2ljYWxXaWR0aCA9IGxpbmVDb250ZW50LmNvbnRlbnRMb2dpY2Fs V2lkdGg7Ci0gICAgYXV0byBjb250ZW50TG9naWNhbExlZnQgPSBMYXlvdXQ6Omhvcml6b250YWxB bGlnbm1lbnRPZmZzZXQocnVucywgcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCksIGxpbmVD b250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVDb250ZW50 LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkudmFsdWVfb3IoSW5saW5lTGF5b3V0VW5pdCB7 IH0pOworICAgIGF1dG8gdGV4dEFsaWduID0gIWxpbmVJbmRleCA/IHJvb3RCb3goKS5maXJzdExp bmVTdHlsZSgpLnRleHRBbGlnbigpIDogcm9vdEJveCgpLnN0eWxlKCkudGV4dEFsaWduKCk7Cisg ICAgYXV0byBjb250ZW50TG9naWNhbExlZnQgPSBMYXlvdXQ6Omhvcml6b250YWxBbGlnbm1lbnRP ZmZzZXQocnVucywgdGV4dEFsaWduLCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBjb250 ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQp LnZhbHVlX29yKElubGluZUxheW91dFVuaXQgeyB9KTsKICAgICBhdXRvIGxpbmVCb3ggPSBMaW5l Qm94IHsgcm9vdEJveCgpLCBjb250ZW50TG9naWNhbExlZnQsIGNvbnRlbnRMb2dpY2FsV2lkdGgs IGxpbmVDb250ZW50Lm5vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3VudCB9OwogCi0gICAgYXV0 byBsaW5lQm94TG9naWNhbEhlaWdodCA9IGNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hl cyhsaW5lQm94LCBydW5zKTsKKyAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0ID0gY29uc3Ry dWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMsIGxpbmVJbmRleCk7CiAK ICAgICBhdXRvIGxpbmUgPSBbJl0gewogICAgICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsUmVjdCA9 IElubGluZVJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGlu ZUxvZ2ljYWxXaWR0aCwgbGluZUJveExvZ2ljYWxIZWlnaHQgfTsKQEAgLTIyMiw3ICsyMjMsNyBA QCB2b2lkIExpbmVCb3hCdWlsZGVyOjpzZXRJbml0aWFsVmVydGljYWxHZW9tZXRyeUZvcklubGlu ZUJveChJbmxpbmVMZXZlbEJveCYgaW5saQogICAgIGlubGluZUxldmVsQm94LnNldExheW91dEJv dW5kcyhJbmxpbmVMZXZlbEJveDo6TGF5b3V0Qm91bmRzIHsgZmxvb3JmKGFzY2VudCksIGNlaWxm KGRlc2NlbnQpIH0pOwogfQogCi1JbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZTo6UnVuTGlzdCYgcnVucykKK0lubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0 cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5l OjpSdW5MaXN0JiBydW5zLCBzaXplX3QgbGluZUluZGV4KQogewogICAgIGF1dG8mIHJvb3RJbmxp bmVCb3ggPSBsaW5lQm94LnJvb3RJbmxpbmVCb3goKTsKICAgICBzZXRJbml0aWFsVmVydGljYWxH ZW9tZXRyeUZvcklubGluZUJveChyb290SW5saW5lQm94KTsKQEAgLTIzNiw2ICsyMzcsMTAgQEAg SW5saW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVM ZXZlbEJveGVzKExpbmVCb3gmIGxpbmUKICAgICAgICAgY2FuVXNlU2ltcGxpZmllZEFsaWdubWVu dCA9IExpbmVCb3hWZXJ0aWNhbEFsaWduZXI6OmNhblVzZVNpbXBsaWZpZWRBbGlnbm1lbnRGb3JJ bmxpbmVMZXZlbEJveChyb290SW5saW5lQm94LCBpbmxpbmVMZXZlbEJveCwgYm94R2VvbWV0cnkp OwogICAgIH07CiAKKyAgICBhdXRvIHN0eWxlVG9Vc2UgPSBbJl0gKGNvbnN0IGF1dG8mIGxheW91 dEJveCkgLT4gY29uc3QgUmVuZGVyU3R5bGUmIHsKKyAgICAgICAgcmV0dXJuICFsaW5lSW5kZXgg PyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6IGxheW91dEJveC5zdHlsZSgpOworICAgIH07 CisKICAgICBhdXRvIGNyZWF0ZUxpbmVTcGFubmluZ0lubGluZUJveGVzID0gWyZdIHsKICAgICAg ICAgaWYgKHJ1bnMuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjY1LDcgKzI3 MCw3IEBAIElubGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWdu SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lCiAgICAgICAgIH0KICAgICAgICAgLy8gQ29u c3RydWN0IHRoZSBtaXNzaW5nIExpbmVCb3g6OklubGluZUJveGVzIHN0YXJ0aW5nIHdpdGggdGhl IHRvcG1vc3QgbGF5b3V0IGJveC4KICAgICAgICAgZm9yIChhdXRvKiBsYXlvdXRCb3ggOiBXVEY6 Om1ha2VSZXZlcnNlZFJhbmdlKGxheW91dEJveGVzV2l0aG91dElubGluZUJveGVzKSkgewotICAg ICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxpbmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94 KCpsYXlvdXRCb3gsIGxheW91dEJveC0+c3R5bGUoKSwgcm9vdElubGluZUJveC5sb2dpY2FsTGVm dCgpLCByb290SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpLCBJbmxpbmVMZXZlbEJveDo6TGluZVNw YW5uaW5nSW5saW5lQm94OjpZZXMpOworICAgICAgICAgICAgYXV0byBpbmxpbmVCb3ggPSBJbmxp bmVMZXZlbEJveDo6Y3JlYXRlSW5saW5lQm94KCpsYXlvdXRCb3gsIHN0eWxlVG9Vc2UoKmxheW91 dEJveCksIHJvb3RJbmxpbmVCb3gubG9naWNhbExlZnQoKSwgcm9vdElubGluZUJveC5sb2dpY2Fs V2lkdGgoKSwgSW5saW5lTGV2ZWxCb3g6OkxpbmVTcGFubmluZ0lubGluZUJveDo6WWVzKTsKICAg ICAgICAgICAgIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KGlubGluZUJv eCk7CiAgICAgICAgICAgICB1cGRhdGVDYW5Vc2VTaW1wbGlmaWVkQWxpZ25tZW50KGlubGluZUJv eCk7CiAgICAgICAgICAgICBsaW5lQm94LmFkZElubGluZUxldmVsQm94KFdURk1vdmUoaW5saW5l Qm94KSk7CkBAIC0yNzYsOCArMjgxLDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRl cjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmUKICAgICBh dXRvIGxpbmVIYXNDb250ZW50ID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBydW4gOiBydW5zKSB7 CiAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKLSAgICAgICAgLy8g RklYTUU6IE1ha2UgdGhpcyBsaW5lIGluZGV4IGRlcGVuZGVudCB0byBzdXBwb3J0IGZpcnN0LWxp bmUgc3R5bGUuCi0gICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7CisgICAg ICAgIGF1dG8mIHN0eWxlID0gc3R5bGVUb1VzZShsYXlvdXRCb3gpOwogICAgICAgICBhdXRvIHJ1 bkhhc0NvbnRlbnQgPSBbJl0gKCkgLT4gYm9vbCB7CiAgICAgICAgICAgICBBU1NFUlQoIWxpbmVI YXNDb250ZW50KTsKICAgICAgICAgICAgIGlmIChydW4uaXNUZXh0KCkgfHwgcnVuLmlzQm94KCkg fHwgcnVuLmlzU29mdExpbmVCcmVhaygpIHx8IHJ1bi5pc0hhcmRMaW5lQnJlYWsoKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCb3hCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCmluZGV4IGY5NjlkZDk4NjMxYTAz Y2ZlNDYyZDY2NWI4Y2NiNGViNWViOTMwY2YuLmZlMDJjYjM2Mjk5YjU2MTYyODg3OTk0OTE2ZWM5 ZjY2NGU2NWRjMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIu aApAQCAtNDgsMTIgKzQ4LDEyIEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lRGlzcGxheTo6TGlu ZSBsaW5lOwogICAgICAgICBMaW5lQm94IGxpbmVCb3g7CiAgICAgfTsKLSAgICBMaW5lQW5kTGlu ZUJveCBidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmKTsKKyAgICBMaW5lQW5k TGluZUJveCBidWlsZChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmLCBzaXplX3QgbGlu ZUluZGV4KTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5 Rm9ySW5saW5lQm94KElubGluZUxldmVsQm94JikgY29uc3Q7CiAgICAgdm9pZCBhZGp1c3RWZXJ0 aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94V2l0aEZhbGxiYWNrRm9udHMoSW5saW5lTGV2ZWxCb3gm LCBjb25zdCBUZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCYpIGNvbnN0OwotICAgIElubGluZUxh eW91dFVuaXQgY29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmLCBjb25z dCBMaW5lOjpSdW5MaXN0Jik7CisgICAgSW5saW5lTGF5b3V0VW5pdCBjb25zdHJ1Y3RBbmRBbGln bklubGluZUxldmVsQm94ZXMoTGluZUJveCYsIGNvbnN0IExpbmU6OlJ1bkxpc3QmLCBzaXplX3Qg bGluZUluZGV4KTsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0 aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7IH0K ICAgICBjb25zdCBCb3gmIHJvb3RCb3goKSBjb25zdCB7IHJldHVybiBmb3JtYXR0aW5nQ29udGV4 dCgpLnJvb3QoKTsgfQo= 439645 2021-09-29 12:39:06 -0700 2021-09-29 13:54:01 -0700 Patch bug-230930-20210929123905.patch text/plain 8200 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI5YzI3NmMzNmY2OTJi MWI1ZTc0OWU0ZmRmMzhjYmYwMzMwMWZmNy4uZmIyOTVkNWU4NWUwZDU1NzFiMzA4MjJlMmU2MjYx NDgwZTM1ZTlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmVCb3hC dWlsZGVyIHNob3VsZCB1c2UgdGhlIGZpcnN0LWxpbmUgc3R5bGUgd2hlbiBhcHBsaWNhYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGlzIGlzIGlu IHByZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nIGZpcnN0LWxpbmUgc3R5bGUuCisKKyAgICAgICAg KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpsaW5lTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmJ1 aWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVj dEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMS0wOS0yOSAgS2lt bW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhU3RyZWFt IGNhbnZhcy5jYXB0dXJlU3RyZWFtKCkgZmFpbHMgZm9yIFdlYkdMCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggOGIyYmE3ZDFlYjZmZDVl Y2VhMWYyOTZmOGY2ZjM4ODVjYjdjOTczZC4uMTMyNjAzMzgzY2Y1MDE3MDc4NzgxMDk2NjE0Zjhh Zjk3NzM3YTVlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtNTcyLDExICs1NzIsMTIgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6Y29sbGVjdENvbnRlbnRJZk5lZWRlZCgpCiBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbGRl cjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50KQogewogICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0 ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOwotICAgIGF1dG8gbGluZUFuZExpbmVCb3ggPSBM aW5lQm94QnVpbGRlcigqdGhpcykuYnVpbGQobGluZUNvbnRlbnQpOworICAgIGF1dG8gY3VycmVu dExpbmVJbmRleCA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLnNpemUoKTsKKworICAgIGF1dG8g bGluZUFuZExpbmVCb3ggPSBMaW5lQm94QnVpbGRlcigqdGhpcykuYnVpbGQobGluZUNvbnRlbnQs IGN1cnJlbnRMaW5lSW5kZXgpOwogICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gbGluZUFu ZExpbmVCb3gubGluZS5saW5lQm94TG9naWNhbFJlY3QoKTsKIAogICAgIGF1dG8gaW5saW5lQ29u dGVudEJ1aWxkZXIgPSBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIgeyByb290KCksIGZvcm1h dHRpbmdTdGF0ZSB9OwotICAgIGF1dG8gY3VycmVudExpbmVJbmRleCA9IGZvcm1hdHRpbmdTdGF0 ZS5saW5lcygpLnNpemUoKTsKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkQm94ZXMoaW5saW5lQ29u dGVudEJ1aWxkZXIuYnVpbGQobGluZUNvbnRlbnQsIGxpbmVBbmRMaW5lQm94LmxpbmVCb3gsIGxp bmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCksIGN1cnJlbnRMaW5lSW5kZXgpKTsKICAgICBmb3Jt YXR0aW5nU3RhdGUuYWRkTGluZUJveChXVEZNb3ZlKGxpbmVBbmRMaW5lQm94LmxpbmVCb3gpKTsK ICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZShsaW5lQW5kTGluZUJveC5saW5lKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCb3hCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcAppbmRleCA3MDVhMTI5ZGQx Y2FhMDZhMjU4YzY1NmMzNTg1NDVjYzA2MTU2OGRhLi4wYmRhOTQwYzk5MjlmOGY3NGJiYzY4MzI2 ZDBhOWQ1YWRiYmY3MmZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1 aWxkZXIuY3BwCkBAIC0xMDksMTQgKzEwOSwxNSBAQCBMaW5lQm94QnVpbGRlcjo6TGluZUJveEJ1 aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDbwog ewogfQogCi1MaW5lQm94QnVpbGRlcjo6TGluZUFuZExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1 aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCitMaW5lQm94 QnVpbGRlcjo6TGluZUFuZExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIHNpemVfdCBsaW5lSW5kZXgpCiB7CiAg ICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBjb250ZW50TG9naWNh bFdpZHRoID0gbGluZUNvbnRlbnQuY29udGVudExvZ2ljYWxXaWR0aDsKLSAgICBhdXRvIGNvbnRl bnRMb2dpY2FsTGVmdCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChydW5zLCBy b290Qm94KCkuc3R5bGUoKS50ZXh0QWxpZ24oKSwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0 aCwgY29udGVudExvZ2ljYWxXaWR0aCwgbGluZUNvbnRlbnQuaXNMYXN0TGluZVdpdGhJbmxpbmVD b250ZW50KS52YWx1ZV9vcihJbmxpbmVMYXlvdXRVbml0IHsgfSk7CisgICAgYXV0byB0ZXh0QWxp Z24gPSAhbGluZUluZGV4ID8gcm9vdEJveCgpLmZpcnN0TGluZVN0eWxlKCkudGV4dEFsaWduKCkg OiByb290Qm94KCkuc3R5bGUoKS50ZXh0QWxpZ24oKTsKKyAgICBhdXRvIGNvbnRlbnRMb2dpY2Fs TGVmdCA9IExheW91dDo6aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChydW5zLCB0ZXh0QWxpZ24s IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGNvbnRlbnRMb2dpY2FsV2lkdGgsIGxpbmVD b250ZW50LmlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkudmFsdWVfb3IoSW5saW5lTGF5b3V0 VW5pdCB7IH0pOwogICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGNvbnRl bnRMb2dpY2FsTGVmdCwgY29udGVudExvZ2ljYWxXaWR0aCwgbGluZUNvbnRlbnQubm9uU3Bhbm5p bmdJbmxpbmVMZXZlbEJveENvdW50IH07CiAKLSAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVpZ2h0 ID0gY29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKGxpbmVCb3gsIHJ1bnMpOworICAg IGF1dG8gbGluZUJveExvZ2ljYWxIZWlnaHQgPSBjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVs Qm94ZXMobGluZUJveCwgcnVucywgbGluZUluZGV4KTsKIAogICAgIGF1dG8gbGluZSA9IFsmXSB7 CiAgICAgICAgIGF1dG8gbGluZUJveExvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IGxpbmVDb250 ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCBsaW5lQm94 TG9naWNhbEhlaWdodCB9OwpAQCAtMjIyLDcgKzIyMyw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6 OnNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KElubGluZUxldmVsQm94JiBp bmxpCiAgICAgaW5saW5lTGV2ZWxCb3guc2V0TGF5b3V0Qm91bmRzKElubGluZUxldmVsQm94OjpM YXlvdXRCb3VuZHMgeyBmbG9vcmYoYXNjZW50KSwgY2VpbGYoZGVzY2VudCkgfSk7CiB9CiAKLUlu bGluZUxheW91dFVuaXQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2 ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zKQorSW5s aW5lTGF5b3V0VW5pdCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZl bEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMsIHNpemVf dCBsaW5lSW5kZXgpCiB7CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9vdElu bGluZUJveCgpOwogICAgIHNldEluaXRpYWxWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KHJv b3RJbmxpbmVCb3gpOwpAQCAtMjM2LDYgKzIzNywxMCBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVC b3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGlu ZQogICAgICAgICBjYW5Vc2VTaW1wbGlmaWVkQWxpZ25tZW50ID0gTGluZUJveFZlcnRpY2FsQWxp Z25lcjo6Y2FuVXNlU2ltcGxpZmllZEFsaWdubWVudEZvcklubGluZUxldmVsQm94KHJvb3RJbmxp bmVCb3gsIGlubGluZUxldmVsQm94LCBib3hHZW9tZXRyeSk7CiAgICAgfTsKIAorICAgIGF1dG8g c3R5bGVUb1VzZSA9IFsmXSAoY29uc3QgYXV0byYgbGF5b3V0Qm94KSAtPiBjb25zdCBSZW5kZXJT dHlsZSYgeworICAgICAgICByZXR1cm4gIWxpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVT dHlsZSgpIDogbGF5b3V0Qm94LnN0eWxlKCk7CisgICAgfTsKKwogICAgIGF1dG8gY3JlYXRlTGlu ZVNwYW5uaW5nSW5saW5lQm94ZXMgPSBbJl0gewogICAgICAgICBpZiAocnVucy5pc0VtcHR5KCkp CiAgICAgICAgICAgICByZXR1cm47CkBAIC0yNjUsNyArMjcwLDcgQEAgSW5saW5lTGF5b3V0VW5p dCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0QW5kQWxpZ25JbmxpbmVMZXZlbEJveGVzKExpbmVC b3gmIGxpbmUKICAgICAgICAgfQogICAgICAgICAvLyBDb25zdHJ1Y3QgdGhlIG1pc3NpbmcgTGlu ZUJveDo6SW5saW5lQm94ZXMgc3RhcnRpbmcgd2l0aCB0aGUgdG9wbW9zdCBsYXlvdXQgYm94Lgog ICAgICAgICBmb3IgKGF1dG8qIGxheW91dEJveCA6IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UobGF5 b3V0Qm94ZXNXaXRob3V0SW5saW5lQm94ZXMpKSB7Ci0gICAgICAgICAgICBhdXRvIGlubGluZUJv eCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3goKmxheW91dEJveCwgbGF5b3V0Qm94 LT5zdHlsZSgpLCByb290SW5saW5lQm94LmxvZ2ljYWxMZWZ0KCksIHJvb3RJbmxpbmVCb3gubG9n aWNhbFdpZHRoKCksIElubGluZUxldmVsQm94OjpMaW5lU3Bhbm5pbmdJbmxpbmVCb3g6Olllcyk7 CisgICAgICAgICAgICBhdXRvIGlubGluZUJveCA9IElubGluZUxldmVsQm94OjpjcmVhdGVJbmxp bmVCb3goKmxheW91dEJveCwgc3R5bGVUb1VzZSgqbGF5b3V0Qm94KSwgcm9vdElubGluZUJveC5s b2dpY2FsTGVmdCgpLCByb290SW5saW5lQm94LmxvZ2ljYWxXaWR0aCgpLCBJbmxpbmVMZXZlbEJv eDo6TGluZVNwYW5uaW5nSW5saW5lQm94OjpZZXMpOwogICAgICAgICAgICAgc2V0SW5pdGlhbFZl cnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goaW5saW5lQm94KTsKICAgICAgICAgICAgIHVwZGF0 ZUNhblVzZVNpbXBsaWZpZWRBbGlnbm1lbnQoaW5saW5lQm94KTsKICAgICAgICAgICAgIGxpbmVC b3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKQEAgLTI3Niw4ICsyODEs NyBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RBbmRBbGlnbklu bGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZQogICAgIGF1dG8gbGluZUhhc0NvbnRlbnQgPSBm YWxzZTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMpIHsKICAgICAgICAgYXV0byYgbGF5b3V0 Qm94ID0gcnVuLmxheW91dEJveCgpOwotICAgICAgICAvLyBGSVhNRTogTWFrZSB0aGlzIGxpbmUg aW5kZXggZGVwZW5kZW50IHRvIHN1cHBvcnQgZmlyc3QtbGluZSBzdHlsZS4KLSAgICAgICAgYXV0 byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKKyAgICAgICAgYXV0byYgc3R5bGUgPSBzdHls ZVRvVXNlKGxheW91dEJveCk7CiAgICAgICAgIGF1dG8gcnVuSGFzQ29udGVudCA9IFsmXSAoKSAt PiBib29sIHsKICAgICAgICAgICAgIEFTU0VSVCghbGluZUhhc0NvbnRlbnQpOwogICAgICAgICAg ICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4uaXNCb3goKSB8fCBydW4uaXNTb2Z0TGluZUJyZWFr KCkgfHwgcnVuLmlzSGFyZExpbmVCcmVhaygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmgKaW5kZXggZjk2OWRkOTg2MzFhMDNjZmU0NjJkNjY1YjhjY2I0ZWI1ZWI5 MzBjZi4uZmUwMmNiMzYyOTliNTYxNjI4ODc5OTQ5MTZlYzlmNjY0ZTY1ZGMxOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCkBAIC00OCwxMiArNDgsMTIgQEAg cHVibGljOgogICAgICAgICBJbmxpbmVEaXNwbGF5OjpMaW5lIGxpbmU7CiAgICAgICAgIExpbmVC b3ggbGluZUJveDsKICAgICB9OwotICAgIExpbmVBbmRMaW5lQm94IGJ1aWxkKGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udGVudCYpOworICAgIExpbmVBbmRMaW5lQm94IGJ1aWxkKGNvbnN0IExp bmVCdWlsZGVyOjpMaW5lQ29udGVudCYsIHNpemVfdCBsaW5lSW5kZXgpOwogCiBwcml2YXRlOgog ICAgIHZvaWQgc2V0SW5pdGlhbFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goSW5saW5lTGV2 ZWxCb3gmKSBjb25zdDsKICAgICB2b2lkIGFkanVzdFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVC b3hXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVMZXZlbEJveCYsIGNvbnN0IFRleHRVdGlsOjpGYWxs YmFja0ZvbnRMaXN0JikgY29uc3Q7Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBjb25zdHJ1Y3RBbmRB bGlnbklubGluZUxldmVsQm94ZXMoTGluZUJveCYsIGNvbnN0IExpbmU6OlJ1bkxpc3QmKTsKKyAg ICBJbmxpbmVMYXlvdXRVbml0IGNvbnN0cnVjdEFuZEFsaWduSW5saW5lTGV2ZWxCb3hlcyhMaW5l Qm94JiwgY29uc3QgTGluZTo6UnVuTGlzdCYsIHNpemVfdCBsaW5lSW5kZXgpOwogCiAgICAgY29u c3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRpbmdDb250ZXh0KCkgY29uc3QgeyBy ZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsgfQogICAgIGNvbnN0IEJveCYgcm9vdEJv eCgpIGNvbnN0IHsgcmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpOyB9Cg==