238228 2022-03-22 15:21:24 -0700 [LFC][IFC] Do not construct a TextRun for measuring a single whitespace when simplified content measuring can be used 2022-03-24 08:57:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1853937 0 zalan 2022-03-22 15:21:24 -0700 ssia 1853939 1 455438 zalan 2022-03-22 15:24:06 -0700 Created attachment 455438 Patch 1854047 2 455467 zalan 2022-03-22 20:21:50 -0700 Created attachment 455467 Patch 1854662 3 455467 koivisto 2022-03-24 06:32:20 -0700 Comment on attachment 455467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=455467&action=review > Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp:67 > + float width = 0.f; auto! 1854681 4 455640 zalan 2022-03-24 08:08:48 -0700 Created attachment 455640 Patch 1854702 5 ews-feeder 2022-03-24 08:56:47 -0700 Committed r291799 (248827@main): <https://commits.webkit.org/248827@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455640. 1854703 6 webkit-bug-importer 2022-03-24 08:57:17 -0700 <rdar://problem/90770755> 455438 2022-03-22 15:24:06 -0700 2022-03-22 21:00:56 -0700 Patch bug-238228-20220322152405.patch text/plain 7541 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3N2E5YmI0MjlkNmFj YzcxOWFmOGEyYWU2MTNkOWQ3ZjE3OTIwMi4uNWVlMjNhM2RmODQ2YjNmYmRiNjM1MjkyMzQ4ZmFi MTY1YzNmZTI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAzLTIyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERvIG5vdCBj b25zdHJ1Y3QgYSBUZXh0UnVuIGZvciBtZWFzdXJpbmcgYSBzaW5nbGUgd2hpdGVzcGFjZSB3aGVu IHNpbXBsaWZpZWQgY29udGVudCBtZWFzdXJpbmcgY2FuIGJlIHVzZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODIyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpjb21wdXRlSW5saW5lVGV4dEl0ZW1XaWR0aHMpOiBK dXN0IHNpbXBseSBjYWxsIFRleHRVdGlsOjp3aWR0aAorICAgICAgICAqIGxheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpzcGFjZVdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6 OndpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OnNwYWNlV2lkdGgp OiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3Rl eHQvVGV4dFV0aWwuaDoKKwogMjAyMi0wMy0yMiAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIGNvbnRlbnQgZmlsdGVyaW5nIGluIHRoZSBOZXR3 b3JrIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCmlu ZGV4IDIzMDAwOTJkNTA1YTc4ZmZhY2I2YWFlMjczMjEwYWY3NWU3Mjk2NzUuLmQyOTU2ZDNiZTU1 Zjk4NDMwY2ZkYzZhOTMwNzY2MjAxZWZkYjQzNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtNDYzLDE5ICs0NjMsMTAgQEAgdm9pZCBJbmxpbmVJdGVt c0J1aWxkZXI6OmNvbXB1dGVJbmxpbmVUZXh0SXRlbVdpZHRocyhJbmxpbmVJdGVtcyYgaW5saW5l SXRlbXMpCiAgICAgICAgIGF1dG8mIGlubGluZVRleHRCb3ggPSBpbmxpbmVUZXh0SXRlbS5pbmxp bmVUZXh0Qm94KCk7CiAgICAgICAgIGF1dG8gc3RhcnQgPSBpbmxpbmVUZXh0SXRlbS5zdGFydCgp OwogICAgICAgICBhdXRvIGxlbmd0aCA9IGlubGluZVRleHRJdGVtLmxlbmd0aCgpOwotICAgICAg ICBpZiAoIWNhbkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0oaW5saW5lVGV4dEJv eCwgc3RhcnQsIGxlbmd0aCwgaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpKQorICAgICAg ICBhdXRvIG5lZWRzTWVhc3VyaW5nID0gbGVuZ3RoICYmICFpbmxpbmVUZXh0SXRlbS5pc1plcm9X aWR0aFNwYWNlU2VwYXJhdG9yKCk7CisgICAgICAgIGlmICghbmVlZHNNZWFzdXJpbmcgfHwgIWNh bkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0oaW5saW5lVGV4dEJveCwgc3RhcnQs IGxlbmd0aCwgaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpKQogICAgICAgICAgICAgY29u dGludWU7Ci0KLSAgICAgICAgYXV0byB3aWR0aCA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8SW5s aW5lTGF5b3V0VW5pdD4gewotICAgICAgICAgICAgYXV0byBzaW5nbGVXaGl0ZVNwYWNlID0gaW5s aW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgKCFUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVT cGFjZXNBbmRUYWJzKGlubGluZVRleHRCb3gpIHx8IChsZW5ndGggPT0gMSAmJiBpbmxpbmVUZXh0 Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkpKTsKLSAgICAgICAgICAgIGlm IChzaW5nbGVXaGl0ZVNwYWNlKQotICAgICAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6c3Bh Y2VXaWR0aChpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCkpOwotICAgICAgICAg ICAgaWYgKGxlbmd0aCAmJiAhaW5saW5lVGV4dEl0ZW0uaXNaZXJvV2lkdGhTcGFjZVNlcGFyYXRv cigpKQotICAgICAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEJv eCwgaW5saW5lVGV4dEl0ZW0uc3R5bGUoKS5mb250Q2FzY2FkZSgpLCBzdGFydCwgc3RhcnQgKyBs ZW5ndGgsIHsgfSk7Ci0gICAgICAgICAgICByZXR1cm4geyB9OwotICAgICAgICB9KCk7Ci0gICAg ICAgIGlmICh3aWR0aCkKLSAgICAgICAgICAgIGlubGluZVRleHRJdGVtLnNldFdpZHRoKCp3aWR0 aCk7CisgICAgICAgIGlubGluZVRleHRJdGVtLnNldFdpZHRoKFRleHRVdGlsOjp3aWR0aChpbmxp bmVUZXh0Qm94LCBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCksIHN0YXJ0LCBz dGFydCArIGxlbmd0aCwgeyB9KSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4 dFV0aWwuY3BwCmluZGV4IDc3ODYxN2MyNDE0OGMzNDZjNGU2YzNhOTVlMDNhYjQzZWZlZjJlMzAu LmFjOWU3M2ZkNDcxZWFhZjNmM2I4MDcwYzNkZmFkNTJkZmVhNDExMzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0 aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL3RleHQvVGV4dFV0aWwuY3BwCkBAIC00Miw2ICs0MiwxMyBAQAogbmFtZXNwYWNlIFdlYkNv cmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKK3N0YXRpYyBpbmxpbmUgSW5saW5lTGF5b3V0VW5p dCBzcGFjZVdpZHRoKGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZSwgYm9vbCBjYW5Vc2VT aW1wbGlmaWVkQ29udGVudE1lYXN1cmluZykKK3sKKyAgICBpZiAoY2FuVXNlU2ltcGxpZmllZENv bnRlbnRNZWFzdXJpbmcpCisgICAgICAgIHJldHVybiBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgp LnNwYWNlV2lkdGgoKTsKKyAgICByZXR1cm4gZm9udENhc2NhZGUud2lkdGhPZlNwYWNlU3RyaW5n KCk7Cit9CisKIElubGluZUxheW91dFVuaXQgVGV4dFV0aWw6OndpZHRoKGNvbnN0IElubGluZVRl eHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlLCBJ bmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCkKIHsKICAgICByZXR1cm4gVGV4dFV0 aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBmb250Q2FzY2FkZSwgaW5saW5lVGV4dEl0ZW0uc3Rh cnQoKSwgaW5saW5lVGV4dEl0ZW0uZW5kKCksIGNvbnRlbnRMb2dpY2FsTGVmdCk7CkBAIC01MSw5 ICs1OCwxNyBAQCBJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJbmxpbmVU ZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbgogewogICAgIFJFTEVBU0VfQVNTRVJU KGZyb20gPj0gaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSk7CiAgICAgUkVMRUFTRV9BU1NFUlQodG8g PD0gaW5saW5lVGV4dEl0ZW0uZW5kKCkpOwotICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRl c3BhY2UoKSAmJiAhVGV4dFV0aWw6OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVU ZXh0SXRlbS5sYXlvdXRCb3goKSkpIHsKLSAgICAgICAgYXV0byBzcGFjZVdpZHRoID0gVGV4dFV0 aWw6OnNwYWNlV2lkdGgoZm9udENhc2NhZGUpOwotICAgICAgICByZXR1cm4gc3RkOjppc25hbihz cGFjZVdpZHRoKSA/IDAuMGYgOiBzdGQ6OmlzaW5mKHNwYWNlV2lkdGgpID8gbWF4SW5saW5lTGF5 b3V0VW5pdCgpIDogc3BhY2VXaWR0aDsKKworICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRl c3BhY2UoKSkgeworICAgICAgICBhdXRvJiBpbmxpbmVUZXh0Qm94ID0gaW5saW5lVGV4dEl0ZW0u aW5saW5lVGV4dEJveCgpOworICAgICAgICBhdXRvIHVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3Vy aW5nID0gaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpOwor ICAgICAgICBhdXRvIGxlbmd0aCA9IGZyb20gLSB0bzsKKyAgICAgICAgYXV0byBzaW5nbGVXaGl0 ZVNwYWNlID0gbGVuZ3RoID09IDEgfHwgIVRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0Fu ZFRhYnMoaW5saW5lVGV4dEJveCk7CisKKyAgICAgICAgaWYgKHNpbmdsZVdoaXRlU3BhY2UpIHsK KyAgICAgICAgICAgIGF1dG8gd2lkdGggPSBzcGFjZVdpZHRoKGZvbnRDYXNjYWRlLCB1c2VTaW1w bGlmaWVkQ29udGVudE1lYXN1cmluZyk7CisgICAgICAgICAgICByZXR1cm4gc3RkOjppc25hbih3 aWR0aCkgPyAwLjBmIDogc3RkOjppc2luZih3aWR0aCkgPyBtYXhJbmxpbmVMYXlvdXRVbml0KCkg OiB3aWR0aDsKKyAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlu bGluZVRleHRJdGVtLmlubGluZVRleHRCb3goKSwgZm9udENhc2NhZGUsIGZyb20sIHRvLCBjb250 ZW50TG9naWNhbExlZnQpOwogfQpAQCAtNzIsOCArODcsOSBAQCBJbmxpbmVMYXlvdXRVbml0IFRl eHRVdGlsOjp3aWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBjb25zdCBG b250QwogICAgIGF1dG8gZXh0ZW5kZWRNZWFzdXJpbmcgPSB1c2VUcmFpbGluZ1doaXRlc3BhY2VN ZWFzdXJpbmdPcHRpbWl6YXRpb24gPT0gVXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0 aW1pemF0aW9uOjpZZXMgJiYgaGFzS2VybmluZ09yTGlnYXR1cmVzICYmIHRvIDwgdGV4dC5sZW5n dGgoKSAmJiB0ZXh0W3RvXSA9PSBzcGFjZTsKICAgICBpZiAoZXh0ZW5kZWRNZWFzdXJpbmcpCiAg ICAgICAgICsrdG87Ci0gICAgZmxvYXQgd2lkdGggPSAwOwotICAgIGlmIChpbmxpbmVUZXh0Qm94 LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkpCisgICAgZmxvYXQgd2lkdGggPSAw LmY7CisgICAgYXV0byB1c2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZyA9IGlubGluZVRleHRC b3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKTsKKyAgICBpZiAodXNlU2ltcGxp ZmllZENvbnRlbnRNZWFzdXJpbmcpCiAgICAgICAgIHdpZHRoID0gZm9udENhc2NhZGUud2lkdGhG b3JTaW1wbGVUZXh0KFN0cmluZ1ZpZXcodGV4dCkuc3Vic3RyaW5nKGZyb20sIHRvIC0gZnJvbSkp OwogICAgIGVsc2UgewogICAgICAgICBXZWJDb3JlOjpUZXh0UnVuIHJ1bihTdHJpbmdWaWV3KHRl eHQpLnN1YnN0cmluZyhmcm9tLCB0byAtIGZyb20pLCBjb250ZW50TG9naWNhbExlZnQpOwpAQCAt ODQsMTYgKzEwMCwxMSBAQCBJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJ bmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBjb25zdCBGb250QwogICAgIH0KIAogICAgIGlm IChleHRlbmRlZE1lYXN1cmluZykKLSAgICAgICAgd2lkdGggLT0gKHNwYWNlV2lkdGgoZm9udENh c2NhZGUpICsgZm9udENhc2NhZGUud29yZFNwYWNpbmcoKSk7CisgICAgICAgIHdpZHRoIC09IChz cGFjZVdpZHRoKGZvbnRDYXNjYWRlLCB1c2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZykgKyBm b250Q2FzY2FkZS53b3JkU3BhY2luZygpKTsKIAogICAgIHJldHVybiBzdGQ6OmlzbmFuKHdpZHRo KSA/IDAuMGYgOiBzdGQ6OmlzaW5mKHdpZHRoKSA/IG1heElubGluZUxheW91dFVuaXQoKSA6IHdp ZHRoOwogfQogCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjpzcGFjZVdpZHRoKGNvbnN0IEZv bnRDYXNjYWRlJiBmb250Q2FzY2FkZSkKLXsKLSAgICByZXR1cm4gZm9udENhc2NhZGUud2lkdGhP ZlNwYWNlU3RyaW5nKCk7Ci19Ci0KIElubGluZUxheW91dFVuaXQgVGV4dFV0aWw6OnRyYWlsaW5n V2hpdGVzcGFjZVdpZHRoKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIGNvbnN0 IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZSwgc2l6ZV90IHN0YXJ0UG9zaXRpb24sIHNpemVfdCBl bmRQb3NpdGlvbikKIHsKICAgICBhdXRvIHRleHQgPSBpbmxpbmVUZXh0Qm94LmNvbnRlbnQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL3RleHQvVGV4dFV0aWwuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaAppbmRleCA4ZGM4Y2VhZTgxYjQ5MWZkMTM5MjE4 YWJjNDZjYzcwYzA1Njg2YmNlLi5iNjcwMTY3MzdiYWMwNjJkNGYwNDBiZjUxOGM0ZjI3NTY1MWE0 YzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS90ZXh0L1RleHRVdGlsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oCkBAIC00OSw3ICs0OSw2IEBAIHB1 YmxpYzoKIAogICAgIGVudW0gY2xhc3MgVXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0 aW1pemF0aW9uIDogdWludDhfdCB7IFllcywgTm8gfTsKICAgICBzdGF0aWMgSW5saW5lTGF5b3V0 VW5pdCB3aWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiwgY29uc3QgRm9udENhc2NhZGUmLCB1bnNp Z25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExl ZnQsIFVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbiA9IFVzZVRyYWls aW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbjo6WWVzKTsKLSAgICBzdGF0aWMgSW5s aW5lTGF5b3V0VW5pdCBzcGFjZVdpZHRoKGNvbnN0IEZvbnRDYXNjYWRlJik7CiAKICAgICBzdGF0 aWMgSW5saW5lTGF5b3V0VW5pdCB0cmFpbGluZ1doaXRlc3BhY2VXaWR0aChjb25zdCBJbmxpbmVU ZXh0Qm94JiwgY29uc3QgRm9udENhc2NhZGUmLCBzaXplX3Qgc3RhcnRQb3NpdGlvbiwgc2l6ZV90 IGVuZFBvc2l0aW9uKTsKIAo= 455467 2022-03-22 20:21:50 -0700 2022-03-24 08:08:46 -0700 Patch bug-238228-20220322202149.patch text/plain 11708 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk2MjcwMzFiYjFhMDQ3 YjE0OTUxZjliN2IyZGU5ZmQxZjI2NDRmMy4uZTE1NDRhZTE5NDAwZjUxNDQwYzZiNGQwMTFmZGQw YjFkZTQwOTE4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAzLTIyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERvIG5vdCBj b25zdHJ1Y3QgYSBUZXh0UnVuIGZvciBtZWFzdXJpbmcgYSBzaW5nbGUgd2hpdGVzcGFjZSB3aGVu IHNpbXBsaWZpZWQgY29udGVudCBtZWFzdXJpbmcgY2FuIGJlIHVzZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODIyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpjb21wdXRlSW5saW5lVGV4dEl0ZW1XaWR0aHMpOiBK dXN0IHNpbXBseSBjYWxsIFRleHRVdGlsOjp3aWR0aAorICAgICAgICAqIGxheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpzcGFjZVdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6 OndpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OnNwYWNlV2lkdGgp OiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3Rl eHQvVGV4dFV0aWwuaDoKKwogMjAyMi0wMy0yMiAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIFJlbmRlclRleHQ6OmNvbXB1dGVDYW5V c2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyBzaG91bGQgdGFrZSBmaXJzdC1saW5lIHN0eWxlIGlu dG8gYWNjb3VudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5k ZXggMjMwMDA5MmQ1MDVhNzhmZmFjYjZhYWUyNzMyMTBhZjc1ZTcyOTY3NS4uNTZhMDc4MmM2ZWMw YzQzNjliZTFjZmJkYTc0OWIzMjQyZmEzN2M0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVJdGVtc0J1aWxkZXIuY3BwCkBAIC00NjMsMTkgKzQ2MywxMCBAQCB2b2lkIElubGluZUl0ZW1z QnVpbGRlcjo6Y29tcHV0ZUlubGluZVRleHRJdGVtV2lkdGhzKElubGluZUl0ZW1zJiBpbmxpbmVJ dGVtcykKICAgICAgICAgYXV0byYgaW5saW5lVGV4dEJveCA9IGlubGluZVRleHRJdGVtLmlubGlu ZVRleHRCb3goKTsKICAgICAgICAgYXV0byBzdGFydCA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCk7 CiAgICAgICAgIGF1dG8gbGVuZ3RoID0gaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCk7Ci0gICAgICAg IGlmICghY2FuQ2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0SXRlbShpbmxpbmVUZXh0Qm94 LCBzdGFydCwgbGVuZ3RoLCBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkpCisgICAgICAg IGF1dG8gbmVlZHNNZWFzdXJpbmcgPSBsZW5ndGggJiYgIWlubGluZVRleHRJdGVtLmlzWmVyb1dp ZHRoU3BhY2VTZXBhcmF0b3IoKTsKKyAgICAgICAgaWYgKCFuZWVkc01lYXN1cmluZyB8fCAhY2Fu Q2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0SXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydCwg bGVuZ3RoLCBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkpCiAgICAgICAgICAgICBjb250 aW51ZTsKLQotICAgICAgICBhdXRvIHdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiB7Ci0gICAgICAgICAgICBhdXRvIHNpbmdsZVdoaXRlU3BhY2UgPSBpbmxp bmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAoIVRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNw YWNlc0FuZFRhYnMoaW5saW5lVGV4dEJveCkgfHwgKGxlbmd0aCA9PSAxICYmIGlubGluZVRleHRC b3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSkpOwotICAgICAgICAgICAgaWYg KHNpbmdsZVdoaXRlU3BhY2UpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjpzcGFj ZVdpZHRoKGlubGluZVRleHRJdGVtLnN0eWxlKCkuZm9udENhc2NhZGUoKSk7Ci0gICAgICAgICAg ICBpZiAobGVuZ3RoICYmICFpbmxpbmVUZXh0SXRlbS5pc1plcm9XaWR0aFNwYWNlU2VwYXJhdG9y KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94 LCBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCksIHN0YXJ0LCBzdGFydCArIGxl bmd0aCwgeyB9KTsKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgIH0oKTsKLSAgICAg ICAgaWYgKHdpZHRoKQotICAgICAgICAgICAgaW5saW5lVGV4dEl0ZW0uc2V0V2lkdGgoKndpZHRo KTsKKyAgICAgICAgaW5saW5lVGV4dEl0ZW0uc2V0V2lkdGgoVGV4dFV0aWw6OndpZHRoKGlubGlu ZVRleHRJdGVtLCBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCksIHN0YXJ0LCBz dGFydCArIGxlbmd0aCwgeyB9KSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4 dFV0aWwuY3BwCmluZGV4IDc3ODYxN2MyNDE0OGMzNDZjNGU2YzNhOTVlMDNhYjQzZWZlZjJlMzAu LmVhZTBmOTQ4YmZiNThkYmQ3Mjc3ZWI1ZWE1MGY0NjMxNjEzYTk0M2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0 aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL3RleHQvVGV4dFV0aWwuY3BwCkBAIC00MiwyMyArNDIsMTUgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3 aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbnRDYXNj YWRlJiBmb250Q2FzY2FkZSwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCi17 Ci0gICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgZm9udENhc2NhZGUs IGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmVuZCgpLCBjb250ZW50TG9n aWNhbExlZnQpOwotfQotCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJ bmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2Fz Y2FkZSwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQgY29udGVu dExvZ2ljYWxMZWZ0KQorc3RhdGljIGlubGluZSBJbmxpbmVMYXlvdXRVbml0IHNwYWNlV2lkdGgo Y29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlLCBib29sIGNhblVzZVNpbXBsaWZpZWRDb250 ZW50TWVhc3VyaW5nKQogewotICAgIFJFTEVBU0VfQVNTRVJUKGZyb20gPj0gaW5saW5lVGV4dEl0 ZW0uc3RhcnQoKSk7Ci0gICAgUkVMRUFTRV9BU1NFUlQodG8gPD0gaW5saW5lVGV4dEl0ZW0uZW5k KCkpOwotICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhVGV4dFV0aWw6 OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSkp IHsKLSAgICAgICAgYXV0byBzcGFjZVdpZHRoID0gVGV4dFV0aWw6OnNwYWNlV2lkdGgoZm9udENh c2NhZGUpOwotICAgICAgICByZXR1cm4gc3RkOjppc25hbihzcGFjZVdpZHRoKSA/IDAuMGYgOiBz dGQ6OmlzaW5mKHNwYWNlV2lkdGgpID8gbWF4SW5saW5lTGF5b3V0VW5pdCgpIDogc3BhY2VXaWR0 aDsKLSAgICB9Ci0gICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbS5pbmxp bmVUZXh0Qm94KCksIGZvbnRDYXNjYWRlLCBmcm9tLCB0bywgY29udGVudExvZ2ljYWxMZWZ0KTsK KyAgICBpZiAoY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcpCisgICAgICAgIHJldHVy biBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgpLnNwYWNlV2lkdGgoKTsKKyAgICByZXR1cm4gZm9u dENhc2NhZGUud2lkdGhPZlNwYWNlU3RyaW5nKCk7CiB9CiAKLUlubGluZUxheW91dFVuaXQgVGV4 dFV0aWw6OndpZHRoKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIGNvbnN0IEZv bnRDYXNjYWRlJiBmb250Q2FzY2FkZSwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0LCBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFz dXJpbmdPcHRpbWl6YXRpb24gdXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0 aW9uKQorZW51bSBjbGFzcyBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRpbWl6YXRp b24gOiB1aW50OF90IHsgWWVzLCBObyB9Oworc3RhdGljIGlubGluZSBJbmxpbmVMYXlvdXRVbml0 IGNvbnRlbnRXaWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBjb25zdCBG b250Q2FzY2FkZSYgZm9udENhc2NhZGUsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxp bmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgVXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVh c3VyaW5nT3B0aW1pemF0aW9uIHVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXph dGlvbiA9IFVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbjo6WWVzKQog ewogICAgIGlmIChmcm9tID09IHRvKQogICAgICAgICByZXR1cm4gMDsKQEAgLTcyLDggKzY0LDkg QEAgSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYg aW5saW5lVGV4dEJveCwgY29uc3QgRm9udEMKICAgICBhdXRvIGV4dGVuZGVkTWVhc3VyaW5nID0g dXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0aW9uID09IFVzZVRyYWlsaW5n V2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbjo6WWVzICYmIGhhc0tlcm5pbmdPckxpZ2F0 dXJlcyAmJiB0byA8IHRleHQubGVuZ3RoKCkgJiYgdGV4dFt0b10gPT0gc3BhY2U7CiAgICAgaWYg KGV4dGVuZGVkTWVhc3VyaW5nKQogICAgICAgICArK3RvOwotICAgIGZsb2F0IHdpZHRoID0gMDsK LSAgICBpZiAoaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygp KQorICAgIGZsb2F0IHdpZHRoID0gMC5mOworICAgIGF1dG8gdXNlU2ltcGxpZmllZENvbnRlbnRN ZWFzdXJpbmcgPSBpbmxpbmVUZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5n KCk7CisgICAgaWYgKHVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKQogICAgICAgICB3aWR0 aCA9IGZvbnRDYXNjYWRlLndpZHRoRm9yU2ltcGxlVGV4dChTdHJpbmdWaWV3KHRleHQpLnN1YnN0 cmluZyhmcm9tLCB0byAtIGZyb20pKTsKICAgICBlbHNlIHsKICAgICAgICAgV2ViQ29yZTo6VGV4 dFJ1biBydW4oU3RyaW5nVmlldyh0ZXh0KS5zdWJzdHJpbmcoZnJvbSwgdG8gLSBmcm9tKSwgY29u dGVudExvZ2ljYWxMZWZ0KTsKQEAgLTg0LDE0ICs3NywzMyBAQCBJbmxpbmVMYXlvdXRVbml0IFRl eHRVdGlsOjp3aWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBjb25zdCBG b250QwogICAgIH0KIAogICAgIGlmIChleHRlbmRlZE1lYXN1cmluZykKLSAgICAgICAgd2lkdGgg LT0gKHNwYWNlV2lkdGgoZm9udENhc2NhZGUpICsgZm9udENhc2NhZGUud29yZFNwYWNpbmcoKSk7 CisgICAgICAgIHdpZHRoIC09IChzcGFjZVdpZHRoKGZvbnRDYXNjYWRlLCB1c2VTaW1wbGlmaWVk Q29udGVudE1lYXN1cmluZykgKyBmb250Q2FzY2FkZS53b3JkU3BhY2luZygpKTsKIAogICAgIHJl dHVybiBzdGQ6OmlzbmFuKHdpZHRoKSA/IDAuMGYgOiBzdGQ6OmlzaW5mKHdpZHRoKSA/IG1heElu bGluZUxheW91dFVuaXQoKSA6IHdpZHRoOwogfQogCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGls OjpzcGFjZVdpZHRoKGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2FkZSkKK0lubGluZUxheW91 dFVuaXQgVGV4dFV0aWw6OndpZHRoKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRl bSwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsTGVmdCkKIHsKLSAgICByZXR1cm4gZm9udENhc2NhZGUud2lkdGhPZlNwYWNlU3Ry aW5nKCk7CisgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgZm9udENh c2NhZGUsIGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmVuZCgpLCBjb250 ZW50TG9naWNhbExlZnQpOworfQorCitJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChj b25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbnRDYXNjYWRlJiBm b250Q2FzY2FkZSwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQg Y29udGVudExvZ2ljYWxMZWZ0KQoreworICAgIFJFTEVBU0VfQVNTRVJUKGZyb20gPj0gaW5saW5l VGV4dEl0ZW0uc3RhcnQoKSk7CisgICAgUkVMRUFTRV9BU1NFUlQodG8gPD0gaW5saW5lVGV4dEl0 ZW0uZW5kKCkpOworCisgICAgaWYgKGlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7Cisg ICAgICAgIGF1dG8mIGlubGluZVRleHRCb3ggPSBpbmxpbmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94 KCk7CisgICAgICAgIGF1dG8gdXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcgPSBpbmxpbmVU ZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCk7CisgICAgICAgIGF1dG8g bGVuZ3RoID0gZnJvbSAtIHRvOworICAgICAgICBhdXRvIHNpbmdsZVdoaXRlU3BhY2UgPSBsZW5n dGggPT0gMSB8fCAhVGV4dFV0aWw6OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVU ZXh0Qm94KTsKKworICAgICAgICBpZiAoc2luZ2xlV2hpdGVTcGFjZSkgeworICAgICAgICAgICAg YXV0byB3aWR0aCA9IHNwYWNlV2lkdGgoZm9udENhc2NhZGUsIHVzZVNpbXBsaWZpZWRDb250ZW50 TWVhc3VyaW5nKTsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6OmlzbmFuKHdpZHRoKSA/IDAuMGYg OiBzdGQ6OmlzaW5mKHdpZHRoKSA/IG1heElubGluZUxheW91dFVuaXQoKSA6IHdpZHRoOworICAg ICAgICB9CisgICAgfQorICAgIHJldHVybiBjb250ZW50V2lkdGgoaW5saW5lVGV4dEl0ZW0uaW5s aW5lVGV4dEJveCgpLCBmb250Q2FzY2FkZSwgZnJvbSwgdG8sIGNvbnRlbnRMb2dpY2FsTGVmdCk7 CiB9CiAKIElubGluZUxheW91dFVuaXQgVGV4dFV0aWw6OnRyYWlsaW5nV2hpdGVzcGFjZVdpZHRo KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIGNvbnN0IEZvbnRDYXNjYWRlJiBm b250Q2FzY2FkZSwgc2l6ZV90IHN0YXJ0UG9zaXRpb24sIHNpemVfdCBlbmRQb3NpdGlvbikKQEAg LTk5LDggKzExMSw4IEBAIElubGluZUxheW91dFVuaXQgVGV4dFV0aWw6OnRyYWlsaW5nV2hpdGVz cGFjZVdpZHRoKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRlCiAgICAgYXV0byB0ZXh0ID0g aW5saW5lVGV4dEJveC5jb250ZW50KCk7CiAgICAgQVNTRVJUKGVuZFBvc2l0aW9uID4gc3RhcnRQ b3NpdGlvbiArIDEpOwogICAgIEFTU0VSVCh0ZXh0W2VuZFBvc2l0aW9uIC0gMV0gPT0gc3BhY2Up OwotICAgIHJldHVybiB3aWR0aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQb3Np dGlvbiwgZW5kUG9zaXRpb24sIHsgfSwgVGV4dFV0aWw6OlVzZVRyYWlsaW5nV2hpdGVzcGFjZU1l YXN1cmluZ09wdGltaXphdGlvbjo6WWVzKSAtIAotICAgICAgICB3aWR0aChpbmxpbmVUZXh0Qm94 LCBmb250Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24gLSAxLCB7IH0sIFRleHRV dGlsOjpVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRpbWl6YXRpb246Ok5vKTsKKyAg ICByZXR1cm4gY29udGVudFdpZHRoKGlubGluZVRleHRCb3gsIGZvbnRDYXNjYWRlLCBzdGFydFBv c2l0aW9uLCBlbmRQb3NpdGlvbiwgeyB9LCBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdP cHRpbWl6YXRpb246OlllcykgLSAKKyAgICAgICAgY29udGVudFdpZHRoKGlubGluZVRleHRCb3gs IGZvbnRDYXNjYWRlLCBzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbiAtIDEsIHsgfSwgVXNlVHJh aWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0aW9uOjpObyk7CiB9CiAKIHRlbXBsYXRl IDx0eXBlbmFtZSBUZXh0SXRlcmF0b3I+CkBAIC0xOTcsNyArMjA5LDcgQEAgVGV4dFV0aWw6Oldv cmRCcmVha0xlZnQgVGV4dFV0aWw6OmJyZWFrV29yZChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxp bmVUZXh0Qm94LAogICAgICAgICAgICAgICAgIGF1dG8gbWlkZGxlID0gdXNlclBlcmNlaXZlZENo YXJhY3RlckJvdW5kYXJ5QWxpZ25lZEluZGV4KChsZWZ0ICsgcmlnaHQpIC8gMik7CiAgICAgICAg ICAgICAgICAgQVNTRVJUKG1pZGRsZSA+PSBsZWZ0ICYmIG1pZGRsZSA8IHJpZ2h0KTsKICAgICAg ICAgICAgICAgICBhdXRvIGVuZE9mTWlkZGxlQ2hhcmFjdGVyID0gbmV4dFVzZXJQZXJjZWl2ZWRD aGFyYWN0ZXJJbmRleChtaWRkbGUpOwotICAgICAgICAgICAgICAgIGF1dG8gd2lkdGggPSBUZXh0 VXRpbDo6d2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIGVu ZE9mTWlkZGxlQ2hhcmFjdGVyLCBjb250ZW50TG9naWNhbExlZnQpOworICAgICAgICAgICAgICAg IGF1dG8gd2lkdGggPSBjb250ZW50V2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0 YXJ0UG9zaXRpb24sIGVuZE9mTWlkZGxlQ2hhcmFjdGVyLCBjb250ZW50TG9naWNhbExlZnQpOwog ICAgICAgICAgICAgICAgIGlmICh3aWR0aCA8IGF2YWlsYWJsZVdpZHRoKSB7CiAgICAgICAgICAg ICAgICAgICAgIGxlZnQgPSBlbmRPZk1pZGRsZUNoYXJhY3RlcjsKICAgICAgICAgICAgICAgICAg ICAgbGVmdFNpZGVXaWR0aCA9IHdpZHRoOwpAQCAtMjE4LDcgKzIzMCw3IEBAIFRleHRVdGlsOjpX b3JkQnJlYWtMZWZ0IFRleHRVdGlsOjpicmVha1dvcmQoY29uc3QgSW5saW5lVGV4dEJveCYgaW5s aW5lVGV4dEJveCwKICAgICBhdXRvIGdyYXBoZW1lQ2x1c3Rlckl0ZXJhdG9yID0gTm9uU2hhcmVk Q2hhcmFjdGVyQnJlYWtJdGVyYXRvciB7IFN0cmluZ1ZpZXcgeyB0ZXh0IH0uc3Vic3RyaW5nKHN0 YXJ0UG9zaXRpb24sIGxlbmd0aCkgfTsKICAgICBhdXRvIGxlZnRTaWRlID0gVGV4dFV0aWw6Oldv cmRCcmVha0xlZnQgeyB9OwogICAgIGZvciAoYXV0byBjbHVzdGVyU3RhcnRQb3NpdGlvbiA9IHVi cmtfbmV4dChncmFwaGVtZUNsdXN0ZXJJdGVyYXRvcik7IGNsdXN0ZXJTdGFydFBvc2l0aW9uICE9 IFVCUktfRE9ORTsgY2x1c3RlclN0YXJ0UG9zaXRpb24gPSB1YnJrX25leHQoZ3JhcGhlbWVDbHVz dGVySXRlcmF0b3IpKSB7Ci0gICAgICAgIGF1dG8gd2lkdGggPSBUZXh0VXRpbDo6d2lkdGgoaW5s aW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIHN0YXJ0UG9zaXRpb24gKyBj bHVzdGVyU3RhcnRQb3NpdGlvbiwgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICAgICAgYXV0byB3 aWR0aCA9IGNvbnRlbnRXaWR0aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQb3Np dGlvbiwgc3RhcnRQb3NpdGlvbiArIGNsdXN0ZXJTdGFydFBvc2l0aW9uLCBjb250ZW50TG9naWNh bExlZnQpOwogICAgICAgICBpZiAod2lkdGggPiBhdmFpbGFibGVXaWR0aCkKICAgICAgICAgICAg IHJldHVybiBsZWZ0U2lkZTsKICAgICAgICAgbGVmdFNpZGUgPSB7IHN0YXRpY19jYXN0PHNpemVf dD4oY2x1c3RlclN0YXJ0UG9zaXRpb24pLCB3aWR0aCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0 VXRpbC5oCmluZGV4IDhkYzhjZWFlODFiNDkxZmQxMzkyMThhYmM0NmNjNzBjMDU2ODZiY2UuLjFl YzNmOTdlMmU2ZjA2ZDEzY2Y3ZjUzZjU3YWFhOWM4NzY2MDZlNWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90 ZXh0L1RleHRVdGlsLmgKQEAgLTQ3LDEwICs0Nyw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgSW5s aW5lTGF5b3V0VW5pdCB3aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIGNvbnN0IEZvbnRDYXNj YWRlJiwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpOwogICAgIHN0YXRpYyBJ bmxpbmVMYXlvdXRVbml0IHdpZHRoKGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgRm9udENh c2NhZGUmLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbExlZnQpOwogCi0gICAgZW51bSBjbGFzcyBVc2VUcmFpbGluZ1doaXRlc3BhY2VN ZWFzdXJpbmdPcHRpbWl6YXRpb24gOiB1aW50OF90IHsgWWVzLCBObyB9OwotICAgIHN0YXRpYyBJ bmxpbmVMYXlvdXRVbml0IHdpZHRoKGNvbnN0IElubGluZVRleHRCb3gmLCBjb25zdCBGb250Q2Fz Y2FkZSYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsTGVmdCwgVXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0aW9u ID0gVXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0aW9uOjpZZXMpOwotICAg IHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IHNwYWNlV2lkdGgoY29uc3QgRm9udENhc2NhZGUmKTsK LQogICAgIHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IHRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoKGNv bnN0IElubGluZVRleHRCb3gmLCBjb25zdCBGb250Q2FzY2FkZSYsIHNpemVfdCBzdGFydFBvc2l0 aW9uLCBzaXplX3QgZW5kUG9zaXRpb24pOwogCiAgICAgdXNpbmcgRmFsbGJhY2tGb250TGlzdCA9 IEhhc2hTZXQ8Y29uc3QgRm9udCo+Owo= 455640 2022-03-24 08:08:48 -0700 2022-03-24 08:56:50 -0700 Patch bug-238228-20220324080847.patch text/plain 11707 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY1MDc3MTFmZjk2MWIy ZTA5YTRjZmZmNmFmNmNkYzNmMDQ5MWQ0OS4uYmNjY2VmNTdlZjQ3NmJkOTcwMDM1M2E4MjMzMTBl ZGY4MDJiNjMwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAzLTI0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIERvIG5vdCBj b25zdHJ1Y3QgYSBUZXh0UnVuIGZvciBtZWFzdXJpbmcgYSBzaW5nbGUgd2hpdGVzcGFjZSB3aGVu IHNpbXBsaWZpZWQgY29udGVudCBtZWFzdXJpbmcgY2FuIGJlIHVzZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODIyOAorCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpjb21wdXRlSW5saW5lVGV4dEl0ZW1XaWR0aHMpOiBK dXN0IHNpbXBseSBjYWxsIFRleHRVdGlsOjp3aWR0aAorICAgICAgICAqIGxheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpzcGFjZVdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6 OndpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OnNwYWNlV2lkdGgp OiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3Rl eHQvVGV4dFV0aWwuaDoKKwogMjAyMi0wMy0yNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIFJlbmRlclRleHQ6OmNvbXB1dGVDYW5V c2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZyBzaG91bGQgdGFrZSBmaXJzdC1saW5lIHN0eWxlIGlu dG8gYWNjb3VudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5k ZXggMjMwMDA5MmQ1MDVhNzhmZmFjYjZhYWUyNzMyMTBhZjc1ZTcyOTY3NS4uNTZhMDc4MmM2ZWMw YzQzNjliZTFjZmJkYTc0OWIzMjQyZmEzN2M0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVJdGVtc0J1aWxkZXIuY3BwCkBAIC00NjMsMTkgKzQ2MywxMCBAQCB2b2lkIElubGluZUl0ZW1z QnVpbGRlcjo6Y29tcHV0ZUlubGluZVRleHRJdGVtV2lkdGhzKElubGluZUl0ZW1zJiBpbmxpbmVJ dGVtcykKICAgICAgICAgYXV0byYgaW5saW5lVGV4dEJveCA9IGlubGluZVRleHRJdGVtLmlubGlu ZVRleHRCb3goKTsKICAgICAgICAgYXV0byBzdGFydCA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCk7 CiAgICAgICAgIGF1dG8gbGVuZ3RoID0gaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCk7Ci0gICAgICAg IGlmICghY2FuQ2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0SXRlbShpbmxpbmVUZXh0Qm94 LCBzdGFydCwgbGVuZ3RoLCBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkpCisgICAgICAg IGF1dG8gbmVlZHNNZWFzdXJpbmcgPSBsZW5ndGggJiYgIWlubGluZVRleHRJdGVtLmlzWmVyb1dp ZHRoU3BhY2VTZXBhcmF0b3IoKTsKKyAgICAgICAgaWYgKCFuZWVkc01lYXN1cmluZyB8fCAhY2Fu Q2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0SXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydCwg bGVuZ3RoLCBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkpCiAgICAgICAgICAgICBjb250 aW51ZTsKLQotICAgICAgICBhdXRvIHdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxJbmxp bmVMYXlvdXRVbml0PiB7Ci0gICAgICAgICAgICBhdXRvIHNpbmdsZVdoaXRlU3BhY2UgPSBpbmxp bmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAoIVRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNw YWNlc0FuZFRhYnMoaW5saW5lVGV4dEJveCkgfHwgKGxlbmd0aCA9PSAxICYmIGlubGluZVRleHRC b3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSkpOwotICAgICAgICAgICAgaWYg KHNpbmdsZVdoaXRlU3BhY2UpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjpzcGFj ZVdpZHRoKGlubGluZVRleHRJdGVtLnN0eWxlKCkuZm9udENhc2NhZGUoKSk7Ci0gICAgICAgICAg ICBpZiAobGVuZ3RoICYmICFpbmxpbmVUZXh0SXRlbS5pc1plcm9XaWR0aFNwYWNlU2VwYXJhdG9y KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94 LCBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCksIHN0YXJ0LCBzdGFydCArIGxl bmd0aCwgeyB9KTsKLSAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgIH0oKTsKLSAgICAg ICAgaWYgKHdpZHRoKQotICAgICAgICAgICAgaW5saW5lVGV4dEl0ZW0uc2V0V2lkdGgoKndpZHRo KTsKKyAgICAgICAgaW5saW5lVGV4dEl0ZW0uc2V0V2lkdGgoVGV4dFV0aWw6OndpZHRoKGlubGlu ZVRleHRJdGVtLCBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCksIHN0YXJ0LCBz dGFydCArIGxlbmd0aCwgeyB9KSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4 dFV0aWwuY3BwCmluZGV4IDc3ODYxN2MyNDE0OGMzNDZjNGU2YzNhOTVlMDNhYjQzZWZlZjJlMzAu LmI4NGU5OTNmOGJiNDZmZDU2ZGIwNzY1NmQ4YzMwZGEzNGQ5Y2I4NDQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0 aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL3RleHQvVGV4dFV0aWwuY3BwCkBAIC00MiwyMyArNDIsMTUgQEAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3 aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbnRDYXNj YWRlJiBmb250Q2FzY2FkZSwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCi17 Ci0gICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgZm9udENhc2NhZGUs IGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLmVuZCgpLCBjb250ZW50TG9n aWNhbExlZnQpOwotfQotCi1JbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3aWR0aChjb25zdCBJ bmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2Fz Y2FkZSwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQgY29udGVu dExvZ2ljYWxMZWZ0KQorc3RhdGljIGlubGluZSBJbmxpbmVMYXlvdXRVbml0IHNwYWNlV2lkdGgo Y29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlLCBib29sIGNhblVzZVNpbXBsaWZpZWRDb250 ZW50TWVhc3VyaW5nKQogewotICAgIFJFTEVBU0VfQVNTRVJUKGZyb20gPj0gaW5saW5lVGV4dEl0 ZW0uc3RhcnQoKSk7Ci0gICAgUkVMRUFTRV9BU1NFUlQodG8gPD0gaW5saW5lVGV4dEl0ZW0uZW5k KCkpOwotICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhVGV4dFV0aWw6 OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSkp IHsKLSAgICAgICAgYXV0byBzcGFjZVdpZHRoID0gVGV4dFV0aWw6OnNwYWNlV2lkdGgoZm9udENh c2NhZGUpOwotICAgICAgICByZXR1cm4gc3RkOjppc25hbihzcGFjZVdpZHRoKSA/IDAuMGYgOiBz dGQ6OmlzaW5mKHNwYWNlV2lkdGgpID8gbWF4SW5saW5lTGF5b3V0VW5pdCgpIDogc3BhY2VXaWR0 aDsKLSAgICB9Ci0gICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbS5pbmxp bmVUZXh0Qm94KCksIGZvbnRDYXNjYWRlLCBmcm9tLCB0bywgY29udGVudExvZ2ljYWxMZWZ0KTsK KyAgICBpZiAoY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcpCisgICAgICAgIHJldHVy biBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgpLnNwYWNlV2lkdGgoKTsKKyAgICByZXR1cm4gZm9u dENhc2NhZGUud2lkdGhPZlNwYWNlU3RyaW5nKCk7CiB9CiAKLUlubGluZUxheW91dFVuaXQgVGV4 dFV0aWw6OndpZHRoKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIGNvbnN0IEZv bnRDYXNjYWRlJiBmb250Q2FzY2FkZSwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGlu ZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0LCBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFz dXJpbmdPcHRpbWl6YXRpb24gdXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0 aW9uKQorZW51bSBjbGFzcyBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRpbWl6YXRp b24gOiB1aW50OF90IHsgWWVzLCBObyB9Oworc3RhdGljIGlubGluZSBJbmxpbmVMYXlvdXRVbml0 IGNvbnRlbnRXaWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBjb25zdCBG b250Q2FzY2FkZSYgZm9udENhc2NhZGUsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxp bmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgVXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVh c3VyaW5nT3B0aW1pemF0aW9uIHVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXph dGlvbiA9IFVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbjo6WWVzKQog ewogICAgIGlmIChmcm9tID09IHRvKQogICAgICAgICByZXR1cm4gMDsKQEAgLTcyLDggKzY0LDkg QEAgSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYg aW5saW5lVGV4dEJveCwgY29uc3QgRm9udEMKICAgICBhdXRvIGV4dGVuZGVkTWVhc3VyaW5nID0g dXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVhc3VyaW5nT3B0aW1pemF0aW9uID09IFVzZVRyYWlsaW5n V2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbjo6WWVzICYmIGhhc0tlcm5pbmdPckxpZ2F0 dXJlcyAmJiB0byA8IHRleHQubGVuZ3RoKCkgJiYgdGV4dFt0b10gPT0gc3BhY2U7CiAgICAgaWYg KGV4dGVuZGVkTWVhc3VyaW5nKQogICAgICAgICArK3RvOwotICAgIGZsb2F0IHdpZHRoID0gMDsK LSAgICBpZiAoaW5saW5lVGV4dEJveC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygp KQorICAgIGF1dG8gd2lkdGggPSAwLmY7CisgICAgYXV0byB1c2VTaW1wbGlmaWVkQ29udGVudE1l YXN1cmluZyA9IGlubGluZVRleHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmco KTsKKyAgICBpZiAodXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcpCiAgICAgICAgIHdpZHRo ID0gZm9udENhc2NhZGUud2lkdGhGb3JTaW1wbGVUZXh0KFN0cmluZ1ZpZXcodGV4dCkuc3Vic3Ry aW5nKGZyb20sIHRvIC0gZnJvbSkpOwogICAgIGVsc2UgewogICAgICAgICBXZWJDb3JlOjpUZXh0 UnVuIHJ1bihTdHJpbmdWaWV3KHRleHQpLnN1YnN0cmluZyhmcm9tLCB0byAtIGZyb20pLCBjb250 ZW50TG9naWNhbExlZnQpOwpAQCAtODQsMTQgKzc3LDMzIEBAIElubGluZUxheW91dFVuaXQgVGV4 dFV0aWw6OndpZHRoKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIGNvbnN0IEZv bnRDCiAgICAgfQogCiAgICAgaWYgKGV4dGVuZGVkTWVhc3VyaW5nKQotICAgICAgICB3aWR0aCAt PSAoc3BhY2VXaWR0aChmb250Q2FzY2FkZSkgKyBmb250Q2FzY2FkZS53b3JkU3BhY2luZygpKTsK KyAgICAgICAgd2lkdGggLT0gKHNwYWNlV2lkdGgoZm9udENhc2NhZGUsIHVzZVNpbXBsaWZpZWRD b250ZW50TWVhc3VyaW5nKSArIGZvbnRDYXNjYWRlLndvcmRTcGFjaW5nKCkpOwogCiAgICAgcmV0 dXJuIHN0ZDo6aXNuYW4od2lkdGgpID8gMC4wZiA6IHN0ZDo6aXNpbmYod2lkdGgpID8gbWF4SW5s aW5lTGF5b3V0VW5pdCgpIDogd2lkdGg7CiB9CiAKLUlubGluZUxheW91dFVuaXQgVGV4dFV0aWw6 OnNwYWNlV2lkdGgoY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNjYWRlKQorSW5saW5lTGF5b3V0 VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVt LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIElubGluZUxheW91dFVuaXQgY29udGVu dExvZ2ljYWxMZWZ0KQogewotICAgIHJldHVybiBmb250Q2FzY2FkZS53aWR0aE9mU3BhY2VTdHJp bmcoKTsKKyAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLCBmb250Q2Fz Y2FkZSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0uZW5kKCksIGNvbnRl bnRMb2dpY2FsTGVmdCk7Cit9CisKK0lubGluZUxheW91dFVuaXQgVGV4dFV0aWw6OndpZHRoKGNv bnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgRm9udENhc2NhZGUmIGZv bnRDYXNjYWRlLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbExlZnQpCit7CisgICAgUkVMRUFTRV9BU1NFUlQoZnJvbSA+PSBpbmxpbmVU ZXh0SXRlbS5zdGFydCgpKTsKKyAgICBSRUxFQVNFX0FTU0VSVCh0byA8PSBpbmxpbmVUZXh0SXRl bS5lbmQoKSk7CisKKyAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpIHsKKyAg ICAgICAgYXV0byYgaW5saW5lVGV4dEJveCA9IGlubGluZVRleHRJdGVtLmlubGluZVRleHRCb3go KTsKKyAgICAgICAgYXV0byB1c2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZyA9IGlubGluZVRl eHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKTsKKyAgICAgICAgYXV0byBs ZW5ndGggPSBmcm9tIC0gdG87CisgICAgICAgIGF1dG8gc2luZ2xlV2hpdGVTcGFjZSA9IGxlbmd0 aCA9PSAxIHx8ICFUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRl eHRCb3gpOworCisgICAgICAgIGlmIChzaW5nbGVXaGl0ZVNwYWNlKSB7CisgICAgICAgICAgICBh dXRvIHdpZHRoID0gc3BhY2VXaWR0aChmb250Q2FzY2FkZSwgdXNlU2ltcGxpZmllZENvbnRlbnRN ZWFzdXJpbmcpOworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6aXNuYW4od2lkdGgpID8gMC4wZiA6 IHN0ZDo6aXNpbmYod2lkdGgpID8gbWF4SW5saW5lTGF5b3V0VW5pdCgpIDogd2lkdGg7CisgICAg ICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGNvbnRlbnRXaWR0aChpbmxpbmVUZXh0SXRlbS5pbmxp bmVUZXh0Qm94KCksIGZvbnRDYXNjYWRlLCBmcm9tLCB0bywgY29udGVudExvZ2ljYWxMZWZ0KTsK IH0KIAogSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6dHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgo Y29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwgY29uc3QgRm9udENhc2NhZGUmIGZv bnRDYXNjYWRlLCBzaXplX3Qgc3RhcnRQb3NpdGlvbiwgc2l6ZV90IGVuZFBvc2l0aW9uKQpAQCAt OTksOCArMTExLDggQEAgSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6dHJhaWxpbmdXaGl0ZXNw YWNlV2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGUKICAgICBhdXRvIHRleHQgPSBp bmxpbmVUZXh0Qm94LmNvbnRlbnQoKTsKICAgICBBU1NFUlQoZW5kUG9zaXRpb24gPiBzdGFydFBv c2l0aW9uICsgMSk7CiAgICAgQVNTRVJUKHRleHRbZW5kUG9zaXRpb24gLSAxXSA9PSBzcGFjZSk7 Ci0gICAgcmV0dXJuIHdpZHRoKGlubGluZVRleHRCb3gsIGZvbnRDYXNjYWRlLCBzdGFydFBvc2l0 aW9uLCBlbmRQb3NpdGlvbiwgeyB9LCBUZXh0VXRpbDo6VXNlVHJhaWxpbmdXaGl0ZXNwYWNlTWVh c3VyaW5nT3B0aW1pemF0aW9uOjpZZXMpIC0gCi0gICAgICAgIHdpZHRoKGlubGluZVRleHRCb3gs IGZvbnRDYXNjYWRlLCBzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbiAtIDEsIHsgfSwgVGV4dFV0 aWw6OlVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09wdGltaXphdGlvbjo6Tm8pOworICAg IHJldHVybiBjb250ZW50V2lkdGgoaW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9z aXRpb24sIGVuZFBvc2l0aW9uLCB7IH0sIFVzZVRyYWlsaW5nV2hpdGVzcGFjZU1lYXN1cmluZ09w dGltaXphdGlvbjo6WWVzKSAtIAorICAgICAgICBjb250ZW50V2lkdGgoaW5saW5lVGV4dEJveCwg Zm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIGVuZFBvc2l0aW9uIC0gMSwgeyB9LCBVc2VUcmFp bGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRpbWl6YXRpb246Ok5vKTsKIH0KIAogdGVtcGxhdGUg PHR5cGVuYW1lIFRleHRJdGVyYXRvcj4KQEAgLTE5Nyw3ICsyMDksNyBAQCBUZXh0VXRpbDo6V29y ZEJyZWFrTGVmdCBUZXh0VXRpbDo6YnJlYWtXb3JkKGNvbnN0IElubGluZVRleHRCb3gmIGlubGlu ZVRleHRCb3gsCiAgICAgICAgICAgICAgICAgYXV0byBtaWRkbGUgPSB1c2VyUGVyY2VpdmVkQ2hh cmFjdGVyQm91bmRhcnlBbGlnbmVkSW5kZXgoKGxlZnQgKyByaWdodCkgLyAyKTsKICAgICAgICAg ICAgICAgICBBU1NFUlQobWlkZGxlID49IGxlZnQgJiYgbWlkZGxlIDwgcmlnaHQpOwogICAgICAg ICAgICAgICAgIGF1dG8gZW5kT2ZNaWRkbGVDaGFyYWN0ZXIgPSBuZXh0VXNlclBlcmNlaXZlZENo YXJhY3RlckluZGV4KG1pZGRsZSk7Ci0gICAgICAgICAgICAgICAgYXV0byB3aWR0aCA9IFRleHRV dGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgZW5k T2ZNaWRkbGVDaGFyYWN0ZXIsIGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgICAgICAgICAgICAg YXV0byB3aWR0aCA9IGNvbnRlbnRXaWR0aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3Rh cnRQb3NpdGlvbiwgZW5kT2ZNaWRkbGVDaGFyYWN0ZXIsIGNvbnRlbnRMb2dpY2FsTGVmdCk7CiAg ICAgICAgICAgICAgICAgaWYgKHdpZHRoIDwgYXZhaWxhYmxlV2lkdGgpIHsKICAgICAgICAgICAg ICAgICAgICAgbGVmdCA9IGVuZE9mTWlkZGxlQ2hhcmFjdGVyOwogICAgICAgICAgICAgICAgICAg ICBsZWZ0U2lkZVdpZHRoID0gd2lkdGg7CkBAIC0yMTgsNyArMjMwLDcgQEAgVGV4dFV0aWw6Oldv cmRCcmVha0xlZnQgVGV4dFV0aWw6OmJyZWFrV29yZChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxp bmVUZXh0Qm94LAogICAgIGF1dG8gZ3JhcGhlbWVDbHVzdGVySXRlcmF0b3IgPSBOb25TaGFyZWRD aGFyYWN0ZXJCcmVha0l0ZXJhdG9yIHsgU3RyaW5nVmlldyB7IHRleHQgfS5zdWJzdHJpbmcoc3Rh cnRQb3NpdGlvbiwgbGVuZ3RoKSB9OwogICAgIGF1dG8gbGVmdFNpZGUgPSBUZXh0VXRpbDo6V29y ZEJyZWFrTGVmdCB7IH07CiAgICAgZm9yIChhdXRvIGNsdXN0ZXJTdGFydFBvc2l0aW9uID0gdWJy a19uZXh0KGdyYXBoZW1lQ2x1c3Rlckl0ZXJhdG9yKTsgY2x1c3RlclN0YXJ0UG9zaXRpb24gIT0g VUJSS19ET05FOyBjbHVzdGVyU3RhcnRQb3NpdGlvbiA9IHVicmtfbmV4dChncmFwaGVtZUNsdXN0 ZXJJdGVyYXRvcikpIHsKLSAgICAgICAgYXV0byB3aWR0aCA9IFRleHRVdGlsOjp3aWR0aChpbmxp bmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgc3RhcnRQb3NpdGlvbiArIGNs dXN0ZXJTdGFydFBvc2l0aW9uLCBjb250ZW50TG9naWNhbExlZnQpOworICAgICAgICBhdXRvIHdp ZHRoID0gY29udGVudFdpZHRoKGlubGluZVRleHRCb3gsIGZvbnRDYXNjYWRlLCBzdGFydFBvc2l0 aW9uLCBzdGFydFBvc2l0aW9uICsgY2x1c3RlclN0YXJ0UG9zaXRpb24sIGNvbnRlbnRMb2dpY2Fs TGVmdCk7CiAgICAgICAgIGlmICh3aWR0aCA+IGF2YWlsYWJsZVdpZHRoKQogICAgICAgICAgICAg cmV0dXJuIGxlZnRTaWRlOwogICAgICAgICBsZWZ0U2lkZSA9IHsgc3RhdGljX2Nhc3Q8c2l6ZV90 PihjbHVzdGVyU3RhcnRQb3NpdGlvbiksIHdpZHRoIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRV dGlsLmgKaW5kZXggOGRjOGNlYWU4MWI0OTFmZDEzOTIxOGFiYzQ2Y2M3MGMwNTY4NmJjZS4uMWVj M2Y5N2UyZTZmMDZkMTNjZjdmNTNmNTdhYWE5Yzg3NjYwNmU1ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3Rl eHQvVGV4dFV0aWwuaApAQCAtNDcsMTAgKzQ3LDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBJbmxp bmVMYXlvdXRVbml0IHdpZHRoKGNvbnN0IElubGluZVRleHRJdGVtJiwgY29uc3QgRm9udENhc2Nh ZGUmLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7CiAgICAgc3RhdGljIElu bGluZUxheW91dFVuaXQgd2lkdGgoY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBjb25zdCBGb250Q2Fz Y2FkZSYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRl bnRMb2dpY2FsTGVmdCk7CiAKLSAgICBlbnVtIGNsYXNzIFVzZVRyYWlsaW5nV2hpdGVzcGFjZU1l YXN1cmluZ09wdGltaXphdGlvbiA6IHVpbnQ4X3QgeyBZZXMsIE5vIH07Ci0gICAgc3RhdGljIElu bGluZUxheW91dFVuaXQgd2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYsIGNvbnN0IEZvbnRDYXNj YWRlJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQgY29udGVu dExvZ2ljYWxMZWZ0LCBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRpbWl6YXRpb24g PSBVc2VUcmFpbGluZ1doaXRlc3BhY2VNZWFzdXJpbmdPcHRpbWl6YXRpb246Olllcyk7Ci0gICAg c3RhdGljIElubGluZUxheW91dFVuaXQgc3BhY2VXaWR0aChjb25zdCBGb250Q2FzY2FkZSYpOwot CiAgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgoY29u c3QgSW5saW5lVGV4dEJveCYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgc2l6ZV90IHN0YXJ0UG9zaXRp b24sIHNpemVfdCBlbmRQb3NpdGlvbik7CiAKICAgICB1c2luZyBGYWxsYmFja0ZvbnRMaXN0ID0g SGFzaFNldDxjb25zdCBGb250Kj47Cg==