236872 2022-02-18 16:14:37 -0800 [LFC][IFC] Add support for ideographic baseline with font fallback 2022-02-19 08:18:17 -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 1843699 0 zalan 2022-02-18 16:14:37 -0800 ssia 1843701 1 452600 zalan 2022-02-18 16:17:35 -0800 Created attachment 452600 Patch 1843706 2 452603 zalan 2022-02-18 16:22:37 -0800 Created attachment 452603 Patch 1843784 3 452624 zalan 2022-02-18 21:28:03 -0800 Created attachment 452624 Patch 1843847 4 ews-feeder 2022-02-19 08:17:15 -0800 Committed r290207 (247535@main): <https://commits.webkit.org/247535@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452624. 1843849 5 webkit-bug-importer 2022-02-19 08:18:17 -0800 <rdar://problem/89187641> 452600 2022-02-18 16:17:35 -0800 2022-02-18 16:22:35 -0800 Patch bug-236872-20220218161734.patch text/plain 9456 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I2ZjUwNWUxNDNhNTc4 Y2NkZWMyYzRkNmMwNGZkMjkyYmU2MDNmOC4uYWE3YmUyOWY1MDJmYTU4YWQxOGEyZDNiYjIyY2Ux NDE2ZmJhOTYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpZGVvZ3JhcGhpYyBiYXNlbGluZSB3aXRoIGZvbnQgZmFsbGJhY2sKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjg3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIHVzZSB0aGUgcHJl LWNvbGxlY3RlZCBmYWxsYmFjayBmb250cyB0byBhZGp1c3QgdGhlIGlubGluZSBib3ggbGF5b3V0 IGJvdW5kcyB3aXRoIHRoZWlyIGlkZW9ncmFwaGljIGJhc2VsaW5lcy4KKyAgICAgICAgVGhpcyBp cyBpbiBwcmVwYXJhdGlvbiBmb3IgZW5hYmxpbmcgdmVydGljYWwgdGV4dC4KKworICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmFkanVzdExheW91 dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRlb2dyYXBo aWNCYXNlbGluZUlmQXBwbGljYWJsZSk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMi0wMi0xOCAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1Y2Ug TGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5kZXggN2E3YzFhMTc4ZmI1Njg1MGI5NmJlNTU0 MDk1MGNjOWI4Yjk1ZmJhMC4uYjA1NDY0OGFhZTM3N2FjM2U5NTBjMTg1YTQ0ZTViYjYyMzIwOTQ5 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAt MTE2LDcgKzExNiw3IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIHNpemVfCiAgICAgcmV0dXJuIGxpbmVC b3g7CiB9CiAKLXZvaWQgTGluZUJveEJ1aWxkZXI6OmFkanVzdExheW91dEJvdW5kc1dpdGhGYWxs YmFja0ZvbnRzKElubGluZUxldmVsQm94JiBpbmxpbmVCb3gsIGNvbnN0IFRleHRVdGlsOjpGYWxs YmFja0ZvbnRMaXN0JiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCkgY29uc3QKK3ZvaWQgTGluZUJv eEJ1aWxkZXI6OmFkanVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKElubGluZUxldmVs Qm94JiBpbmxpbmVCb3gsIGNvbnN0IFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0JiBmYWxsYmFj a0ZvbnRzRm9yQ29udGVudCwgRm9udEJhc2VsaW5lIGZvbnRCYXNlbGluZSkgY29uc3QKIHsKICAg ICBBU1NFUlQoIWZhbGxiYWNrRm9udHNGb3JDb250ZW50LmlzRW1wdHkoKSk7CiAgICAgQVNTRVJU KGlubGluZUJveC5pc0lubGluZUJveCgpKTsKQEAgLTEzNCw4ICsxMzQsOCBAQCB2b2lkIExpbmVC b3hCdWlsZGVyOjphZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVMZXZl bEJveCYgaW5saW5lQgogICAgIGF1dG8gc2hvdWxkVXNlTGluZUdhcFRvQWRqdXN0QXNjZW50RGVz Y2VudCA9IGlubGluZUJveC5pc1Jvb3RJbmxpbmVCb3goKSB8fCBpc1RleHRFZGdlTGVhZGluZzsK ICAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCkgewogICAgICAg ICBhdXRvJiBmb250TWV0cmljcyA9IGZvbnQtPmZvbnRNZXRyaWNzKCk7Ci0gICAgICAgIElubGlu ZUxheW91dFVuaXQgYXNjZW50ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7Ci0gICAgICAgIElubGlu ZUxheW91dFVuaXQgZGVzY2VudCA9IGZvbnRNZXRyaWNzLmRlc2NlbnQoKTsKKyAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsK KyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudChm b250QmFzZWxpbmUpOwogICAgICAgICBpZiAoc2hvdWxkVXNlTGluZUdhcFRvQWRqdXN0QXNjZW50 RGVzY2VudCkgewogICAgICAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gYXNjZW50ICsgZGVz Y2VudDsKICAgICAgICAgICAgIGF1dG8gaGFsZkxpbmVHYXAgPSAoZm9udE1ldHJpY3MubGluZVNw YWNpbmcoKSAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKQEAgLTE1MSw4ICsxNTEsOSBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjphZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVM ZXZlbEJveCYgaW5saW5lQgogICAgIGlubGluZUJveC5zZXRMYXlvdXRCb3VuZHMoeyBzdGQ6Om1h eChsYXlvdXRCb3VuZHMuYXNjZW50LCBmbG9vcmYobWF4QXNjZW50KSksIHN0ZDo6bWF4KGxheW91 dEJvdW5kcy5kZXNjZW50LCBjZWlsZihtYXhEZXNjZW50KSkgfSk7CiB9CiAKLVRleHRVdGlsOjpG YWxsYmFja0ZvbnRMaXN0IExpbmVCb3hCdWlsZGVyOjpjb2xsZWN0RmFsbGJhY2tGb250cyhjb25z dCBMaW5lOjpSdW4mIHJ1biwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQorVGV4dFV0aWw6OkZh bGxiYWNrRm9udExpc3QgTGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzKGNvbnN0 IElubGluZUxldmVsQm94JiBwYXJlbnRJbmxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1biYgcnVuLCBj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7CisgICAgQVNTRVJUKHBhcmVudElubGluZUJveC5p c0lubGluZUJveCgpKTsKICAgICBhdXRvJiBpbmxpbmVUZXh0Qm94ID0gZG93bmNhc3Q8SW5saW5l VGV4dEJveD4ocnVuLmxheW91dEJveCgpKTsKICAgICBpZiAoaW5saW5lVGV4dEJveC5jYW5Vc2VT aW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpKSB7CiAgICAgICAgIC8vIFNpbXBsaWZpZWQgdGV4 dCBtZWFzdXJpbmcgd29ya3Mgd2l0aCBwcmltYXJ5IGZvbnQgb25seS4KQEAgLTE2MywxNSArMTY0 LDE0IEBAIFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0IExpbmVCb3hCdWlsZGVyOjpjb2xsZWN0 RmFsbGJhY2tGb250cyhjb25zdCBMaW5lOjpSdW4mCiAgICAgaWYgKGZhbGxiYWNrRm9udHMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byBmYWxsYmFja0ZvbnRzSGF2 ZVZlcnRpY2FsR2x5cGggPSBbJl0gewotICAgICAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFj a0ZvbnRzKSB7Ci0gICAgICAgICAgICBpZiAoZm9udC0+aGFzVmVydGljYWxHbHlwaHMoKSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgfTsKLSAgICAvLyBBZGp1c3Qgbm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdo ZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmltYXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgotICAg IG1fZmFsbGJhY2tGb250UmVxdWlyZXNJZGVvZ3JhcGhpY0Jhc2VsaW5lID0gbV9mYWxsYmFja0Zv bnRSZXF1aXJlc0lkZW9ncmFwaGljQmFzZWxpbmUgfHwgZmFsbGJhY2tGb250c0hhdmVWZXJ0aWNh bEdseXBoKCk7CisgICAgYXV0byBmYWxsYmFja0ZvbnRzRm9ySW5saW5lQm94ZXMgPSBtX2ZhbGxi YWNrRm9udHNGb3JJbmxpbmVCb3hlcy5nZXQoJnBhcmVudElubGluZUJveCk7CisgICAgbnVtYmVy T2ZGYWxsYmFja0ZvbnRzRm9ySW5saW5lQm94ID0gZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVz LnNpemUoKTsKKyAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFja0ZvbnRzKSB7CisgICAgICAg IGZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3hlcy5hZGQoZm9udCk7CisgICAgICAgIG1fZmFsbGJh Y2tGb250UmVxdWlyZXNJZGVvZ3JhcGhpY0Jhc2VsaW5lID0gbV9mYWxsYmFja0ZvbnRSZXF1aXJl c0lkZW9ncmFwaGljQmFzZWxpbmUgfHwgZm9udC0+aGFzVmVydGljYWxHbHlwaHMoKTsKKyAgICB9 CisgICAgaWYgKGZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3hlcy5zaXplKCkgIT0gbnVtYmVyT2ZG YWxsYmFja0ZvbnRzRm9ySW5saW5lQm94KQorICAgICAgICBtX2ZhbGxiYWNrRm9udHNGb3JJbmxp bmVCb3hlcy5zZXQoJnBhcmVudElubGluZUJveCwgZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVz KTsKICAgICByZXR1cm4gZmFsbGJhY2tGb250czsKIH0KIApAQCAtMzMxLDcgKzMzMSw3IEBAIHZv aWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGlu ZUJveCwgY29uc3QgTGluZUJ1aWxkCiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkpIHsKICAgICAg ICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JM YXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKTsKICAgICAgICAgICAgIHBhcmVudElubGluZUJv eC5zZXRIYXNDb250ZW50KCk7Ci0gICAgICAgICAgICBpZiAoYXV0byBmYWxsYmFja0ZvbnRzID0g Y29sbGVjdEZhbGxiYWNrRm9udHMocnVuLCBzdHlsZSk7ICFmYWxsYmFja0ZvbnRzLmlzRW1wdHko KSkgeworICAgICAgICAgICAgaWYgKGF1dG8gZmFsbGJhY2tGb250cyA9IGNvbGxlY3RGYWxsYmFj a0ZvbnRzKHBhcmVudElubGluZUJveCwgcnVuLCBzdHlsZSk7ICFmYWxsYmFja0ZvbnRzLmlzRW1w dHkoKSkgewogICAgICAgICAgICAgICAgIC8vIEFkanVzdCBub24tZW1wdHkgaW5saW5lIGJveCBo ZWlnaHQgd2hlbiBnbHlwaHMgZnJvbSB0aGUgbm9uLXByaW1hcnkgZm9udCBzdHJldGNoIHRoZSBi b3guCiAgICAgICAgICAgICAgICAgYWRqdXN0TGF5b3V0Qm91bmRzV2l0aEZhbGxiYWNrRm9udHMo cGFyZW50SW5saW5lQm94LCBmYWxsYmFja0ZvbnRzKTsKICAgICAgICAgICAgIH0KQEAgLTM4Nywy MCArMzg3LDMzIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmFkanVzdElkZW9ncmFwaGljQmFzZWxp bmVJZkFwcGxpY2FibGUoTGluZUJveCYgbGluZUJveCwgc2l6CiAgICAgICAgIHJldHVybjsKIAog ICAgIGxpbmVCb3guc2V0QmFzZWxpbmVUeXBlKElkZW9ncmFwaGljQmFzZWxpbmUpOwotICAgIHNl dEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzKHJvb3RJbmxpbmVCb3gsIGxheW91dEJvdW5kc1ByaW1h cnlNZXRyaWNzRm9ySW5saW5lQm94KHJvb3RJbmxpbmVCb3gsIElkZW9ncmFwaGljQmFzZWxpbmUp KTsKLSAgICBmb3IgKGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJveC5ub25Sb290SW5saW5l TGV2ZWxCb3hlcygpKSB7CisKKyAgICBhdXRvIGFkanVzdExheW91dEJvdW5kc1dpdGhJZGVvZ3Jh cGhpY0Jhc2VsaW5lID0gWyZdIChhdXRvJiBpbmxpbmVMZXZlbEJveCkgeworICAgICAgICBhdXRv IGluaXRpYXRlc0xheW91dEJvdW5kc0NoYW5nZSA9IGlubGluZUxldmVsQm94LmlzSW5saW5lQm94 KCkgfHwgaW5saW5lTGV2ZWxCb3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpOworICAgICAgICBp ZiAoIWluaXRpYXRlc0xheW91dEJvdW5kc0NoYW5nZSkKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICBhdXRvIGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzID0gTGF5b3V0Qm91bmRzTWV0 cmljcyB7IH07CiAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpKQotICAg ICAgICAgICAgc2V0QmFzZWxpbmVBbmRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gsIGxheW91 dEJvdW5kc1ByaW1hcnlNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94LCBJZGVvZ3Jh cGhpY0Jhc2VsaW5lKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzTGluZUJy ZWFrQm94KCkpIHsKLSAgICAgICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVCb3gu aW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkucGFy ZW50KCkpOwotICAgICAgICAgICAgc2V0QmFzZWxpbmVBbmRMYXlvdXRCb3VuZHMoaW5saW5lTGV2 ZWxCb3gsIGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzRm9ySW5saW5lQm94KHBhcmVudElubGlu ZUJveCwgSWRlb2dyYXBoaWNCYXNlbGluZSkpOwotICAgICAgICB9IGVsc2UgaWYgKGlubGluZUxl dmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgeworICAgICAgICAgICAgbGF5b3V0Qm91 bmRzUHJpbWFyeU1ldHJpY3MgPSBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmljc0ZvcklubGluZUJv eChpbmxpbmVMZXZlbEJveCwgSWRlb2dyYXBoaWNCYXNlbGluZSk7CisgICAgICAgIGVsc2UgaWYg KGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewogICAgICAgICAgICAg YXV0byBpbmxpbmVMZXZlbEJveEhlaWdodCA9IGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp LmhlaWdodCgpOwogICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpZGVvZ3JhcGhpY0Jhc2Vs aW5lID0gcm91bmRUb0ludChpbmxpbmVMZXZlbEJveEhlaWdodCAvIDIpOwogICAgICAgICAgICAg Ly8gTW92ZSB0aGUgYmFzZWxpbmUgcG9zaXRpb24gYnV0IGtlZXAgdGhlIHNhbWUgbG9naWNhbCBo ZWlnaHQuCi0gICAgICAgICAgICBzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyhpbmxpbmVMZXZl bEJveCwgeyBpZGVvZ3JhcGhpY0Jhc2VsaW5lLCBpbmxpbmVMZXZlbEJveEhlaWdodCAtIGlkZW9n cmFwaGljQmFzZWxpbmUgfSk7CisgICAgICAgICAgICBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmlj cyA9IHsgaWRlb2dyYXBoaWNCYXNlbGluZSwgaW5saW5lTGV2ZWxCb3hIZWlnaHQgLSBpZGVvZ3Jh cGhpY0Jhc2VsaW5lIH07CiAgICAgICAgIH0KLSAgICB9CisgICAgICAgIHNldEJhc2VsaW5lQW5k TGF5b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmljcyk7 CisKKyAgICAgICAgYXV0byBuZWVkc0ZvbnRGYWxsYmFja0FkanVzdG1lbnQgPSBpbmxpbmVMZXZl bEJveC5pc0lubGluZUJveCgpOworICAgICAgICBpZiAobmVlZHNGb250RmFsbGJhY2tBZGp1c3Rt ZW50KSB7CisgICAgICAgICAgICBpZiAoYXV0byBmYWxsYmFja0ZvbnRzID0gbV9mYWxsYmFja0Zv bnRzRm9ySW5saW5lQm94ZXMuZ2V0KCZpbmxpbmVMZXZlbEJveCk7ICFmYWxsYmFja0ZvbnRzLmlz RW1wdHkoKSkKKyAgICAgICAgICAgICAgICBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tG b250cyhpbmxpbmVMZXZlbEJveCwgZmFsbGJhY2tGb250cywgSWRlb2dyYXBoaWNCYXNlbGluZSk7 CisgICAgICAgIH0KKyAgICB9OworCisgICAgYWRqdXN0TGF5b3V0Qm91bmRzV2l0aElkZW9ncmFw aGljQmFzZWxpbmUocm9vdElubGluZUJveCk7CisgICAgZm9yIChhdXRvJiBpbmxpbmVMZXZlbEJv eCA6IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMoKSkKKyAgICAgICAgYWRqdXN0TGF5 b3V0Qm91bmRzV2l0aElkZW9ncmFwaGljQmFzZWxpbmUoaW5saW5lTGV2ZWxCb3gpOwogfQogCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaAppbmRleCA4NzU2YTcw NzM2YTI5ZDI1Y2JiYzg0MmEzZTYyODk4N2MxZmQwYjdiLi44YzFlZTAyZWYwZjI0NjA3OTQwNjAz NTcwZWMxZmEzNzQ4ODYxNzhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hC dWlsZGVyLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lkIHNl dEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRzKElubGluZUxldmVsQm94JiwgY29uc3QgTGF5b3V0Qm91 bmRzTWV0cmljcyYpIGNvbnN0OwogICAgIHZvaWQgYWRqdXN0TGF5b3V0Qm91bmRzV2l0aEZhbGxi YWNrRm9udHMoSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBUZXh0VXRpbDo6RmFsbGJhY2tGb250TGlz dCYpIGNvbnN0OwotICAgIFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0IGNvbGxlY3RGYWxsYmFj a0ZvbnRzKGNvbnN0IExpbmU6OlJ1biYsIGNvbnN0IFJlbmRlclN0eWxlJik7CisgICAgVGV4dFV0 aWw6OkZhbGxiYWNrRm9udExpc3QgY29sbGVjdEZhbGxiYWNrRm9udHMoY29uc3QgSW5saW5lTGV2 ZWxCb3gmIHBhcmVudElubGluZUJveCwgY29uc3QgTGluZTo6UnVuJiwgY29uc3QgUmVuZGVyU3R5 bGUmKTsKIAogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiwgY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50Jiwgc2l6ZV90IGxpbmVJbmRleCk7CiAgICAgdm9p ZCBhZGp1c3RJZGVvZ3JhcGhpY0Jhc2VsaW5lSWZBcHBsaWNhYmxlKExpbmVCb3gmLCBzaXplX3Qg bGluZUluZGV4KTsKQEAgLTYwLDYgKzYwLDcgQEAgcHJpdmF0ZToKIHByaXZhdGU6CiAgICAgY29u c3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CiAg ICAgYm9vbCBtX2ZhbGxiYWNrRm9udFJlcXVpcmVzSWRlb2dyYXBoaWNCYXNlbGluZSB7IGZhbHNl IH07CisgICAgSGFzaE1hcDxjb25zdCBJbmxpbmVMZXZlbEJveCosIFRleHRVdGlsOjpGYWxsYmFj a0ZvbnRMaXN0PiBtX2ZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3hlczsKIH07CiAKIH0K 452603 2022-02-18 16:22:37 -0800 2022-02-18 21:28:01 -0800 Patch bug-236872-20220218162236.patch text/plain 9746 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I2ZjUwNWUxNDNhNTc4 Y2NkZWMyYzRkNmMwNGZkMjkyYmU2MDNmOC4uYWE3YmUyOWY1MDJmYTU4YWQxOGEyZDNiYjIyY2Ux NDE2ZmJhOTYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpZGVvZ3JhcGhpYyBiYXNlbGluZSB3aXRoIGZvbnQgZmFsbGJhY2sKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjg3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIHVzZSB0aGUgcHJl LWNvbGxlY3RlZCBmYWxsYmFjayBmb250cyB0byBhZGp1c3QgdGhlIGlubGluZSBib3ggbGF5b3V0 IGJvdW5kcyB3aXRoIHRoZWlyIGlkZW9ncmFwaGljIGJhc2VsaW5lcy4KKyAgICAgICAgVGhpcyBp cyBpbiBwcmVwYXJhdGlvbiBmb3IgZW5hYmxpbmcgdmVydGljYWwgdGV4dC4KKworICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmFkanVzdExheW91 dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRlb2dyYXBo aWNCYXNlbGluZUlmQXBwbGljYWJsZSk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMi0wMi0xOCAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1Y2Ug TGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5kZXggN2E3YzFhMTc4ZmI1Njg1MGI5NmJlNTU0 MDk1MGNjOWI4Yjk1ZmJhMC4uODc1OGVmOGY0MzI2YTk4OTI1ZjAwYWY0MGQzNTg3MWFiYjA3MWM5 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAt MTE2LDcgKzExNiw3IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIHNpemVfCiAgICAgcmV0dXJuIGxpbmVC b3g7CiB9CiAKLXZvaWQgTGluZUJveEJ1aWxkZXI6OmFkanVzdExheW91dEJvdW5kc1dpdGhGYWxs YmFja0ZvbnRzKElubGluZUxldmVsQm94JiBpbmxpbmVCb3gsIGNvbnN0IFRleHRVdGlsOjpGYWxs YmFja0ZvbnRMaXN0JiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCkgY29uc3QKK3ZvaWQgTGluZUJv eEJ1aWxkZXI6OmFkanVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKElubGluZUxldmVs Qm94JiBpbmxpbmVCb3gsIGNvbnN0IFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0JiBmYWxsYmFj a0ZvbnRzRm9yQ29udGVudCwgRm9udEJhc2VsaW5lIGZvbnRCYXNlbGluZSkgY29uc3QKIHsKICAg ICBBU1NFUlQoIWZhbGxiYWNrRm9udHNGb3JDb250ZW50LmlzRW1wdHkoKSk7CiAgICAgQVNTRVJU KGlubGluZUJveC5pc0lubGluZUJveCgpKTsKQEAgLTEzNCw4ICsxMzQsOCBAQCB2b2lkIExpbmVC b3hCdWlsZGVyOjphZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVMZXZl bEJveCYgaW5saW5lQgogICAgIGF1dG8gc2hvdWxkVXNlTGluZUdhcFRvQWRqdXN0QXNjZW50RGVz Y2VudCA9IGlubGluZUJveC5pc1Jvb3RJbmxpbmVCb3goKSB8fCBpc1RleHRFZGdlTGVhZGluZzsK ICAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCkgewogICAgICAg ICBhdXRvJiBmb250TWV0cmljcyA9IGZvbnQtPmZvbnRNZXRyaWNzKCk7Ci0gICAgICAgIElubGlu ZUxheW91dFVuaXQgYXNjZW50ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7Ci0gICAgICAgIElubGlu ZUxheW91dFVuaXQgZGVzY2VudCA9IGZvbnRNZXRyaWNzLmRlc2NlbnQoKTsKKyAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsK KyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudChm b250QmFzZWxpbmUpOwogICAgICAgICBpZiAoc2hvdWxkVXNlTGluZUdhcFRvQWRqdXN0QXNjZW50 RGVzY2VudCkgewogICAgICAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gYXNjZW50ICsgZGVz Y2VudDsKICAgICAgICAgICAgIGF1dG8gaGFsZkxpbmVHYXAgPSAoZm9udE1ldHJpY3MubGluZVNw YWNpbmcoKSAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKQEAgLTE1MSw4ICsxNTEsOSBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjphZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVM ZXZlbEJveCYgaW5saW5lQgogICAgIGlubGluZUJveC5zZXRMYXlvdXRCb3VuZHMoeyBzdGQ6Om1h eChsYXlvdXRCb3VuZHMuYXNjZW50LCBmbG9vcmYobWF4QXNjZW50KSksIHN0ZDo6bWF4KGxheW91 dEJvdW5kcy5kZXNjZW50LCBjZWlsZihtYXhEZXNjZW50KSkgfSk7CiB9CiAKLVRleHRVdGlsOjpG YWxsYmFja0ZvbnRMaXN0IExpbmVCb3hCdWlsZGVyOjpjb2xsZWN0RmFsbGJhY2tGb250cyhjb25z dCBMaW5lOjpSdW4mIHJ1biwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQorVGV4dFV0aWw6OkZh bGxiYWNrRm9udExpc3QgTGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzKGNvbnN0 IElubGluZUxldmVsQm94JiBwYXJlbnRJbmxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1biYgcnVuLCBj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7CisgICAgQVNTRVJUKHBhcmVudElubGluZUJveC5p c0lubGluZUJveCgpKTsKICAgICBhdXRvJiBpbmxpbmVUZXh0Qm94ID0gZG93bmNhc3Q8SW5saW5l VGV4dEJveD4ocnVuLmxheW91dEJveCgpKTsKICAgICBpZiAoaW5saW5lVGV4dEJveC5jYW5Vc2VT aW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpKSB7CiAgICAgICAgIC8vIFNpbXBsaWZpZWQgdGV4 dCBtZWFzdXJpbmcgd29ya3Mgd2l0aCBwcmltYXJ5IGZvbnQgb25seS4KQEAgLTE2MywxNSArMTY0 LDE0IEBAIFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0IExpbmVCb3hCdWlsZGVyOjpjb2xsZWN0 RmFsbGJhY2tGb250cyhjb25zdCBMaW5lOjpSdW4mCiAgICAgaWYgKGZhbGxiYWNrRm9udHMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byBmYWxsYmFja0ZvbnRzSGF2 ZVZlcnRpY2FsR2x5cGggPSBbJl0gewotICAgICAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFj a0ZvbnRzKSB7Ci0gICAgICAgICAgICBpZiAoZm9udC0+aGFzVmVydGljYWxHbHlwaHMoKSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgfTsKLSAgICAvLyBBZGp1c3Qgbm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdo ZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmltYXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgotICAg IG1fZmFsbGJhY2tGb250UmVxdWlyZXNJZGVvZ3JhcGhpY0Jhc2VsaW5lID0gbV9mYWxsYmFja0Zv bnRSZXF1aXJlc0lkZW9ncmFwaGljQmFzZWxpbmUgfHwgZmFsbGJhY2tGb250c0hhdmVWZXJ0aWNh bEdseXBoKCk7CisgICAgYXV0byBmYWxsYmFja0ZvbnRzRm9ySW5saW5lQm94ZXMgPSBtX2ZhbGxi YWNrRm9udHNGb3JJbmxpbmVCb3hlcy5nZXQoJnBhcmVudElubGluZUJveCk7CisgICAgYXV0byBu dW1iZXJPZkZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3ggPSBmYWxsYmFja0ZvbnRzRm9ySW5saW5l Qm94ZXMuc2l6ZSgpOworICAgIGZvciAoYXV0byogZm9udCA6IGZhbGxiYWNrRm9udHMpIHsKKyAg ICAgICAgZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzLmFkZChmb250KTsKKyAgICAgICAgbV9m YWxsYmFja0ZvbnRSZXF1aXJlc0lkZW9ncmFwaGljQmFzZWxpbmUgPSBtX2ZhbGxiYWNrRm9udFJl cXVpcmVzSWRlb2dyYXBoaWNCYXNlbGluZSB8fCBmb250LT5oYXNWZXJ0aWNhbEdseXBocygpOwor ICAgIH0KKyAgICBpZiAoZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzLnNpemUoKSAhPSBudW1i ZXJPZkZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3gpCisgICAgICAgIG1fZmFsbGJhY2tGb250c0Zv cklubGluZUJveGVzLnNldCgmcGFyZW50SW5saW5lQm94LCBmYWxsYmFja0ZvbnRzRm9ySW5saW5l Qm94ZXMpOwogICAgIHJldHVybiBmYWxsYmFja0ZvbnRzOwogfQogCkBAIC0zMzEsOSArMzMxLDkg QEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94 JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSkgewog ICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gbGluZUJveC5pbmxpbmVMZXZlbEJv eEZvckxheW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpOwogICAgICAgICAgICAgcGFyZW50SW5s aW5lQm94LnNldEhhc0NvbnRlbnQoKTsKLSAgICAgICAgICAgIGlmIChhdXRvIGZhbGxiYWNrRm9u dHMgPSBjb2xsZWN0RmFsbGJhY2tGb250cyhydW4sIHN0eWxlKTsgIWZhbGxiYWNrRm9udHMuaXNF bXB0eSgpKSB7CisgICAgICAgICAgICBpZiAoYXV0byBmYWxsYmFja0ZvbnRzID0gY29sbGVjdEZh bGxiYWNrRm9udHMocGFyZW50SW5saW5lQm94LCBydW4sIHN0eWxlKTsgIWZhbGxiYWNrRm9udHMu aXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAgICAgLy8gQWRqdXN0IG5vbi1lbXB0eSBpbmxpbmUg Ym94IGhlaWdodCB3aGVuIGdseXBocyBmcm9tIHRoZSBub24tcHJpbWFyeSBmb250IHN0cmV0Y2gg dGhlIGJveC4KLSAgICAgICAgICAgICAgICBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tG b250cyhwYXJlbnRJbmxpbmVCb3gsIGZhbGxiYWNrRm9udHMpOworICAgICAgICAgICAgICAgIGFk anVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKHBhcmVudElubGluZUJveCwgZmFsbGJh Y2tGb250cywgQWxwaGFiZXRpY0Jhc2VsaW5lKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CkBAIC0zODcsMjAgKzM4NywzMyBAQCB2b2lkIExpbmVCb3hC dWlsZGVyOjphZGp1c3RJZGVvZ3JhcGhpY0Jhc2VsaW5lSWZBcHBsaWNhYmxlKExpbmVCb3gmIGxp bmVCb3gsIHNpegogICAgICAgICByZXR1cm47CiAKICAgICBsaW5lQm94LnNldEJhc2VsaW5lVHlw ZShJZGVvZ3JhcGhpY0Jhc2VsaW5lKTsKLSAgICBzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyhy b290SW5saW5lQm94LCBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmljc0ZvcklubGluZUJveChyb290 SW5saW5lQm94LCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKSk7Ci0gICAgZm9yIChhdXRvJiBpbmxpbmVM ZXZlbEJveCA6IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMoKSkgeworCisgICAgYXV0 byBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoSWRlb2dyYXBoaWNCYXNlbGluZSA9IFsmXSAoYXV0byYg aW5saW5lTGV2ZWxCb3gpIHsKKyAgICAgICAgYXV0byBpbml0aWF0ZXNMYXlvdXRCb3VuZHNDaGFu Z2UgPSBpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpIHx8IGlubGluZUxldmVsQm94LmlzQXRv bWljSW5saW5lTGV2ZWxCb3goKTsKKyAgICAgICAgaWYgKCFpbml0aWF0ZXNMYXlvdXRCb3VuZHND aGFuZ2UpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgYXV0byBsYXlvdXRCb3VuZHNQ cmltYXJ5TWV0cmljcyA9IExheW91dEJvdW5kc01ldHJpY3MgeyB9OwogICAgICAgICBpZiAoaW5s aW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKSkKLSAgICAgICAgICAgIHNldEJhc2VsaW5lQW5kTGF5 b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmljc0Zvcklu bGluZUJveChpbmxpbmVMZXZlbEJveCwgSWRlb2dyYXBoaWNCYXNlbGluZSkpOwotICAgICAgICBl bHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgpKSB7Ci0gICAgICAgICAgICBh dXRvJiBwYXJlbnRJbmxpbmVCb3ggPSBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94 KGlubGluZUxldmVsQm94LmxheW91dEJveCgpLnBhcmVudCgpKTsKLSAgICAgICAgICAgIHNldEJh c2VsaW5lQW5kTGF5b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCBsYXlvdXRCb3VuZHNQcmltYXJ5 TWV0cmljc0ZvcklubGluZUJveChwYXJlbnRJbmxpbmVCb3gsIElkZW9ncmFwaGljQmFzZWxpbmUp KTsKLSAgICAgICAgfSBlbHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVs Qm94KCkpIHsKKyAgICAgICAgICAgIGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzID0gbGF5b3V0 Qm91bmRzUHJpbWFyeU1ldHJpY3NGb3JJbmxpbmVCb3goaW5saW5lTGV2ZWxCb3gsIElkZW9ncmFw aGljQmFzZWxpbmUpOworICAgICAgICBlbHNlIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lu bGluZUxldmVsQm94KCkpIHsKICAgICAgICAgICAgIGF1dG8gaW5saW5lTGV2ZWxCb3hIZWlnaHQg PSBpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKTsKICAgICAgICAgICAgIElu bGluZUxheW91dFVuaXQgaWRlb2dyYXBoaWNCYXNlbGluZSA9IHJvdW5kVG9JbnQoaW5saW5lTGV2 ZWxCb3hIZWlnaHQgLyAyKTsKICAgICAgICAgICAgIC8vIE1vdmUgdGhlIGJhc2VsaW5lIHBvc2l0 aW9uIGJ1dCBrZWVwIHRoZSBzYW1lIGxvZ2ljYWwgaGVpZ2h0LgotICAgICAgICAgICAgc2V0QmFz ZWxpbmVBbmRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxCb3gsIHsgaWRlb2dyYXBoaWNCYXNlbGlu ZSwgaW5saW5lTGV2ZWxCb3hIZWlnaHQgLSBpZGVvZ3JhcGhpY0Jhc2VsaW5lIH0pOworICAgICAg ICAgICAgbGF5b3V0Qm91bmRzUHJpbWFyeU1ldHJpY3MgPSB7IGlkZW9ncmFwaGljQmFzZWxpbmUs IGlubGluZUxldmVsQm94SGVpZ2h0IC0gaWRlb2dyYXBoaWNCYXNlbGluZSB9OwogICAgICAgICB9 Ci0gICAgfQorICAgICAgICBzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyhpbmxpbmVMZXZlbEJv eCwgbGF5b3V0Qm91bmRzUHJpbWFyeU1ldHJpY3MpOworCisgICAgICAgIGF1dG8gbmVlZHNGb250 RmFsbGJhY2tBZGp1c3RtZW50ID0gaW5saW5lTGV2ZWxCb3guaXNJbmxpbmVCb3goKTsKKyAgICAg ICAgaWYgKG5lZWRzRm9udEZhbGxiYWNrQWRqdXN0bWVudCkgeworICAgICAgICAgICAgaWYgKGF1 dG8gZmFsbGJhY2tGb250cyA9IG1fZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzLmdldCgmaW5s aW5lTGV2ZWxCb3gpOyAhZmFsbGJhY2tGb250cy5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAg YWRqdXN0TGF5b3V0Qm91bmRzV2l0aEZhbGxiYWNrRm9udHMoaW5saW5lTGV2ZWxCb3gsIGZhbGxi YWNrRm9udHMsIElkZW9ncmFwaGljQmFzZWxpbmUpOworICAgICAgICB9CisgICAgfTsKKworICAg IGFkanVzdExheW91dEJvdW5kc1dpdGhJZGVvZ3JhcGhpY0Jhc2VsaW5lKHJvb3RJbmxpbmVCb3gp OworICAgIGZvciAoYXV0byYgaW5saW5lTGV2ZWxCb3ggOiBsaW5lQm94Lm5vblJvb3RJbmxpbmVM ZXZlbEJveGVzKCkpCisgICAgICAgIGFkanVzdExheW91dEJvdW5kc1dpdGhJZGVvZ3JhcGhpY0Jh c2VsaW5lKGlubGluZUxldmVsQm94KTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmVCb3hCdWlsZGVyLmgKaW5kZXggODc1NmE3MDczNmEyOWQyNWNiYmM4NDJhM2U2Mjg5ODdj MWZkMGI3Yi4uZDQ4YWZiNmUxMmIyNDFmY2MxZjRmZmYzY2I5YTQ1Zjc4NDdkODY5MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZUJveEJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCkBAIC00Nyw4ICs0Nyw4IEBA IHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIHNldEJhc2VsaW5lQW5kTGF5b3V0Qm91bmRz KElubGluZUxldmVsQm94JiwgY29uc3QgTGF5b3V0Qm91bmRzTWV0cmljcyYpIGNvbnN0OwotICAg IHZvaWQgYWRqdXN0TGF5b3V0Qm91bmRzV2l0aEZhbGxiYWNrRm9udHMoSW5saW5lTGV2ZWxCb3gm LCBjb25zdCBUZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCYpIGNvbnN0OwotICAgIFRleHRVdGls OjpGYWxsYmFja0ZvbnRMaXN0IGNvbGxlY3RGYWxsYmFja0ZvbnRzKGNvbnN0IExpbmU6OlJ1biYs IGNvbnN0IFJlbmRlclN0eWxlJik7CisgICAgdm9pZCBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFs bGJhY2tGb250cyhJbmxpbmVMZXZlbEJveCYsIGNvbnN0IFRleHRVdGlsOjpGYWxsYmFja0ZvbnRM aXN0JiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCwgRm9udEJhc2VsaW5lKSBjb25zdDsKKyAgICBU ZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCBjb2xsZWN0RmFsbGJhY2tGb250cyhjb25zdCBJbmxp bmVMZXZlbEJveCYgcGFyZW50SW5saW5lQm94LCBjb25zdCBMaW5lOjpSdW4mLCBjb25zdCBSZW5k ZXJTdHlsZSYpOwogCiAgICAgdm9pZCBjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gm LCBjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmLCBzaXplX3QgbGluZUluZGV4KTsKICAg ICB2b2lkIGFkanVzdElkZW9ncmFwaGljQmFzZWxpbmVJZkFwcGxpY2FibGUoTGluZUJveCYsIHNp emVfdCBsaW5lSW5kZXgpOwpAQCAtNjAsNiArNjAsNyBAQCBwcml2YXRlOgogcHJpdmF0ZToKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKICAgICBib29sIG1fZmFsbGJhY2tGb250UmVxdWlyZXNJZGVvZ3JhcGhpY0Jhc2VsaW5lIHsg ZmFsc2UgfTsKKyAgICBIYXNoTWFwPGNvbnN0IElubGluZUxldmVsQm94KiwgVGV4dFV0aWw6OkZh bGxiYWNrRm9udExpc3Q+IG1fZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzOwogfTsKIAogfQo= 452624 2022-02-18 21:28:03 -0800 2022-02-19 08:17:16 -0800 Patch bug-236872-20220218212802.patch text/plain 10101 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgxNmU1YWI0ODBjZjU5 NjNkYmE2MWFjNWZhMzUwMjc4NWYwYWUwMi4uYzA0ZjU2Y2VhZTAyMTU3MmI4NzUyN2U0MDFhNjQ5 YmJlMGEzZDNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpZGVvZ3JhcGhpYyBiYXNlbGluZSB3aXRoIGZvbnQgZmFsbGJhY2sKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjg3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIHVzZSB0aGUgcHJl LWNvbGxlY3RlZCBmYWxsYmFjayBmb250cyB0byBhZGp1c3QgdGhlIGlubGluZSBib3ggbGF5b3V0 IGJvdW5kcyB3aXRoIHRoZWlyIGlkZW9ncmFwaGljIGJhc2VsaW5lcy4KKyAgICAgICAgVGhpcyBp cyBpbiBwcmVwYXJhdGlvbiBmb3IgZW5hYmxpbmcgdmVydGljYWwgdGV4dC4KKworICAgICAgICAq IGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmFkanVzdExheW91 dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SWRlb2dyYXBo aWNCYXNlbGluZUlmQXBwbGljYWJsZSk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaDoKKwogMjAyMi0wMi0xOCAgQWxhbiBC dWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1Y2Ug TGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVp bGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKaW5kZXggN2E3YzFhMTc4ZmI1Njg1MGI5NmJlNTU0 MDk1MGNjOWI4Yjk1ZmJhMC4uMjBiMzEyNjdiZTFlN2Q1MjlkMTNlOGM4Yjk4ZDIwOGZjOWIwOTA0 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcApAQCAt MTE2LDcgKzExNiw3IEBAIExpbmVCb3ggTGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVC dWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIHNpemVfCiAgICAgcmV0dXJuIGxpbmVC b3g7CiB9CiAKLXZvaWQgTGluZUJveEJ1aWxkZXI6OmFkanVzdExheW91dEJvdW5kc1dpdGhGYWxs YmFja0ZvbnRzKElubGluZUxldmVsQm94JiBpbmxpbmVCb3gsIGNvbnN0IFRleHRVdGlsOjpGYWxs YmFja0ZvbnRMaXN0JiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCkgY29uc3QKK3ZvaWQgTGluZUJv eEJ1aWxkZXI6OmFkanVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKElubGluZUxldmVs Qm94JiBpbmxpbmVCb3gsIGNvbnN0IFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0JiBmYWxsYmFj a0ZvbnRzRm9yQ29udGVudCwgRm9udEJhc2VsaW5lIGZvbnRCYXNlbGluZSkgY29uc3QKIHsKICAg ICBBU1NFUlQoIWZhbGxiYWNrRm9udHNGb3JDb250ZW50LmlzRW1wdHkoKSk7CiAgICAgQVNTRVJU KGlubGluZUJveC5pc0lubGluZUJveCgpKTsKQEAgLTEzNCw4ICsxMzQsOCBAQCB2b2lkIExpbmVC b3hCdWlsZGVyOjphZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVMZXZl bEJveCYgaW5saW5lQgogICAgIGF1dG8gc2hvdWxkVXNlTGluZUdhcFRvQWRqdXN0QXNjZW50RGVz Y2VudCA9IGlubGluZUJveC5pc1Jvb3RJbmxpbmVCb3goKSB8fCBpc1RleHRFZGdlTGVhZGluZzsK ICAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFja0ZvbnRzRm9yQ29udGVudCkgewogICAgICAg ICBhdXRvJiBmb250TWV0cmljcyA9IGZvbnQtPmZvbnRNZXRyaWNzKCk7Ci0gICAgICAgIElubGlu ZUxheW91dFVuaXQgYXNjZW50ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7Ci0gICAgICAgIElubGlu ZUxheW91dFVuaXQgZGVzY2VudCA9IGZvbnRNZXRyaWNzLmRlc2NlbnQoKTsKKyAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsK KyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudChm b250QmFzZWxpbmUpOwogICAgICAgICBpZiAoc2hvdWxkVXNlTGluZUdhcFRvQWRqdXN0QXNjZW50 RGVzY2VudCkgewogICAgICAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gYXNjZW50ICsgZGVz Y2VudDsKICAgICAgICAgICAgIGF1dG8gaGFsZkxpbmVHYXAgPSAoZm9udE1ldHJpY3MubGluZVNw YWNpbmcoKSAtIGxvZ2ljYWxIZWlnaHQpIC8gMjsKQEAgLTE1MSw4ICsxNTEsOSBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjphZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tGb250cyhJbmxpbmVM ZXZlbEJveCYgaW5saW5lQgogICAgIGlubGluZUJveC5zZXRMYXlvdXRCb3VuZHMoeyBzdGQ6Om1h eChsYXlvdXRCb3VuZHMuYXNjZW50LCBmbG9vcmYobWF4QXNjZW50KSksIHN0ZDo6bWF4KGxheW91 dEJvdW5kcy5kZXNjZW50LCBjZWlsZihtYXhEZXNjZW50KSkgfSk7CiB9CiAKLVRleHRVdGlsOjpG YWxsYmFja0ZvbnRMaXN0IExpbmVCb3hCdWlsZGVyOjpjb2xsZWN0RmFsbGJhY2tGb250cyhjb25z dCBMaW5lOjpSdW4mIHJ1biwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQorVGV4dFV0aWw6OkZh bGxiYWNrRm9udExpc3QgTGluZUJveEJ1aWxkZXI6OmNvbGxlY3RGYWxsYmFja0ZvbnRzKGNvbnN0 IElubGluZUxldmVsQm94JiBwYXJlbnRJbmxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1biYgcnVuLCBj b25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCiB7CisgICAgQVNTRVJUKHBhcmVudElubGluZUJveC5p c0lubGluZUJveCgpKTsKICAgICBhdXRvJiBpbmxpbmVUZXh0Qm94ID0gZG93bmNhc3Q8SW5saW5l VGV4dEJveD4ocnVuLmxheW91dEJveCgpKTsKICAgICBpZiAoaW5saW5lVGV4dEJveC5jYW5Vc2VT aW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpKSB7CiAgICAgICAgIC8vIFNpbXBsaWZpZWQgdGV4 dCBtZWFzdXJpbmcgd29ya3Mgd2l0aCBwcmltYXJ5IGZvbnQgb25seS4KQEAgLTE2MywxNSArMTY0 LDE0IEBAIFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0IExpbmVCb3hCdWlsZGVyOjpjb2xsZWN0 RmFsbGJhY2tGb250cyhjb25zdCBMaW5lOjpSdW4mCiAgICAgaWYgKGZhbGxiYWNrRm9udHMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byBmYWxsYmFja0ZvbnRzSGF2 ZVZlcnRpY2FsR2x5cGggPSBbJl0gewotICAgICAgICBmb3IgKGF1dG8qIGZvbnQgOiBmYWxsYmFj a0ZvbnRzKSB7Ci0gICAgICAgICAgICBpZiAoZm9udC0+aGFzVmVydGljYWxHbHlwaHMoKSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgfTsKLSAgICAvLyBBZGp1c3Qgbm9uLWVtcHR5IGlubGluZSBib3ggaGVpZ2h0IHdo ZW4gZ2x5cGhzIGZyb20gdGhlIG5vbi1wcmltYXJ5IGZvbnQgc3RyZXRjaCB0aGUgYm94LgotICAg IG1fZmFsbGJhY2tGb250UmVxdWlyZXNJZGVvZ3JhcGhpY0Jhc2VsaW5lID0gbV9mYWxsYmFja0Zv bnRSZXF1aXJlc0lkZW9ncmFwaGljQmFzZWxpbmUgfHwgZmFsbGJhY2tGb250c0hhdmVWZXJ0aWNh bEdseXBoKCk7CisgICAgYXV0byBmYWxsYmFja0ZvbnRzRm9ySW5saW5lQm94ZXMgPSBtX2ZhbGxi YWNrRm9udHNGb3JJbmxpbmVCb3hlcy5nZXQoJnBhcmVudElubGluZUJveCk7CisgICAgYXV0byBu dW1iZXJPZkZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3ggPSBmYWxsYmFja0ZvbnRzRm9ySW5saW5l Qm94ZXMuc2l6ZSgpOworICAgIGZvciAoYXV0byogZm9udCA6IGZhbGxiYWNrRm9udHMpIHsKKyAg ICAgICAgZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzLmFkZChmb250KTsKKyAgICAgICAgbV9m YWxsYmFja0ZvbnRSZXF1aXJlc0lkZW9ncmFwaGljQmFzZWxpbmUgPSBtX2ZhbGxiYWNrRm9udFJl cXVpcmVzSWRlb2dyYXBoaWNCYXNlbGluZSB8fCBmb250LT5oYXNWZXJ0aWNhbEdseXBocygpOwor ICAgIH0KKyAgICBpZiAoZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzLnNpemUoKSAhPSBudW1i ZXJPZkZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3gpCisgICAgICAgIG1fZmFsbGJhY2tGb250c0Zv cklubGluZUJveGVzLnNldCgmcGFyZW50SW5saW5lQm94LCBmYWxsYmFja0ZvbnRzRm9ySW5saW5l Qm94ZXMpOwogICAgIHJldHVybiBmYWxsYmFja0ZvbnRzOwogfQogCkBAIC0zMzEsOSArMzMxLDkg QEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94 JiBsaW5lQm94LCBjb25zdCBMaW5lQnVpbGQKICAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSkgewog ICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gbGluZUJveC5pbmxpbmVMZXZlbEJv eEZvckxheW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpOwogICAgICAgICAgICAgcGFyZW50SW5s aW5lQm94LnNldEhhc0NvbnRlbnQoKTsKLSAgICAgICAgICAgIGlmIChhdXRvIGZhbGxiYWNrRm9u dHMgPSBjb2xsZWN0RmFsbGJhY2tGb250cyhydW4sIHN0eWxlKTsgIWZhbGxiYWNrRm9udHMuaXNF bXB0eSgpKSB7CisgICAgICAgICAgICBpZiAoYXV0byBmYWxsYmFja0ZvbnRzID0gY29sbGVjdEZh bGxiYWNrRm9udHMocGFyZW50SW5saW5lQm94LCBydW4sIHN0eWxlKTsgIWZhbGxiYWNrRm9udHMu aXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAgICAgLy8gQWRqdXN0IG5vbi1lbXB0eSBpbmxpbmUg Ym94IGhlaWdodCB3aGVuIGdseXBocyBmcm9tIHRoZSBub24tcHJpbWFyeSBmb250IHN0cmV0Y2gg dGhlIGJveC4KLSAgICAgICAgICAgICAgICBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoRmFsbGJhY2tG b250cyhwYXJlbnRJbmxpbmVCb3gsIGZhbGxiYWNrRm9udHMpOworICAgICAgICAgICAgICAgIGFk anVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKHBhcmVudElubGluZUJveCwgZmFsbGJh Y2tGb250cywgQWxwaGFiZXRpY0Jhc2VsaW5lKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICB9CkBAIC0zODcsMjAgKzM4NywzNiBAQCB2b2lkIExpbmVCb3hC dWlsZGVyOjphZGp1c3RJZGVvZ3JhcGhpY0Jhc2VsaW5lSWZBcHBsaWNhYmxlKExpbmVCb3gmIGxp bmVCb3gsIHNpegogICAgICAgICByZXR1cm47CiAKICAgICBsaW5lQm94LnNldEJhc2VsaW5lVHlw ZShJZGVvZ3JhcGhpY0Jhc2VsaW5lKTsKLSAgICBzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyhy b290SW5saW5lQm94LCBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmljc0ZvcklubGluZUJveChyb290 SW5saW5lQm94LCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKSk7Ci0gICAgZm9yIChhdXRvJiBpbmxpbmVM ZXZlbEJveCA6IGxpbmVCb3gubm9uUm9vdElubGluZUxldmVsQm94ZXMoKSkgeworCisgICAgYXV0 byBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoSWRlb2dyYXBoaWNCYXNlbGluZSA9IFsmXSAoYXV0byYg aW5saW5lTGV2ZWxCb3gpIHsKKyAgICAgICAgYXV0byBpbml0aWF0ZXNMYXlvdXRCb3VuZHNDaGFu Z2UgPSBpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpIHx8IGlubGluZUxldmVsQm94LmlzQXRv bWljSW5saW5lTGV2ZWxCb3goKSB8fCBpbmxpbmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgpOwor ICAgICAgICBpZiAoIWluaXRpYXRlc0xheW91dEJvdW5kc0NoYW5nZSkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICBhdXRvIGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzID0gTGF5b3V0 Qm91bmRzTWV0cmljcyB7IH07CiAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJv eCgpKQotICAgICAgICAgICAgc2V0QmFzZWxpbmVBbmRMYXlvdXRCb3VuZHMoaW5saW5lTGV2ZWxC b3gsIGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94 LCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlubGluZUxldmVsQm94 LmlzTGluZUJyZWFrQm94KCkpIHsKLSAgICAgICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9 IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0 Qm94KCkucGFyZW50KCkpOwotICAgICAgICAgICAgc2V0QmFzZWxpbmVBbmRMYXlvdXRCb3VuZHMo aW5saW5lTGV2ZWxCb3gsIGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzRm9ySW5saW5lQm94KHBh cmVudElubGluZUJveCwgSWRlb2dyYXBoaWNCYXNlbGluZSkpOwotICAgICAgICB9IGVsc2UgaWYg KGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgeworICAgICAgICAgICAg bGF5b3V0Qm91bmRzUHJpbWFyeU1ldHJpY3MgPSBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmljc0Zv cklubGluZUJveChpbmxpbmVMZXZlbEJveCwgSWRlb2dyYXBoaWNCYXNlbGluZSk7CisgICAgICAg IGVsc2UgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewogICAg ICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveEhlaWdodCA9IGlubGluZUxldmVsQm94LmxheW91 dEJvdW5kcygpLmhlaWdodCgpOwogICAgICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpZGVvZ3Jh cGhpY0Jhc2VsaW5lID0gcm91bmRUb0ludChpbmxpbmVMZXZlbEJveEhlaWdodCAvIDIpOwogICAg ICAgICAgICAgLy8gTW92ZSB0aGUgYmFzZWxpbmUgcG9zaXRpb24gYnV0IGtlZXAgdGhlIHNhbWUg bG9naWNhbCBoZWlnaHQuCi0gICAgICAgICAgICBzZXRCYXNlbGluZUFuZExheW91dEJvdW5kcyhp bmxpbmVMZXZlbEJveCwgeyBpZGVvZ3JhcGhpY0Jhc2VsaW5lLCBpbmxpbmVMZXZlbEJveEhlaWdo dCAtIGlkZW9ncmFwaGljQmFzZWxpbmUgfSk7CisgICAgICAgICAgICBsYXlvdXRCb3VuZHNQcmlt YXJ5TWV0cmljcyA9IHsgaWRlb2dyYXBoaWNCYXNlbGluZSwgaW5saW5lTGV2ZWxCb3hIZWlnaHQg LSBpZGVvZ3JhcGhpY0Jhc2VsaW5lIH07CisgICAgICAgIH0gZWxzZSBpZiAoaW5saW5lTGV2ZWxC b3guaXNMaW5lQnJlYWtCb3goKSkgeworICAgICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94 ID0gbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChpbmxpbmVMZXZlbEJveC5sYXlv dXRCb3goKS5wYXJlbnQoKSk7CisgICAgICAgICAgICBsYXlvdXRCb3VuZHNQcmltYXJ5TWV0cmlj cyA9IGxheW91dEJvdW5kc1ByaW1hcnlNZXRyaWNzRm9ySW5saW5lQm94KHBhcmVudElubGluZUJv eCwgSWRlb2dyYXBoaWNCYXNlbGluZSk7CiAgICAgICAgIH0KLSAgICB9CisgICAgICAgIHNldEJh c2VsaW5lQW5kTGF5b3V0Qm91bmRzKGlubGluZUxldmVsQm94LCBsYXlvdXRCb3VuZHNQcmltYXJ5 TWV0cmljcyk7CisKKyAgICAgICAgYXV0byBuZWVkc0ZvbnRGYWxsYmFja0FkanVzdG1lbnQgPSBp bmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpIHx8IGlubGluZUxldmVsQm94LmlzTGluZUJyZWFr Qm94KCk7CisgICAgICAgIGlmIChuZWVkc0ZvbnRGYWxsYmFja0FkanVzdG1lbnQpIHsKKyAgICAg ICAgICAgIGlmIChhdXRvIGZhbGxiYWNrRm9udHMgPSBtX2ZhbGxiYWNrRm9udHNGb3JJbmxpbmVC b3hlcy5nZXQoJmlubGluZUxldmVsQm94KTsgIWZhbGxiYWNrRm9udHMuaXNFbXB0eSgpKQorICAg ICAgICAgICAgICAgIGFkanVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKGlubGluZUxl dmVsQm94LCBmYWxsYmFja0ZvbnRzLCBJZGVvZ3JhcGhpY0Jhc2VsaW5lKTsKKyAgICAgICAgfQor ICAgIH07CisKKyAgICBhZGp1c3RMYXlvdXRCb3VuZHNXaXRoSWRlb2dyYXBoaWNCYXNlbGluZShy b290SW5saW5lQm94KTsKKyAgICBmb3IgKGF1dG8mIGlubGluZUxldmVsQm94IDogbGluZUJveC5u b25Sb290SW5saW5lTGV2ZWxCb3hlcygpKQorICAgICAgICBhZGp1c3RMYXlvdXRCb3VuZHNXaXRo SWRlb2dyYXBoaWNCYXNlbGluZShpbmxpbmVMZXZlbEJveCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5oCmluZGV4IDg3NTZhNzA3MzZhMjlkMjVjYmJj ODQyYTNlNjI4OTg3YzFmZDBiN2IuLmQ0OGFmYjZlMTJiMjQxZmNjMWY0ZmZmM2NiOWE0NWY3ODQ3 ZDg2OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaApAQCAt NDcsOCArNDcsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBzZXRCYXNlbGluZUFu ZExheW91dEJvdW5kcyhJbmxpbmVMZXZlbEJveCYsIGNvbnN0IExheW91dEJvdW5kc01ldHJpY3Mm KSBjb25zdDsKLSAgICB2b2lkIGFkanVzdExheW91dEJvdW5kc1dpdGhGYWxsYmFja0ZvbnRzKElu bGluZUxldmVsQm94JiwgY29uc3QgVGV4dFV0aWw6OkZhbGxiYWNrRm9udExpc3QmKSBjb25zdDsK LSAgICBUZXh0VXRpbDo6RmFsbGJhY2tGb250TGlzdCBjb2xsZWN0RmFsbGJhY2tGb250cyhjb25z dCBMaW5lOjpSdW4mLCBjb25zdCBSZW5kZXJTdHlsZSYpOworICAgIHZvaWQgYWRqdXN0TGF5b3V0 Qm91bmRzV2l0aEZhbGxiYWNrRm9udHMoSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBUZXh0VXRpbDo6 RmFsbGJhY2tGb250TGlzdCYgZmFsbGJhY2tGb250c0ZvckNvbnRlbnQsIEZvbnRCYXNlbGluZSkg Y29uc3Q7CisgICAgVGV4dFV0aWw6OkZhbGxiYWNrRm9udExpc3QgY29sbGVjdEZhbGxiYWNrRm9u dHMoY29uc3QgSW5saW5lTGV2ZWxCb3gmIHBhcmVudElubGluZUJveCwgY29uc3QgTGluZTo6UnVu JiwgY29uc3QgUmVuZGVyU3R5bGUmKTsKIAogICAgIHZvaWQgY29uc3RydWN0SW5saW5lTGV2ZWxC b3hlcyhMaW5lQm94JiwgY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50Jiwgc2l6ZV90IGxp bmVJbmRleCk7CiAgICAgdm9pZCBhZGp1c3RJZGVvZ3JhcGhpY0Jhc2VsaW5lSWZBcHBsaWNhYmxl KExpbmVCb3gmLCBzaXplX3QgbGluZUluZGV4KTsKQEAgLTYwLDYgKzYwLDcgQEAgcHJpdmF0ZToK IHByaXZhdGU6CiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9y bWF0dGluZ0NvbnRleHQ7CiAgICAgYm9vbCBtX2ZhbGxiYWNrRm9udFJlcXVpcmVzSWRlb2dyYXBo aWNCYXNlbGluZSB7IGZhbHNlIH07CisgICAgSGFzaE1hcDxjb25zdCBJbmxpbmVMZXZlbEJveCos IFRleHRVdGlsOjpGYWxsYmFja0ZvbnRMaXN0PiBtX2ZhbGxiYWNrRm9udHNGb3JJbmxpbmVCb3hl czsKIH07CiAKIH0K