217076 2020-09-28 19:12:46 -0700 [GPU Process] Remove FontHandle 2020-09-30 00:02:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield annulen cdumez ews-watchlist gyuyoung.kim japhet ryuan.choi sergio simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1692790 0 mmaxfield 2020-09-28 19:12:46 -0700 [GPU Process] Remove FontHandle 1692793 1 409949 mmaxfield 2020-09-28 19:16:04 -0700 Created attachment 409949 Patch 1692799 2 409949 wenson_hsieh 2020-09-28 19:29:23 -0700 Comment on attachment 409949 Patch r=mews It looks like you’ll need to add CachedFont.h to WebCore’s Headers.cmake to fix the GTK/WPE builds. 1692807 3 409956 mmaxfield 2020-09-28 19:51:01 -0700 Created attachment 409956 Patch for committing 1692839 4 409967 mmaxfield 2020-09-28 23:04:20 -0700 Created attachment 409967 Patch for committing 1692851 5 409970 mmaxfield 2020-09-29 01:07:54 -0700 Created attachment 409970 Patch for committing 1692858 6 409973 mmaxfield 2020-09-29 01:21:53 -0700 Created attachment 409973 Patch for committing 1693292 7 webkit-bug-importer 2020-09-29 20:08:11 -0700 <rdar://problem/69774925> 1693308 8 410093 mmaxfield 2020-09-29 21:36:17 -0700 Created attachment 410093 Patch for committing 1693316 9 ews-feeder 2020-09-30 00:02:13 -0700 Committed r267782: <https://trac.webkit.org/changeset/267782> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410093. 409949 2020-09-28 19:16:04 -0700 2020-09-28 19:29:23 -0700 Patch bug-217076-20200928191603.patch text/plain 21592 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uY2Q5MzIzYjg5MGRmMzkzNGNmN2ZkM2Y3N2UxM2I2 NmRmYzZhYmY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIG9ubHkgcmVhc29uIEZvbnRIYW5kbGUgZXhpc3RzIGlzIHRvIGJl IGFuIGludGVybmFsbHktbnVsbGFibGUgd3JhcHBlciBhcm91bmQgV2ViQ29yZTo6Rm9udC4KKyAg ICAgICAgSG93ZXZlciwgdGhpcyBjb2RlcGF0aCBpcyBvbmx5IGV2ZXIgaW52b2tlZCB3aXRoIG5v bi1udWxsIGZvbnRzLCBzbyB0aGVyZSdzIG5vIHBvaW50IGluIGhhdmluZworICAgICAgICB0aGlz IHdyYXBwZXIuIFRoaXMgcGF0Y2ggcmVwbGFjZXMgaXQgd2l0aCBqdXN0IFJlZjxGb250Pi4KKwor ICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2Uu CisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAg ICogbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9Gb250LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRIYW5kbGU6OkZvbnRIYW5kbGUpOiBE ZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmVuY29kZSBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6ZGVjb2RlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oOgorCiAyMDIw LTA5LTI4ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAg IFtHUFVQXSBPdXQtb2YtYmFuZCBUZXh0VHJhY2tzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ0MWVkYTkyYjFiOGFm MzBlMjZlMmE2ODZhMDRjYjZjMjAwZTFhMGEuLjFmMTljZWFiYTZiYmM3Nzg5MTI2MzU5ZTcxNzFh YTZjNjliNTZlYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDktMjggIE15bGVz IEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nl c3NdIFJlbW92ZSBGb250SGFuZGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTcwNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5t bToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9y bURhdGEpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxGb250Pj46OmRlY29kZVBs YXRmb3JtRGF0YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8Rm9udEhhbmRsZT46OmVu Y29kZVBsYXRmb3JtRGF0YSk6IERlbGV0ZWQuCisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8 Rm9udEhhbmRsZT46OmRlY29kZVBsYXRmb3JtRGF0YSk6IERlbGV0ZWQuCisgICAgICAgICogU2hh cmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29k ZXI8UmVmPEZvbnQ+Pjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6Y3JlYXRlRm9udCk6CisgICAg ICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlKToKKyAgICAgICAgKElQ Qzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlKTogRGVsZXRlZC4KKyAgICAgICAg KElQQzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlKTogRGVsZXRlZC4KKyAgICAg ICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmg6CisKIDIwMjAtMDktMjggIEVyaWMg Q2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdIE91dC1v Zi1iYW5kIFRleHRUcmFja3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagppbmRleCA3NWY5ZDU1OGE2MjNjZTU2MGIzMWNiMmJmN2M0YmI5YWQ4 ZGU5OTIzLi5hNjJkNjhlMmZlMmEwMmJjZDhlOTc5MjI0MzlhOTY1M2MxNmM0ZTY2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysr IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0z NjQ3LDcgKzM2NDcsNyBAQAogCQlCMkExRjJBQjBDRUYwQUJGMDA0NDJGNkEgLyogU1ZHRm9udEVs ZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIy QTFGMkEyMENFRjBBQkYwMDQ0MkY2QSAvKiBTVkdGb250RWxlbWVudC5oICovOyB9OwogCQlCMkEx RjJBRTBDRUYwQUJGMDA0NDJGNkEgLyogU1ZHR2x5cGhFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCMkExRjJBNTBDRUYwQUJGMDA0NDJGNkEg LyogU1ZHR2x5cGhFbGVtZW50LmggKi87IH07CiAJCUIyQTFGMkIxMENFRjBBQkYwMDQ0MkY2QSAv KiBTVkdNaXNzaW5nR2x5cGhFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBCMkExRjJBODBDRUYwQUJGMDA0NDJGNkEgLyogU1ZHTWlzc2luZ0ds eXBoRWxlbWVudC5oICovOyB9OwotCQlCMkFGRkM3RTBEMDBBNUMxMDAzMDA3NEQgLyogRm9udEN1 c3RvbVBsYXRmb3JtRGF0YS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQjJBRkZDNzYwRDAwQTVDMTAwMzAwNzREIC8qIEZvbnRDdXN0b21QbGF0Zm9ybURh dGEuaCAqLzsgfTsKKwkJQjJBRkZDN0UwRDAwQTVDMTAwMzAwNzREIC8qIEZvbnRDdXN0b21QbGF0 Zm9ybURhdGEuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEIyQUZGQzc2MEQwMEE1QzEwMDMwMDc0RCAvKiBGb250Q3VzdG9tUGxhdGZvcm1EYXRhLmggKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQjJCMUY3MTcw RDAwQ0FBODAwNEFFQTY0IC8qIFBvaW50ZXJFdmVudHNIaXRSdWxlcy5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQjJCMUY3MTUwRDAwQ0FBODAwNEFFQTY0 IC8qIFBvaW50ZXJFdmVudHNIaXRSdWxlcy5oICovOyB9OwogCQlCMkMzREEyNDBEMDA2QzFEMDBF RjZGMjYgLyogQmlkaUNvbnRleHQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEIyQzNEOUYzMEQwMDZDMUQwMEVGNkYyNiAvKiBCaWRpQ29udGV4dC5oICov OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUIyQzNEQTI1 MEQwMDZDMUQwMEVGNkYyNiAvKiBCaWRpUmVzb2x2ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIyQzNEOUY0MEQwMDZDMUQwMEVGNkYyNiAvKiBCaWRp UmVzb2x2ZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9 OwpAQCAtMzg4OSw3ICszODg5LDcgQEAKIAkJQkM2NDY0MEExMUQ3RjMwNDAwNjQ1NUIwIC8qIERP TVN0cmluZ01hcC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkM2NDY0MDgxMUQ3RjMwNDAwNjQ1NUIwIC8qIERPTVN0cmluZ01hcC5oICovOyB9OwogCQlC QzY0NjQxQzExRDdGNDE2MDA2NDU1QjAgLyogRGF0YXNldERPTVN0cmluZ01hcC5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM2NDY0MUExMUQ3RjQxNjAw NjQ1NUIwIC8qIERhdGFzZXRET01TdHJpbmdNYXAuaCAqLzsgfTsKIAkJQkM2NDY0OTgxMUQ4MjM0 OTAwNjQ1NUIwIC8qIEpTRE9NU3RyaW5nTWFwLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBCQzY0NjQ5NjExRDgyMzQ5MDA2NDU1QjAgLyogSlNET01TdHJp bmdNYXAuaCAqLzsgfTsKLQkJQkM2NEI0Q0MwQ0I0Mjk1RDAwNUYyQjYyIC8qIENhY2hlZEZvbnQu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDNjRCNENB MENCNDI5NUQwMDVGMkI2MiAvKiBDYWNoZWRGb250LmggKi87IH07CisJCUJDNjRCNENDMENCNDI5 NUQwMDVGMkI2MiAvKiBDYWNoZWRGb250LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBCQzY0QjRDQTBDQjQyOTVEMDA1RjJCNjIgLyogQ2FjaGVkRm9udC5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUJDNjRC NEQ2MENCNDI5OEEwMDVGMkI2MiAvKiBDU1NGb250RmFjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM2NEI0Q0UwQ0I0Mjk4QTAwNUYyQjYyIC8qIENT U0ZvbnRGYWNlLmggKi87IH07CiAJCUJDNjRCNEQ4MENCNDI5OEEwMDVGMkI2MiAvKiBDU1NGb250 RmFjZVNvdXJjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkM2NEI0RDAwQ0I0Mjk4QTAwNUYyQjYyIC8qIENTU0ZvbnRGYWNlU291cmNlLmggKi87IH07 CiAJCUJDNjRCNERBMENCNDI5OEEwMDVGMkI2MiAvKiBDU1NGb250RmFjZVNyY1ZhbHVlLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzY0QjREMjBDQjQy OThBMDA1RjJCNjIgLyogQ1NTRm9udEZhY2VTcmNWYWx1ZS5oICovOyB9OwpAQCAtMjg0OTUsMTAg KzI4NDk1LDYgQEAKIAkJRTRGQjRCMUUyMzk1MzU2RjAwM0MzMzZBIC8qIGludGVncmF0aW9uICov ID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKLQkJCQlFNEE2NjRDNzI1 MjFCNzc5MDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5jcHAgKi8sCi0J CQkJRTRBNjY0QzYyNTIxQjc3ODAwNzA4MURDIC8qIExheW91dEludGVncmF0aW9uUnVuSXRlcmF0 b3IuaCAqLywKLQkJCQlFNEE2NjRDNTI1MjFCNzc4MDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRp b25SdW5JdGVyYXRvckxlZ2FjeVBhdGguaCAqLywKLQkJCQlFNEE2NjRDNDI1MjFCNzc3MDA3MDgx REMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaCAqLywKIAkJCQlF NDE4MDI1NjIzRDQ1NEI1MDBGRkIwNzEgLyogTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCAq LywKIAkJCQlFNDE4MDI1MzIzRDQ1NDlBMDBGRkIwNzEgLyogTGF5b3V0SW50ZWdyYXRpb25Cb3hU cmVlLmggKi8sCiAJCQkJRTQwM0I3OUYyNTFCMTE4QjAwMTlFODAwIC8qIExheW91dEludGVncmF0 aW9uQ292ZXJhZ2UuY3BwICovLApAQCAtMjg1MDcsNiArMjg1MDMsMTAgQEAKIAkJCQlFNEFCQUJE QjIzNjA4OEZEMDBGQTQzNDUgLyogTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmggKi8sCiAJ CQkJRTQzMTJBQjUyNEIzMjY1NjAwNjc4MzQ5IC8qIExheW91dEludGVncmF0aW9uUGFnaW5hdGlv bi5jcHAgKi8sCiAJCQkJRTQzMTJBQjcyNEIzMjY1NjAwNjc4MzQ5IC8qIExheW91dEludGVncmF0 aW9uUGFnaW5hdGlvbi5oICovLAorCQkJCUU0QTY2NEM3MjUyMUI3NzkwMDcwODFEQyAvKiBMYXlv dXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmNwcCAqLywKKwkJCQlFNEE2NjRDNjI1MjFCNzc4MDA3 MDgxREMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5oICovLAorCQkJCUU0QTY2NEM1 MjUyMUI3NzgwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTGVnYWN5UGF0 aC5oICovLAorCQkJCUU0QTY2NEM0MjUyMUI3NzcwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlv blJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oICovLAogCQkJKTsKIAkJCXBhdGggPSBpbnRlZ3JhdGlv bjsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CkBAIC0zMjQ0Nyw3ICszMjQ0Nyw2IEBACiAJ CQkJMDc5NjlEQjAxN0QxNDE1MTAwN0ZGODQyIC8qIEpTUlRDRFRNRlNlbmRlci5oIGluIEhlYWRl cnMgKi8sCiAJCQkJMDc5NjlEQjIxN0QxNDE1MTAwN0ZGODQyIC8qIEpTUlRDRFRNRlRvbmVDaGFu Z2VFdmVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMDc5NjlEQjYxN0QxNDE1MTAwN0ZGODQyIC8q IEpTUlRDSWNlQ2FuZGlkYXRlLmggaW4gSGVhZGVycyAqLywKLQkJCQlFNEE2NjRDRTI1MjFENEM5 MDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaCBpbiBI ZWFkZXJzICovLAogCQkJCTMxNkRDQjRDMUU3OTEwQTYwMDFCNUY4NyAvKiBKU1JUQ0ljZUNvbm5l Y3Rpb25TdGF0ZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMzE2RENCNEUxRTc5MTBBNjAwMUI1Rjg3 IC8qIEpTUlRDSWNlR2F0aGVyaW5nU3RhdGUuaCBpbiBIZWFkZXJzICovLAogCQkJCTA3Mzc5NEVD MTlFRTM0MUUwMEU1QTA0NSAvKiBKU1JUQ0ljZVNlcnZlci5oIGluIEhlYWRlcnMgKi8sCkBAIC0z MjQ5Myw3ICszMjQ5Miw2IEBACiAJCQkJQjU5REQ2QTUxMTkwMkE2MjAwN0U5Njg0IC8qIEpTU1FM U3RhdGVtZW50Q2FsbGJhY2suaCBpbiBIZWFkZXJzICovLAogCQkJCUI1OURENkE5MTE5MDJBNzEw MDdFOTY4NCAvKiBKU1NRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suaCBpbiBIZWFkZXJzICovLAog CQkJCUJDODI0MzJBMEQwQ0U4QTIwMDQ2MEM4RiAvKiBKU1NRTFRyYW5zYWN0aW9uLmggaW4gSGVh ZGVycyAqLywKLQkJCQlFNEE2NjRDQzI1MjFENEFGMDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRp b25SdW5JdGVyYXRvci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQjU5REQ2OUQxMTkwMkE0MjAwN0U5 Njg0IC8qIEpTU1FMVHJhbnNhY3Rpb25DYWxsYmFjay5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQjU5 REQ2QTExMTkwMkE1MjAwN0U5Njg0IC8qIEpTU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLmgg aW4gSGVhZGVycyAqLywKIAkJCQlBODY2MjlEMzA5REEyQjQ4MDA5NjMzQTcgLyogSlNTdGF0aWNS YW5nZS5oIGluIEhlYWRlcnMgKi8sCkBAIC0zMjc4NSw2ICszMjc4Myw5IEBACiAJCQkJRTQwM0I3 QTIyNTFCMTE5MzAwMTlFODAwIC8qIExheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaCBpbiBIZWFk ZXJzICovLAogCQkJCUU0QUJBQkREMjM2MDg4RkUwMEZBNDM0NSAvKiBMYXlvdXRJbnRlZ3JhdGlv bkxpbmVMYXlvdXQuaCBpbiBIZWFkZXJzICovLAogCQkJCUU0MDNCN0EzMjUxQjExQzEwMDE5RTgw MCAvKiBMYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uaCBpbiBIZWFkZXJzICovLAorCQkJCUU0 QTY2NENDMjUyMUQ0QUYwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmgg aW4gSGVhZGVycyAqLywKKwkJCQlFNEE2NjRDRjI1MjFENEUyMDA3MDgxREMgLyogTGF5b3V0SW50 ZWdyYXRpb25SdW5JdGVyYXRvckxlZ2FjeVBhdGguaCBpbiBIZWFkZXJzICovLAorCQkJCUU0QTY2 NENFMjUyMUQ0QzkwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJu UGF0aC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMTEzMTBDRjQyMEJBNEEzRDAwNjVBOEQwIC8qIExh eW91dEl0ZXJhdG9yLmggaW4gSGVhZGVycyAqLywKIAkJCQk2RkZBNEMwMTIzRjJGRUQ5MDA3RTRF QkMgLyogTGF5b3V0TGluZUJyZWFrQm94LmggaW4gSGVhZGVycyAqLywKIAkJCQk5MzFENzJGNjE1 RkU2OTUzMDBDNEMwN0UgLyogTGF5b3V0TWlsZXN0b25lLmggaW4gSGVhZGVycyAqLywKQEAgLTMy OTYzLDcgKzMyOTY0LDYgQEAKIAkJCQlDOTZGNUVDODFCNTg3MjI2MDA5MUVBOUQgLyogTWVkaWFT ZXNzaW9uSW50ZXJydXB0aW9uUHJvdmlkZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUM5NkY1RUM1 MUI1ODcyMjYwMDkxRUE5RCAvKiBNZWRpYVNlc3Npb25JbnRlcnJ1cHRpb25Qcm92aWRlck1hYy5o IGluIEhlYWRlcnMgKi8sCiAJCQkJQzkwRjY1NTYxQjIyNTNCRTAwMjE2M0ExIC8qIE1lZGlhU2Vz c2lvbk1hbmFnZXIuaCBpbiBIZWFkZXJzICovLAotCQkJCUU0QTY2NENGMjUyMUQ0RTIwMDcwODFE QyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTGVnYWN5UGF0aC5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJNDE3RjdBRUYyMTM5QkY2RjAwRkJBN0VDIC8qIE1lZGlhU2Vzc2lvbk1hbmFnZXJD b2NvYS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMDc2MzhBOTkxODg0NDg3MjAwRTE1QTFCIC8qIE1l ZGlhU2Vzc2lvbk1hbmFnZXJJT1MuaCBpbiBIZWFkZXJzICovLAogCQkJCUM5RDg1MUYwMUIzOURD NzgwMDg1MDYyRSAvKiBNZWRpYVNlc3Npb25NZXRhZGF0YS5oIGluIEhlYWRlcnMgKi8sCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuaAppbmRleCA2MjY3Nzg4ZjE3ZTVlYjQy MGE1OTQ0ODg0YzQ0NWEzMGEwN2Y5ZjVjLi4zZDNkZDA0ZGQwMjhlMmRjZDI1MTA4MzgxYmQ2ZTNj MDk5MGRjNzY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk Rm9udC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmgKQEAg LTUyLDggKzUyLDggQEAgcHVibGljOgogICAgIGJvb2wgc3RpbGxOZWVkc0xvYWQoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiAhbV9sb2FkSW5pdGlhdGVkOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wg ZW5zdXJlQ3VzdG9tRm9udERhdGEoY29uc3QgQXRvbVN0cmluZyYgcmVtb3RlVVJJKTsKLSAgICBz dGF0aWMgc3RkOjp1bmlxdWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+IGNyZWF0ZUN1c3Rv bUZvbnREYXRhKFNoYXJlZEJ1ZmZlciYsIGNvbnN0IFN0cmluZyYgaXRlbUluQ29sbGVjdGlvbiwg Ym9vbCYgd3JhcHBpbmcpOwotICAgIHN0YXRpYyBGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0 YUZyb21DdXN0b21EYXRhKEZvbnRDdXN0b21QbGF0Zm9ybURhdGEmLCBjb25zdCBGb250RGVzY3Jp cHRpb24mLCBib29sIGJvbGQsIGJvb2wgaXRhbGljLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdz JiwgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFiaWxpdGllcyk7CisgICAgV0VCQ09SRV9FWFBP UlQgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxGb250Q3VzdG9tUGxhdGZvcm1EYXRhPiBjcmVhdGVD dXN0b21Gb250RGF0YShTaGFyZWRCdWZmZXImLCBjb25zdCBTdHJpbmcmIGl0ZW1JbkNvbGxlY3Rp b24sIGJvb2wmIHdyYXBwaW5nKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgRm9udFBsYXRm b3JtRGF0YSBwbGF0Zm9ybURhdGFGcm9tQ3VzdG9tRGF0YShGb250Q3VzdG9tUGxhdGZvcm1EYXRh JiwgY29uc3QgRm9udERlc2NyaXB0aW9uJiwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgY29uc3Qg Rm9udEZlYXR1cmVTZXR0aW5ncyYsIEZvbnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmlsaXRpZXMp OwogCiAgICAgdmlydHVhbCBSZWZQdHI8Rm9udD4gY3JlYXRlRm9udChjb25zdCBGb250RGVzY3Jp cHRpb24mLCBjb25zdCBBdG9tU3RyaW5nJiByZW1vdGVVUkksIGJvb2wgc3ludGhldGljQm9sZCwg Ym9vbCBzeW50aGV0aWNJdGFsaWMsIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MmLCBGb250U2Vs ZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250LmNwcAppbmRleCBiOWRkNzExYTI5MzZiZGIwYzM2OWYwOGNlOTA3NThlZWQ0 ZDFkN2NiLi40MmI2ZWQ4OTNmM2E4MzE3OWUyODUwY2EwODYxMjYzNGIxOTY0ZGE2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApAQCAtNzExLDEzICs3MTEsNCBA QCB2b2lkIEZvbnQ6OnNldEZvbnRGYWNlRGF0YShSZWZQdHI8U2hhcmVkQnVmZmVyPiYmIGZvbnRG YWNlRGF0YSkKICAgICBtX2ZvbnRGYWNlRGF0YSA9IFdURk1vdmUoZm9udEZhY2VEYXRhKTsKIH0K IAotRm9udEhhbmRsZTo6Rm9udEhhbmRsZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0 YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9udFNpemUsIGJvb2wgc3ludGhldGljQm9s ZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCi17Ci0gICAgYm9vbCB3cmFwcGluZzsKLSAgICBhdXRv IGN1c3RvbUZvbnREYXRhID0gQ2FjaGVkRm9udDo6Y3JlYXRlQ3VzdG9tRm9udERhdGEoZm9udEZh Y2VEYXRhLmdldCgpLCB7IH0sIHdyYXBwaW5nKTsKLSAgICBGb250RGVzY3JpcHRpb24gZGVzY3Jp cHRpb247Ci0gICAgZGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKGZvbnRTaXplKTsKLSAgICBm b250ID0gRm9udDo6Y3JlYXRlKENhY2hlZEZvbnQ6OnBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRh KCpjdXN0b21Gb250RGF0YSwgZGVzY3JpcHRpb24sIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0 YWxpYywgeyB9LCB7IH0pLCBvcmlnaW4pOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgKaW5kZXggNzc5MzNhNjgwYzY3NDA4 Yjc4N2E1NjdjZTk4NDcxZjJhZWJjYjc4NS4uZjhhOTYwZTcwOTVhNzk2N2RmZjExZGM0YjQ4NjE3 YmU5MDMxMzdhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaApAQCAt MzI4LDE0ICszMjgsNiBAQCBwcml2YXRlOgogI2VuZGlmCiB9OwogCi1jbGFzcyBGb250SGFuZGxl IHsKLXB1YmxpYzoKLSAgICBGb250SGFuZGxlKCkgPSBkZWZhdWx0OwotICAgIFdFQkNPUkVfRVhQ T1JUIEZvbnRIYW5kbGUoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBmb250RmFjZURhdGEsIEZvbnQ6Ok9y aWdpbiwgZmxvYXQgZm9udFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJ dGFsaWMpOwotCi0gICAgUmVmUHRyPEZvbnQ+IGZvbnQ7Ci19OwotCiAjaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKIGJvb2wgZm9udEZhbWlseVNob3VsZE5vdEJlVXNlZEZvckFyYWJpYyhDRlN0cmlu Z1JlZik7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCmluZGV4IGI0NWU3 OTc3MjU4Y2U0Y2FjMTVhYTc2N2I5M2I2ZWZkYjI0OGU2ZWQuLjVhMjI3NTllMTM5ZTFhOTViM2Nm NGMwZGM4MTc3ZGE1ZDlkYjg1OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaApA QCAtMTA5Myw5ICsxMDkzLDcgQEAgcHJpdmF0ZToKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2 b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIEZv bnRIYW5kbGUgaGFuZGxlOwotICAgIGhhbmRsZS5mb250ID0gbV9mb250LnB0cigpOwotICAgIGVu Y29kZXIgPDwgaGFuZGxlOworICAgIGVuY29kZXIgPDwgbV9mb250OwogICAgIGVuY29kZXIgPDwg bV9nbHlwaHM7CiAgICAgZW5jb2RlciA8PCBtX2FkdmFuY2VzOwogICAgIGVuY29kZXIgPDwgbV9i bG9ja0xvY2F0aW9uOwpAQCAtMTEwNiw5ICsxMTA0LDkgQEAgdm9pZCBEcmF3R2x5cGhzOjplbmNv ZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+CiBPcHRp b25hbDxSZWY8RHJhd0dseXBocz4+IERyYXdHbHlwaHM6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVy KQogewotICAgIE9wdGlvbmFsPEZvbnRIYW5kbGU+IGhhbmRsZTsKLSAgICBkZWNvZGVyID4+IGhh bmRsZTsKLSAgICBpZiAoIWhhbmRsZSB8fCAhaGFuZGxlLT5mb250KQorICAgIE9wdGlvbmFsPFJl ZjxGb250Pj4gZm9udDsKKyAgICBkZWNvZGVyID4+IGZvbnQ7CisgICAgaWYgKCFmb250KQogICAg ICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgT3B0aW9uYWw8VmVjdG9yPEdseXBoQnVm ZmVyR2x5cGgsIDEyOD4+IGdseXBoczsKQEAgLTExMzksNyArMTEzNyw3IEBAIE9wdGlvbmFsPFJl ZjxEcmF3R2x5cGhzPj4gRHJhd0dseXBoczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiAgICAg aWYgKCFzbW9vdGhpbmdNb2RlKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAg cmV0dXJuIERyYXdHbHlwaHM6OmNyZWF0ZShoYW5kbGUtPmZvbnQucmVsZWFzZU5vbk51bGwoKSwg V1RGTW92ZSgqZ2x5cGhzKSwgV1RGTW92ZSgqYWR2YW5jZXMpLCAqYmxvY2tMb2NhdGlvbiwgKmxv Y2FsQW5jaG9yLCAqc21vb3RoaW5nTW9kZSk7CisgICAgcmV0dXJuIERyYXdHbHlwaHM6OmNyZWF0 ZShmb250LT5nZXQoKSwgV1RGTW92ZSgqZ2x5cGhzKSwgV1RGTW92ZSgqYWR2YW5jZXMpLCAqYmxv Y2tMb2NhdGlvbiwgKmxvY2FsQW5jaG9yLCAqc21vb3RoaW5nTW9kZSk7CiB9CiAKIGNsYXNzIERy YXdJbWFnZSA6IHB1YmxpYyBEcmF3aW5nSXRlbSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaApp bmRleCA2MDc4ZTI1ZmExZDgyYmNlYzliNGNjN2JjNzJlNWU3ZjI4ZWE3MGFlLi45NmVjYWUyMjc3 ODQwMTgwNDFjOTdhY2IxOGQ4OTVlZjM1NDg1Zjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRh LmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKLSAgICB+Rm9udEN1 c3RvbVBsYXRmb3JtRGF0YSgpOworICAgIFdFQkNPUkVfRVhQT1JUIH5Gb250Q3VzdG9tUGxhdGZv cm1EYXRhKCk7CiAKICAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEoY29uc3Qg Rm9udERlc2NyaXB0aW9uJiwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgY29uc3QgRm9udEZlYXR1 cmVTZXR0aW5ncyYgZm9udEZhY2VGZWF0dXJlcywgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFi aWxpdGllcyBmb250RmFjZUNhcGFiaWxpdGllcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNlL1dl YktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXggZGVl MDMyMWJhYzBjNGU2YWY1MzIzNTRkOGZjYTlhODRiNTgxZDM4ZC4uNmRlNWRjYzE0NjY0YzFkZTYy NjM3YzZmN2QxNzZiYTgxMjA2MjZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv Q29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwNywyOSArNTA3 LDI4IEBAIE9wdGlvbmFsPEZvbnRBdHRyaWJ1dGVzPiBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZv bnRBdHRyaWJ1dGVzPjo6ZGVjb2RlUGxhdGZvcm1ECiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9 CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVu Y29kZXImIGVuY29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRsZSkKK3ZvaWQgQXJndW1lbnRD b2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29u c3QgUmVmPFdlYkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGF1dG8gY3RGb250ID0gaGFuZGxl LmZvbnQgJiYgIWhhbmRsZS5mb250LT5mb250RmFjZURhdGEoKSA/IGhhbmRsZS5mb250LT5nZXRD VEZvbnQoKSA6IG5pbDsKLSAgICBlbmNvZGVyIDw8ICEhY3RGb250OworICAgIGF1dG8gY3RGb250 ID0gIWZvbnQtPmZvbnRGYWNlRGF0YSgpID8gZm9udC0+Z2V0Q1RGb250KCkgOiBuaWw7CisgICAg ZW5jb2RlciA8PCBzdGF0aWNfY2FzdDxib29sPihjdEZvbnQpOwogICAgIGlmIChjdEZvbnQpCiAg ICAgICAgIGVuY29kZXIgPDwgKF9fYnJpZGdlIENvY29hRm9udCAqKWN0Rm9udDsKIH0KIAotYm9v bCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYg ZGVjb2RlciwgRm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVu dENvZGVyPFJlZjxGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBP cHRpb25hbDxSZWY8V2ViQ29yZTo6Rm9udD4+JiYgZXhpc3RpbmdGb250KQogewogICAgIGJvb2wg aGFzUGxhdGZvcm1Gb250OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzUGxhdGZvcm1Gb250 KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owog CiAgICAgaWYgKCFoYXNQbGF0Zm9ybUZvbnQpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICByZXR1cm4gV1RGTW92ZShleGlzdGluZ0ZvbnQpOwogCiAgICAgUmV0YWluUHRyPENvY29hRm9u dD4gZm9udDsKICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGZvbnQpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBoYW5kbGUu Zm9udCA9IEZvbnQ6OmNyZWF0ZSh7IChfX2JyaWRnZSBDVEZvbnRSZWYpZm9udC5nZXQoKSwgc3Rh dGljX2Nhc3Q8ZmxvYXQ+KFtmb250IHBvaW50U2l6ZV0pIH0pOwotICAgIHJldHVybiB0cnVlOwor ICAgIHJldHVybiBGb250OjpjcmVhdGUoeyAoX19icmlkZ2UgQ1RGb250UmVmKWZvbnQuZ2V0KCks IHN0YXRpY19jYXN0PGZsb2F0PihbZm9udCBwb2ludFNpemVdKSB9KTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgSVBDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1l bnRDb2RlcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJz LmNwcAppbmRleCA3MTI3Zjk5YWJlNThhMWRjMzQyOTlhMjBmNTBkYzg5YmQ2ZWIzMGQ5Li5iNTFk OWFiMDMwMGVjMjU4YzZjMDVhNDYyYzUwNGZkYzM1ZmRjYjFlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNp bmNsdWRlIDxXZWJDb3JlL0Jsb2JQYXJ0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9DYWNoZVF1ZXJ5 T3B0aW9ucy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ2FjaGVTdG9yYWdlQ29ubmVjdGlvbi5oPgor I2luY2x1ZGUgPFdlYkNvcmUvQ2FjaGVkRm9udC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ2VydGlm aWNhdGVJbmZvLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Db21wb3NpdGlvblVuZGVybGluZS5oPgog I2luY2x1ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbC5oPgpAQCAtNTIsNiArNTMsNyBAQAogI2luY2x1 ZGUgPFdlYkNvcmUvRmlsdGVyT3BlcmF0aW9ucy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9udC5o PgogI2luY2x1ZGUgPFdlYkNvcmUvRm9udEF0dHJpYnV0ZXMuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29u dGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NMYXllci5oPgogI2luY2x1ZGUgPFdl YkNvcmUvSURCR2V0UmVzdWx0Lmg+CkBAIC0xMTgwLDY5ICsxMTgyLDY3IEBAIGJvb2wgQXJndW1l bnRDb2RlcjxOYXRpdmVJbWFnZUhhbmRsZT46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBOYXRp dmVJbWFnZUhhbmRsCiAgICAgcmV0dXJuIGRlY29kZU9wdGlvbmFsTmF0aXZlSW1hZ2UoZGVjb2Rl ciwgaW1hZ2VIYW5kbGUuaW1hZ2UpOwogfQogCi12b2lkIEFyZ3VtZW50Q29kZXI8Rm9udEhhbmRs ZT46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBGb250SGFuZGxlJiBoYW5kbGUpCit2 b2lkIEFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNv bnN0IFJlZjxXZWJDb3JlOjpGb250PiYgZm9udCkKIHsKLSAgICBlbmNvZGVyIDw8ICEhaGFuZGxl LmZvbnQ7Ci0gICAgaWYgKCFoYW5kbGUuZm9udCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0 byogZm9udEZhY2VEYXRhID0gaGFuZGxlLmZvbnQtPmZvbnRGYWNlRGF0YSgpOwotICAgIGVuY29k ZXIgPDwgISFmb250RmFjZURhdGE7CisgICAgYXV0byogZm9udEZhY2VEYXRhID0gZm9udC0+Zm9u dEZhY2VEYXRhKCk7CisgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDxib29sPihmb250RmFjZURh dGEpOwogICAgIGlmIChmb250RmFjZURhdGEpIHsKICAgICAgICAgZW5jb2RlU2hhcmVkQnVmZmVy KGVuY29kZXIsIGZvbnRGYWNlRGF0YSk7Ci0gICAgICAgIGF1dG8mIGRhdGEgPSBoYW5kbGUuZm9u dC0+cGxhdGZvcm1EYXRhKCk7CisgICAgICAgIGF1dG8mIGRhdGEgPSBmb250LT5wbGF0Zm9ybURh dGEoKTsKICAgICAgICAgZW5jb2RlciA8PCBkYXRhLnNpemUoKTsKICAgICAgICAgZW5jb2RlciA8 PCBkYXRhLnN5bnRoZXRpY0JvbGQoKTsKICAgICAgICAgZW5jb2RlciA8PCBkYXRhLnN5bnRoZXRp Y09ibGlxdWUoKTsKICAgICB9CiAKLSAgICBlbmNvZGVQbGF0Zm9ybURhdGEoZW5jb2RlciwgaGFu ZGxlKTsKKyAgICBlbmNvZGVQbGF0Zm9ybURhdGEoZW5jb2RlciwgZm9udCk7CiB9CiAKLWJvb2wg QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIEZvbnRI YW5kbGUmIGhhbmRsZSkKK3N0YXRpYyBSZWY8Rm9udD4gY3JlYXRlRm9udChSZWY8U2hhcmVkQnVm ZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9udFNpemUs IGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCiB7Ci0gICAgT3B0aW9u YWw8Ym9vbD4gaGFzRm9udDsKLSAgICBkZWNvZGVyID4+IGhhc0ZvbnQ7Ci0gICAgaWYgKCFoYXNG b250Lmhhc1ZhbHVlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmICghaGFzRm9u dC52YWx1ZSgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBib29sIHdyYXBwaW5nOworICAg IGF1dG8gY3VzdG9tRm9udERhdGEgPSBDYWNoZWRGb250OjpjcmVhdGVDdXN0b21Gb250RGF0YShm b250RmFjZURhdGEuZ2V0KCksIHsgfSwgd3JhcHBpbmcpOworICAgIEZvbnREZXNjcmlwdGlvbiBk ZXNjcmlwdGlvbjsKKyAgICBkZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZm9udFNpemUpOwor ICAgIHJldHVybiBGb250OjpjcmVhdGUoQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3Rv bURhdGEoKmN1c3RvbUZvbnREYXRhLCBkZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCB7IH0sIHsgfSksIG9yaWdpbik7Cit9CiAKK09wdGlvbmFsPFJlZjxGb250Pj4g QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKK3sKICAg ICBPcHRpb25hbDxib29sPiBoYXNGb250RmFjZURhdGE7CiAgICAgZGVjb2RlciA+PiBoYXNGb250 RmFjZURhdGE7CiAgICAgaWYgKCFoYXNGb250RmFjZURhdGEuaGFzVmFsdWUoKSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCisgICAgT3B0aW9u YWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiByZXN1bHQ7CiAgICAgaWYgKGhhc0ZvbnRGYWNlRGF0YS52 YWx1ZSgpKSB7CiAgICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGZvbnRGYWNlRGF0YTsKICAg ICAgICAgaWYgKCFkZWNvZGVTaGFyZWRCdWZmZXIoZGVjb2RlciwgZm9udEZhY2VEYXRhKSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 CiAKICAgICAgICAgaWYgKCFmb250RmFjZURhdGEpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGZs b2F0PiBmb250U2l6ZTsKICAgICAgICAgZGVjb2RlciA+PiBmb250U2l6ZTsKICAgICAgICAgaWYg KCFmb250U2l6ZSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAgT3B0aW9uYWw8Ym9vbD4gc3ludGhldGljQm9sZDsK ICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNCb2xkOwogICAgICAgICBpZiAoIXN5bnRoZXRp Y0JvbGQpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGJvb2w+IHN5bnRoZXRpY0l0YWxpYzsKICAg ICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNJdGFsaWM7CiAgICAgICAgIGlmICghc3ludGhldGlj SXRhbGljKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKIAogICAgICAgICBGb250RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CiAgICAg ICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZSgqZm9udFNpemUpOwotICAgICAgICBoYW5k bGUgPSB7IGZvbnRGYWNlRGF0YS5yZWxlYXNlTm9uTnVsbCgpLCBGb250OjpPcmlnaW46OlJlbW90 ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9sZCwgKnN5bnRoZXRpY0l0YWxpYyB9OworICAgICAg ICByZXN1bHQgPSBjcmVhdGVGb250KGZvbnRGYWNlRGF0YS5yZWxlYXNlTm9uTnVsbCgpLCBGb250 OjpPcmlnaW46OlJlbW90ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9sZCwgKnN5bnRoZXRpY0l0 YWxpYyk7CiAgICAgfQogCi0gICAgcmV0dXJuIGRlY29kZVBsYXRmb3JtRGF0YShkZWNvZGVyLCBo YW5kbGUpOworICAgIHJldHVybiBkZWNvZGVQbGF0Zm9ybURhdGEoZGVjb2RlciwgV1RGTW92ZShy ZXN1bHQpKTsKIH0KIAogdm9pZCBBcmd1bWVudENvZGVyPEN1cnNvcj46OmVuY29kZShFbmNvZGVy JiBlbmNvZGVyLCBjb25zdCBDdXJzb3ImIGN1cnNvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKaW5kZXggYTlmODZkMjhmODg4YjVkMGE4YjA4NzQzOTdl OTQ0MTZhNjhiNDYyYy4uMjg2MjE5YzA2NWQ3ZmY5ZmEwNDNmYWFmMWMyZTczN2I0YTZhMTQ3MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgK KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKQEAgLTk0 LDcgKzk0LDcgQEAgY2xhc3MgRmxvYXRSZWN0OwogY2xhc3MgRmxvYXRSb3VuZGVkUmVjdDsKIGNs YXNzIEZsb2F0U2l6ZTsKIGNsYXNzIEZpeGVkUG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzOwot Y2xhc3MgRm9udEhhbmRsZTsKK2NsYXNzIEZvbnQ7CiBjbGFzcyBIVFRQSGVhZGVyTWFwOwogY2xh c3MgSW1hZ2VIYW5kbGU7CiBjbGFzcyBJbnRQb2ludDsKQEAgLTQwNywxMSArNDA3LDExIEBAIHRl bXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Q3Vyc29yPiB7CiAgICAgc3Rh dGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZShEZWNvZGVyJiwgV2ViQ29yZTo6Q3Vy c29yJik7CiB9OwogCi10ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZv bnRIYW5kbGU+IHsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGUoRW5jb2RlciYsIGNvbnN0IFdlYkNv cmU6OkZvbnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJvb2wgZGVj b2RlKERlY29kZXImLCBXZWJDb3JlOjpGb250SGFuZGxlJik7Ci0gICAgc3RhdGljIHZvaWQgZW5j b2RlUGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBXZWJDb3JlOjpGb250SGFuZGxlJik7Ci0g ICAgc3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZVBsYXRmb3JtRGF0YShEZWNv ZGVyJiwgV2ViQ29yZTo6Rm9udEhhbmRsZSYpOwordGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRD b2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGUoRW5jb2Rl ciYsIGNvbnN0IFJlZjxXZWJDb3JlOjpGb250PiYpOworICAgIHN0YXRpYyBPcHRpb25hbDxSZWY8 V2ViQ29yZTo6Rm9udD4+IGRlY29kZShEZWNvZGVyJik7CisgICAgc3RhdGljIHZvaWQgZW5jb2Rl UGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBSZWY8V2ViQ29yZTo6Rm9udD4mKTsKKyAgICBz dGF0aWMgT3B0aW9uYWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiBkZWNvZGVQbGF0Zm9ybURhdGEoRGVj b2RlciYsIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4mJik7CiB9OwogCiB0ZW1wbGF0ZTw+ IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkltYWdlSGFuZGxlPiB7Cg== 409956 2020-09-28 19:51:01 -0700 2020-09-28 23:06:28 -0700 Patch for committing bug-217076-20200928195100.patch text/plain 22105 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uZGQ4ZTIxMzZmNzJiMGFmMDAzMDYyYWIxNTMyZTg5 NzYyMzE4OTMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFRoZSBvbmx5IHJlYXNvbiBGb250SGFuZGxlIGV4aXN0cyBpcyB0byBiZSBh biBpbnRlcm5hbGx5LW51bGxhYmxlIHdyYXBwZXIgYXJvdW5kIFdlYkNvcmU6OkZvbnQuCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgY29kZXBhdGggaXMgb25seSBldmVyIGludm9rZWQgd2l0aCBub24t bnVsbCBmb250cywgc28gdGhlcmUncyBubyBwb2ludCBpbiBoYXZpbmcKKyAgICAgICAgdGhpcyB3 cmFwcGVyLiBUaGlzIHBhdGNoIHJlcGxhY2VzIGl0IHdpdGgganVzdCBSZWY8Rm9udD4uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgor CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250SGFuZGxlOjpGb250SGFuZGxlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjplbmNvZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmRlY29kZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaDoKKwogMjAyMC0w OS0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBb R1BVUF0gT3V0LW9mLWJhbmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0NDFlZGE5MmIxYjhhZjMw ZTI2ZTJhNjg2YTA0Y2I2YzIwMGUxYTBhLi42YjgwMDk2ZjE3ZDAwNGNlMDIwYWRjMmNjMTM4ZjA2 MzYyYjdkNGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTI4ICBNeWxlcyBD LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNz XSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgor CisgICAgICAgICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgor ICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxGb250Pj46OmVuY29kZVBsYXRmb3JtRGF0 YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZv cm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2Rl UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS ZWY8Rm9udD4+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpjcmVhdGVGb250KToKKyAgICAgICAg KElQQzo6QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUpOgorICAgICAgICAoSVBDOjpB cmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoSVBD OjpBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKwogMjAyMC0wOS0yOCAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gT3V0LW9mLWJh bmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvSGVhZGVycy5jbWFrZSBi L1NvdXJjZS9XZWJDb3JlL0hlYWRlcnMuY21ha2UKaW5kZXggN2U4ZDUzNTUxOGIxNTAwZjMzZGRk YjlkMmI3YjIwMDVjMzYxN2M0ZS4uZTkxMTg4YjM5YWFjNzJmMTFiNzkzOTI4NjFmOTc5Y2Q0OGU3 MjhmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvSGVhZGVycy5jbWFrZQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCkBAIC03ODMsNiArNzgzLDcgQEAgc2V0KFdlYkNvcmVf UFJJVkFURV9GUkFNRVdPUktfSEVBREVSUwogICAgIGxvYWRlci9hcmNoaXZlL21odG1sL01IVE1M QXJjaGl2ZS5oCiAKICAgICBsb2FkZXIvY2FjaGUvQ2FjaGVQb2xpY3kuaAorICAgIGxvYWRlci9j YWNoZS9DYWNoZWRGb250LmgKICAgICBsb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuaAogICAgIGxv YWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCiAgICAgbG9hZGVyL2NhY2hlL0NhY2hlZFJh d1Jlc291cmNlQ2xpZW50LmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagppbmRleCA3NWY5ZDU1OGE2MjNjZTU2MGIzMWNiMmJmN2M0YmI5YWQ4 ZGU5OTIzLi5hNjJkNjhlMmZlMmEwMmJjZDhlOTc5MjI0MzlhOTY1M2MxNmM0ZTY2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysr IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0z NjQ3LDcgKzM2NDcsNyBAQAogCQlCMkExRjJBQjBDRUYwQUJGMDA0NDJGNkEgLyogU1ZHRm9udEVs ZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIy QTFGMkEyMENFRjBBQkYwMDQ0MkY2QSAvKiBTVkdGb250RWxlbWVudC5oICovOyB9OwogCQlCMkEx RjJBRTBDRUYwQUJGMDA0NDJGNkEgLyogU1ZHR2x5cGhFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCMkExRjJBNTBDRUYwQUJGMDA0NDJGNkEg LyogU1ZHR2x5cGhFbGVtZW50LmggKi87IH07CiAJCUIyQTFGMkIxMENFRjBBQkYwMDQ0MkY2QSAv KiBTVkdNaXNzaW5nR2x5cGhFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBCMkExRjJBODBDRUYwQUJGMDA0NDJGNkEgLyogU1ZHTWlzc2luZ0ds eXBoRWxlbWVudC5oICovOyB9OwotCQlCMkFGRkM3RTBEMDBBNUMxMDAzMDA3NEQgLyogRm9udEN1 c3RvbVBsYXRmb3JtRGF0YS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQjJBRkZDNzYwRDAwQTVDMTAwMzAwNzREIC8qIEZvbnRDdXN0b21QbGF0Zm9ybURh dGEuaCAqLzsgfTsKKwkJQjJBRkZDN0UwRDAwQTVDMTAwMzAwNzREIC8qIEZvbnRDdXN0b21QbGF0 Zm9ybURhdGEuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEIyQUZGQzc2MEQwMEE1QzEwMDMwMDc0RCAvKiBGb250Q3VzdG9tUGxhdGZvcm1EYXRhLmggKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQjJCMUY3MTcw RDAwQ0FBODAwNEFFQTY0IC8qIFBvaW50ZXJFdmVudHNIaXRSdWxlcy5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQjJCMUY3MTUwRDAwQ0FBODAwNEFFQTY0 IC8qIFBvaW50ZXJFdmVudHNIaXRSdWxlcy5oICovOyB9OwogCQlCMkMzREEyNDBEMDA2QzFEMDBF RjZGMjYgLyogQmlkaUNvbnRleHQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IEIyQzNEOUYzMEQwMDZDMUQwMEVGNkYyNiAvKiBCaWRpQ29udGV4dC5oICov OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUIyQzNEQTI1 MEQwMDZDMUQwMEVGNkYyNiAvKiBCaWRpUmVzb2x2ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIyQzNEOUY0MEQwMDZDMUQwMEVGNkYyNiAvKiBCaWRp UmVzb2x2ZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9 OwpAQCAtMzg4OSw3ICszODg5LDcgQEAKIAkJQkM2NDY0MEExMUQ3RjMwNDAwNjQ1NUIwIC8qIERP TVN0cmluZ01hcC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkM2NDY0MDgxMUQ3RjMwNDAwNjQ1NUIwIC8qIERPTVN0cmluZ01hcC5oICovOyB9OwogCQlC QzY0NjQxQzExRDdGNDE2MDA2NDU1QjAgLyogRGF0YXNldERPTVN0cmluZ01hcC5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM2NDY0MUExMUQ3RjQxNjAw NjQ1NUIwIC8qIERhdGFzZXRET01TdHJpbmdNYXAuaCAqLzsgfTsKIAkJQkM2NDY0OTgxMUQ4MjM0 OTAwNjQ1NUIwIC8qIEpTRE9NU3RyaW5nTWFwLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSBCQzY0NjQ5NjExRDgyMzQ5MDA2NDU1QjAgLyogSlNET01TdHJp bmdNYXAuaCAqLzsgfTsKLQkJQkM2NEI0Q0MwQ0I0Mjk1RDAwNUYyQjYyIC8qIENhY2hlZEZvbnQu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDNjRCNENB MENCNDI5NUQwMDVGMkI2MiAvKiBDYWNoZWRGb250LmggKi87IH07CisJCUJDNjRCNENDMENCNDI5 NUQwMDVGMkI2MiAvKiBDYWNoZWRGb250LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBCQzY0QjRDQTBDQjQyOTVEMDA1RjJCNjIgLyogQ2FjaGVkRm9udC5o ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUJDNjRC NEQ2MENCNDI5OEEwMDVGMkI2MiAvKiBDU1NGb250RmFjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM2NEI0Q0UwQ0I0Mjk4QTAwNUYyQjYyIC8qIENT U0ZvbnRGYWNlLmggKi87IH07CiAJCUJDNjRCNEQ4MENCNDI5OEEwMDVGMkI2MiAvKiBDU1NGb250 RmFjZVNvdXJjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkM2NEI0RDAwQ0I0Mjk4QTAwNUYyQjYyIC8qIENTU0ZvbnRGYWNlU291cmNlLmggKi87IH07 CiAJCUJDNjRCNERBMENCNDI5OEEwMDVGMkI2MiAvKiBDU1NGb250RmFjZVNyY1ZhbHVlLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzY0QjREMjBDQjQy OThBMDA1RjJCNjIgLyogQ1NTRm9udEZhY2VTcmNWYWx1ZS5oICovOyB9OwpAQCAtMjg0OTUsMTAg KzI4NDk1LDYgQEAKIAkJRTRGQjRCMUUyMzk1MzU2RjAwM0MzMzZBIC8qIGludGVncmF0aW9uICov ID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKLQkJCQlFNEE2NjRDNzI1 MjFCNzc5MDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5jcHAgKi8sCi0J CQkJRTRBNjY0QzYyNTIxQjc3ODAwNzA4MURDIC8qIExheW91dEludGVncmF0aW9uUnVuSXRlcmF0 b3IuaCAqLywKLQkJCQlFNEE2NjRDNTI1MjFCNzc4MDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRp b25SdW5JdGVyYXRvckxlZ2FjeVBhdGguaCAqLywKLQkJCQlFNEE2NjRDNDI1MjFCNzc3MDA3MDgx REMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaCAqLywKIAkJCQlF NDE4MDI1NjIzRDQ1NEI1MDBGRkIwNzEgLyogTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCAq LywKIAkJCQlFNDE4MDI1MzIzRDQ1NDlBMDBGRkIwNzEgLyogTGF5b3V0SW50ZWdyYXRpb25Cb3hU cmVlLmggKi8sCiAJCQkJRTQwM0I3OUYyNTFCMTE4QjAwMTlFODAwIC8qIExheW91dEludGVncmF0 aW9uQ292ZXJhZ2UuY3BwICovLApAQCAtMjg1MDcsNiArMjg1MDMsMTAgQEAKIAkJCQlFNEFCQUJE QjIzNjA4OEZEMDBGQTQzNDUgLyogTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmggKi8sCiAJ CQkJRTQzMTJBQjUyNEIzMjY1NjAwNjc4MzQ5IC8qIExheW91dEludGVncmF0aW9uUGFnaW5hdGlv bi5jcHAgKi8sCiAJCQkJRTQzMTJBQjcyNEIzMjY1NjAwNjc4MzQ5IC8qIExheW91dEludGVncmF0 aW9uUGFnaW5hdGlvbi5oICovLAorCQkJCUU0QTY2NEM3MjUyMUI3NzkwMDcwODFEQyAvKiBMYXlv dXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmNwcCAqLywKKwkJCQlFNEE2NjRDNjI1MjFCNzc4MDA3 MDgxREMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvci5oICovLAorCQkJCUU0QTY2NEM1 MjUyMUI3NzgwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTGVnYWN5UGF0 aC5oICovLAorCQkJCUU0QTY2NEM0MjUyMUI3NzcwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlv blJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oICovLAogCQkJKTsKIAkJCXBhdGggPSBpbnRlZ3JhdGlv bjsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7CkBAIC0zMjQ0Nyw3ICszMjQ0Nyw2IEBACiAJ CQkJMDc5NjlEQjAxN0QxNDE1MTAwN0ZGODQyIC8qIEpTUlRDRFRNRlNlbmRlci5oIGluIEhlYWRl cnMgKi8sCiAJCQkJMDc5NjlEQjIxN0QxNDE1MTAwN0ZGODQyIC8qIEpTUlRDRFRNRlRvbmVDaGFu Z2VFdmVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMDc5NjlEQjYxN0QxNDE1MTAwN0ZGODQyIC8q IEpTUlRDSWNlQ2FuZGlkYXRlLmggaW4gSGVhZGVycyAqLywKLQkJCQlFNEE2NjRDRTI1MjFENEM5 MDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaCBpbiBI ZWFkZXJzICovLAogCQkJCTMxNkRDQjRDMUU3OTEwQTYwMDFCNUY4NyAvKiBKU1JUQ0ljZUNvbm5l Y3Rpb25TdGF0ZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMzE2RENCNEUxRTc5MTBBNjAwMUI1Rjg3 IC8qIEpTUlRDSWNlR2F0aGVyaW5nU3RhdGUuaCBpbiBIZWFkZXJzICovLAogCQkJCTA3Mzc5NEVD MTlFRTM0MUUwMEU1QTA0NSAvKiBKU1JUQ0ljZVNlcnZlci5oIGluIEhlYWRlcnMgKi8sCkBAIC0z MjQ5Myw3ICszMjQ5Miw2IEBACiAJCQkJQjU5REQ2QTUxMTkwMkE2MjAwN0U5Njg0IC8qIEpTU1FM U3RhdGVtZW50Q2FsbGJhY2suaCBpbiBIZWFkZXJzICovLAogCQkJCUI1OURENkE5MTE5MDJBNzEw MDdFOTY4NCAvKiBKU1NRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suaCBpbiBIZWFkZXJzICovLAog CQkJCUJDODI0MzJBMEQwQ0U4QTIwMDQ2MEM4RiAvKiBKU1NRTFRyYW5zYWN0aW9uLmggaW4gSGVh ZGVycyAqLywKLQkJCQlFNEE2NjRDQzI1MjFENEFGMDA3MDgxREMgLyogTGF5b3V0SW50ZWdyYXRp b25SdW5JdGVyYXRvci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQjU5REQ2OUQxMTkwMkE0MjAwN0U5 Njg0IC8qIEpTU1FMVHJhbnNhY3Rpb25DYWxsYmFjay5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQjU5 REQ2QTExMTkwMkE1MjAwN0U5Njg0IC8qIEpTU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLmgg aW4gSGVhZGVycyAqLywKIAkJCQlBODY2MjlEMzA5REEyQjQ4MDA5NjMzQTcgLyogSlNTdGF0aWNS YW5nZS5oIGluIEhlYWRlcnMgKi8sCkBAIC0zMjc4NSw2ICszMjc4Myw5IEBACiAJCQkJRTQwM0I3 QTIyNTFCMTE5MzAwMTlFODAwIC8qIExheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaCBpbiBIZWFk ZXJzICovLAogCQkJCUU0QUJBQkREMjM2MDg4RkUwMEZBNDM0NSAvKiBMYXlvdXRJbnRlZ3JhdGlv bkxpbmVMYXlvdXQuaCBpbiBIZWFkZXJzICovLAogCQkJCUU0MDNCN0EzMjUxQjExQzEwMDE5RTgw MCAvKiBMYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uaCBpbiBIZWFkZXJzICovLAorCQkJCUU0 QTY2NENDMjUyMUQ0QUYwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yLmgg aW4gSGVhZGVycyAqLywKKwkJCQlFNEE2NjRDRjI1MjFENEUyMDA3MDgxREMgLyogTGF5b3V0SW50 ZWdyYXRpb25SdW5JdGVyYXRvckxlZ2FjeVBhdGguaCBpbiBIZWFkZXJzICovLAorCQkJCUU0QTY2 NENFMjUyMUQ0QzkwMDcwODFEQyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJu UGF0aC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMTEzMTBDRjQyMEJBNEEzRDAwNjVBOEQwIC8qIExh eW91dEl0ZXJhdG9yLmggaW4gSGVhZGVycyAqLywKIAkJCQk2RkZBNEMwMTIzRjJGRUQ5MDA3RTRF QkMgLyogTGF5b3V0TGluZUJyZWFrQm94LmggaW4gSGVhZGVycyAqLywKIAkJCQk5MzFENzJGNjE1 RkU2OTUzMDBDNEMwN0UgLyogTGF5b3V0TWlsZXN0b25lLmggaW4gSGVhZGVycyAqLywKQEAgLTMy OTYzLDcgKzMyOTY0LDYgQEAKIAkJCQlDOTZGNUVDODFCNTg3MjI2MDA5MUVBOUQgLyogTWVkaWFT ZXNzaW9uSW50ZXJydXB0aW9uUHJvdmlkZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUM5NkY1RUM1 MUI1ODcyMjYwMDkxRUE5RCAvKiBNZWRpYVNlc3Npb25JbnRlcnJ1cHRpb25Qcm92aWRlck1hYy5o IGluIEhlYWRlcnMgKi8sCiAJCQkJQzkwRjY1NTYxQjIyNTNCRTAwMjE2M0ExIC8qIE1lZGlhU2Vz c2lvbk1hbmFnZXIuaCBpbiBIZWFkZXJzICovLAotCQkJCUU0QTY2NENGMjUyMUQ0RTIwMDcwODFE QyAvKiBMYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTGVnYWN5UGF0aC5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJNDE3RjdBRUYyMTM5QkY2RjAwRkJBN0VDIC8qIE1lZGlhU2Vzc2lvbk1hbmFnZXJD b2NvYS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMDc2MzhBOTkxODg0NDg3MjAwRTE1QTFCIC8qIE1l ZGlhU2Vzc2lvbk1hbmFnZXJJT1MuaCBpbiBIZWFkZXJzICovLAogCQkJCUM5RDg1MUYwMUIzOURD NzgwMDg1MDYyRSAvKiBNZWRpYVNlc3Npb25NZXRhZGF0YS5oIGluIEhlYWRlcnMgKi8sCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkRm9udC5oIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEZvbnQuaAppbmRleCA2MjY3Nzg4ZjE3ZTVlYjQy MGE1OTQ0ODg0YzQ0NWEzMGEwN2Y5ZjVjLi4zZDNkZDA0ZGQwMjhlMmRjZDI1MTA4MzgxYmQ2ZTNj MDk5MGRjNzY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk Rm9udC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRGb250LmgKQEAg LTUyLDggKzUyLDggQEAgcHVibGljOgogICAgIGJvb2wgc3RpbGxOZWVkc0xvYWQoKSBjb25zdCBv dmVycmlkZSB7IHJldHVybiAhbV9sb2FkSW5pdGlhdGVkOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wg ZW5zdXJlQ3VzdG9tRm9udERhdGEoY29uc3QgQXRvbVN0cmluZyYgcmVtb3RlVVJJKTsKLSAgICBz dGF0aWMgc3RkOjp1bmlxdWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+IGNyZWF0ZUN1c3Rv bUZvbnREYXRhKFNoYXJlZEJ1ZmZlciYsIGNvbnN0IFN0cmluZyYgaXRlbUluQ29sbGVjdGlvbiwg Ym9vbCYgd3JhcHBpbmcpOwotICAgIHN0YXRpYyBGb250UGxhdGZvcm1EYXRhIHBsYXRmb3JtRGF0 YUZyb21DdXN0b21EYXRhKEZvbnRDdXN0b21QbGF0Zm9ybURhdGEmLCBjb25zdCBGb250RGVzY3Jp cHRpb24mLCBib29sIGJvbGQsIGJvb2wgaXRhbGljLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdz JiwgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFiaWxpdGllcyk7CisgICAgV0VCQ09SRV9FWFBP UlQgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxGb250Q3VzdG9tUGxhdGZvcm1EYXRhPiBjcmVhdGVD dXN0b21Gb250RGF0YShTaGFyZWRCdWZmZXImLCBjb25zdCBTdHJpbmcmIGl0ZW1JbkNvbGxlY3Rp b24sIGJvb2wmIHdyYXBwaW5nKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgRm9udFBsYXRm b3JtRGF0YSBwbGF0Zm9ybURhdGFGcm9tQ3VzdG9tRGF0YShGb250Q3VzdG9tUGxhdGZvcm1EYXRh JiwgY29uc3QgRm9udERlc2NyaXB0aW9uJiwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgY29uc3Qg Rm9udEZlYXR1cmVTZXR0aW5ncyYsIEZvbnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmlsaXRpZXMp OwogCiAgICAgdmlydHVhbCBSZWZQdHI8Rm9udD4gY3JlYXRlRm9udChjb25zdCBGb250RGVzY3Jp cHRpb24mLCBjb25zdCBBdG9tU3RyaW5nJiByZW1vdGVVUkksIGJvb2wgc3ludGhldGljQm9sZCwg Ym9vbCBzeW50aGV0aWNJdGFsaWMsIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MmLCBGb250U2Vs ZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250LmNwcAppbmRleCBiOWRkNzExYTI5MzZiZGIwYzM2OWYwOGNlOTA3NThlZWQ0 ZDFkN2NiLi40MmI2ZWQ4OTNmM2E4MzE3OWUyODUwY2EwODYxMjYzNGIxOTY0ZGE2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApAQCAtNzExLDEzICs3MTEsNCBA QCB2b2lkIEZvbnQ6OnNldEZvbnRGYWNlRGF0YShSZWZQdHI8U2hhcmVkQnVmZmVyPiYmIGZvbnRG YWNlRGF0YSkKICAgICBtX2ZvbnRGYWNlRGF0YSA9IFdURk1vdmUoZm9udEZhY2VEYXRhKTsKIH0K IAotRm9udEhhbmRsZTo6Rm9udEhhbmRsZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0 YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9udFNpemUsIGJvb2wgc3ludGhldGljQm9s ZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCi17Ci0gICAgYm9vbCB3cmFwcGluZzsKLSAgICBhdXRv IGN1c3RvbUZvbnREYXRhID0gQ2FjaGVkRm9udDo6Y3JlYXRlQ3VzdG9tRm9udERhdGEoZm9udEZh Y2VEYXRhLmdldCgpLCB7IH0sIHdyYXBwaW5nKTsKLSAgICBGb250RGVzY3JpcHRpb24gZGVzY3Jp cHRpb247Ci0gICAgZGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKGZvbnRTaXplKTsKLSAgICBm b250ID0gRm9udDo6Y3JlYXRlKENhY2hlZEZvbnQ6OnBsYXRmb3JtRGF0YUZyb21DdXN0b21EYXRh KCpjdXN0b21Gb250RGF0YSwgZGVzY3JpcHRpb24sIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0 YWxpYywgeyB9LCB7IH0pLCBvcmlnaW4pOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgKaW5kZXggNzc5MzNhNjgwYzY3NDA4 Yjc4N2E1NjdjZTk4NDcxZjJhZWJjYjc4NS4uZjhhOTYwZTcwOTVhNzk2N2RmZjExZGM0YjQ4NjE3 YmU5MDMxMzdhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaApAQCAt MzI4LDE0ICszMjgsNiBAQCBwcml2YXRlOgogI2VuZGlmCiB9OwogCi1jbGFzcyBGb250SGFuZGxl IHsKLXB1YmxpYzoKLSAgICBGb250SGFuZGxlKCkgPSBkZWZhdWx0OwotICAgIFdFQkNPUkVfRVhQ T1JUIEZvbnRIYW5kbGUoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBmb250RmFjZURhdGEsIEZvbnQ6Ok9y aWdpbiwgZmxvYXQgZm9udFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJ dGFsaWMpOwotCi0gICAgUmVmUHRyPEZvbnQ+IGZvbnQ7Ci19OwotCiAjaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKIGJvb2wgZm9udEZhbWlseVNob3VsZE5vdEJlVXNlZEZvckFyYWJpYyhDRlN0cmlu Z1JlZik7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCmluZGV4IGI0NWU3 OTc3MjU4Y2U0Y2FjMTVhYTc2N2I5M2I2ZWZkYjI0OGU2ZWQuLjVhMjI3NTllMTM5ZTFhOTViM2Nm NGMwZGM4MTc3ZGE1ZDlkYjg1OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaApA QCAtMTA5Myw5ICsxMDkzLDcgQEAgcHJpdmF0ZToKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2 b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIEZv bnRIYW5kbGUgaGFuZGxlOwotICAgIGhhbmRsZS5mb250ID0gbV9mb250LnB0cigpOwotICAgIGVu Y29kZXIgPDwgaGFuZGxlOworICAgIGVuY29kZXIgPDwgbV9mb250OwogICAgIGVuY29kZXIgPDwg bV9nbHlwaHM7CiAgICAgZW5jb2RlciA8PCBtX2FkdmFuY2VzOwogICAgIGVuY29kZXIgPDwgbV9i bG9ja0xvY2F0aW9uOwpAQCAtMTEwNiw5ICsxMTA0LDkgQEAgdm9pZCBEcmF3R2x5cGhzOjplbmNv ZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+CiBPcHRp b25hbDxSZWY8RHJhd0dseXBocz4+IERyYXdHbHlwaHM6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVy KQogewotICAgIE9wdGlvbmFsPEZvbnRIYW5kbGU+IGhhbmRsZTsKLSAgICBkZWNvZGVyID4+IGhh bmRsZTsKLSAgICBpZiAoIWhhbmRsZSB8fCAhaGFuZGxlLT5mb250KQorICAgIE9wdGlvbmFsPFJl ZjxGb250Pj4gZm9udDsKKyAgICBkZWNvZGVyID4+IGZvbnQ7CisgICAgaWYgKCFmb250KQogICAg ICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgT3B0aW9uYWw8VmVjdG9yPEdseXBoQnVm ZmVyR2x5cGgsIDEyOD4+IGdseXBoczsKQEAgLTExMzksNyArMTEzNyw3IEBAIE9wdGlvbmFsPFJl ZjxEcmF3R2x5cGhzPj4gRHJhd0dseXBoczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiAgICAg aWYgKCFzbW9vdGhpbmdNb2RlKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAg cmV0dXJuIERyYXdHbHlwaHM6OmNyZWF0ZShoYW5kbGUtPmZvbnQucmVsZWFzZU5vbk51bGwoKSwg V1RGTW92ZSgqZ2x5cGhzKSwgV1RGTW92ZSgqYWR2YW5jZXMpLCAqYmxvY2tMb2NhdGlvbiwgKmxv Y2FsQW5jaG9yLCAqc21vb3RoaW5nTW9kZSk7CisgICAgcmV0dXJuIERyYXdHbHlwaHM6OmNyZWF0 ZShmb250LT5nZXQoKSwgV1RGTW92ZSgqZ2x5cGhzKSwgV1RGTW92ZSgqYWR2YW5jZXMpLCAqYmxv Y2tMb2NhdGlvbiwgKmxvY2FsQW5jaG9yLCAqc21vb3RoaW5nTW9kZSk7CiB9CiAKIGNsYXNzIERy YXdJbWFnZSA6IHB1YmxpYyBEcmF3aW5nSXRlbSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaApp bmRleCA2MDc4ZTI1ZmExZDgyYmNlYzliNGNjN2JjNzJlNWU3ZjI4ZWE3MGFlLi45NmVjYWUyMjc3 ODQwMTgwNDFjOTdhY2IxOGQ4OTVlZjM1NDg1Zjc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udEN1c3RvbVBsYXRmb3JtRGF0YS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q3VzdG9tUGxhdGZvcm1EYXRh LmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKLSAgICB+Rm9udEN1 c3RvbVBsYXRmb3JtRGF0YSgpOworICAgIFdFQkNPUkVfRVhQT1JUIH5Gb250Q3VzdG9tUGxhdGZv cm1EYXRhKCk7CiAKICAgICBGb250UGxhdGZvcm1EYXRhIGZvbnRQbGF0Zm9ybURhdGEoY29uc3Qg Rm9udERlc2NyaXB0aW9uJiwgYm9vbCBib2xkLCBib29sIGl0YWxpYywgY29uc3QgRm9udEZlYXR1 cmVTZXR0aW5ncyYgZm9udEZhY2VGZWF0dXJlcywgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFi aWxpdGllcyBmb250RmFjZUNhcGFiaWxpdGllcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNlL1dl YktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXggZGVl MDMyMWJhYzBjNGU2YWY1MzIzNTRkOGZjYTlhODRiNTgxZDM4ZC4uNmRlNWRjYzE0NjY0YzFkZTYy NjM3YzZmN2QxNzZiYTgxMjA2MjZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQv Q29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwNywyOSArNTA3 LDI4IEBAIE9wdGlvbmFsPEZvbnRBdHRyaWJ1dGVzPiBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZv bnRBdHRyaWJ1dGVzPjo6ZGVjb2RlUGxhdGZvcm1ECiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9 CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVu Y29kZXImIGVuY29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRsZSkKK3ZvaWQgQXJndW1lbnRD b2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29u c3QgUmVmPFdlYkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGF1dG8gY3RGb250ID0gaGFuZGxl LmZvbnQgJiYgIWhhbmRsZS5mb250LT5mb250RmFjZURhdGEoKSA/IGhhbmRsZS5mb250LT5nZXRD VEZvbnQoKSA6IG5pbDsKLSAgICBlbmNvZGVyIDw8ICEhY3RGb250OworICAgIGF1dG8gY3RGb250 ID0gIWZvbnQtPmZvbnRGYWNlRGF0YSgpID8gZm9udC0+Z2V0Q1RGb250KCkgOiBuaWw7CisgICAg ZW5jb2RlciA8PCBzdGF0aWNfY2FzdDxib29sPihjdEZvbnQpOwogICAgIGlmIChjdEZvbnQpCiAg ICAgICAgIGVuY29kZXIgPDwgKF9fYnJpZGdlIENvY29hRm9udCAqKWN0Rm9udDsKIH0KIAotYm9v bCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYg ZGVjb2RlciwgRm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVu dENvZGVyPFJlZjxGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBP cHRpb25hbDxSZWY8V2ViQ29yZTo6Rm9udD4+JiYgZXhpc3RpbmdGb250KQogewogICAgIGJvb2wg aGFzUGxhdGZvcm1Gb250OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzUGxhdGZvcm1Gb250 KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owog CiAgICAgaWYgKCFoYXNQbGF0Zm9ybUZvbnQpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAg ICByZXR1cm4gV1RGTW92ZShleGlzdGluZ0ZvbnQpOwogCiAgICAgUmV0YWluUHRyPENvY29hRm9u dD4gZm9udDsKICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGZvbnQpKQotICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBoYW5kbGUu Zm9udCA9IEZvbnQ6OmNyZWF0ZSh7IChfX2JyaWRnZSBDVEZvbnRSZWYpZm9udC5nZXQoKSwgc3Rh dGljX2Nhc3Q8ZmxvYXQ+KFtmb250IHBvaW50U2l6ZV0pIH0pOwotICAgIHJldHVybiB0cnVlOwor ICAgIHJldHVybiBGb250OjpjcmVhdGUoeyAoX19icmlkZ2UgQ1RGb250UmVmKWZvbnQuZ2V0KCks IHN0YXRpY19jYXN0PGZsb2F0PihbZm9udCBwb2ludFNpemVdKSB9KTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgSVBDCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1l bnRDb2RlcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJz LmNwcAppbmRleCA3MTI3Zjk5YWJlNThhMWRjMzQyOTlhMjBmNTBkYzg5YmQ2ZWIzMGQ5Li5iNTFk OWFiMDMwMGVjMjU4YzZjMDVhNDYyYzUwNGZkYzM1ZmRjYjFlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNp bmNsdWRlIDxXZWJDb3JlL0Jsb2JQYXJ0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9DYWNoZVF1ZXJ5 T3B0aW9ucy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ2FjaGVTdG9yYWdlQ29ubmVjdGlvbi5oPgor I2luY2x1ZGUgPFdlYkNvcmUvQ2FjaGVkRm9udC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ2VydGlm aWNhdGVJbmZvLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Db21wb3NpdGlvblVuZGVybGluZS5oPgog I2luY2x1ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbC5oPgpAQCAtNTIsNiArNTMsNyBAQAogI2luY2x1 ZGUgPFdlYkNvcmUvRmlsdGVyT3BlcmF0aW9ucy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRm9udC5o PgogI2luY2x1ZGUgPFdlYkNvcmUvRm9udEF0dHJpYnV0ZXMuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29u dGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NMYXllci5oPgogI2luY2x1ZGUgPFdl YkNvcmUvSURCR2V0UmVzdWx0Lmg+CkBAIC0xMTgwLDY5ICsxMTgyLDY3IEBAIGJvb2wgQXJndW1l bnRDb2RlcjxOYXRpdmVJbWFnZUhhbmRsZT46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBOYXRp dmVJbWFnZUhhbmRsCiAgICAgcmV0dXJuIGRlY29kZU9wdGlvbmFsTmF0aXZlSW1hZ2UoZGVjb2Rl ciwgaW1hZ2VIYW5kbGUuaW1hZ2UpOwogfQogCi12b2lkIEFyZ3VtZW50Q29kZXI8Rm9udEhhbmRs ZT46OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBGb250SGFuZGxlJiBoYW5kbGUpCit2 b2lkIEFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNv bnN0IFJlZjxXZWJDb3JlOjpGb250PiYgZm9udCkKIHsKLSAgICBlbmNvZGVyIDw8ICEhaGFuZGxl LmZvbnQ7Ci0gICAgaWYgKCFoYW5kbGUuZm9udCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgYXV0 byogZm9udEZhY2VEYXRhID0gaGFuZGxlLmZvbnQtPmZvbnRGYWNlRGF0YSgpOwotICAgIGVuY29k ZXIgPDwgISFmb250RmFjZURhdGE7CisgICAgYXV0byogZm9udEZhY2VEYXRhID0gZm9udC0+Zm9u dEZhY2VEYXRhKCk7CisgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDxib29sPihmb250RmFjZURh dGEpOwogICAgIGlmIChmb250RmFjZURhdGEpIHsKICAgICAgICAgZW5jb2RlU2hhcmVkQnVmZmVy KGVuY29kZXIsIGZvbnRGYWNlRGF0YSk7Ci0gICAgICAgIGF1dG8mIGRhdGEgPSBoYW5kbGUuZm9u dC0+cGxhdGZvcm1EYXRhKCk7CisgICAgICAgIGF1dG8mIGRhdGEgPSBmb250LT5wbGF0Zm9ybURh dGEoKTsKICAgICAgICAgZW5jb2RlciA8PCBkYXRhLnNpemUoKTsKICAgICAgICAgZW5jb2RlciA8 PCBkYXRhLnN5bnRoZXRpY0JvbGQoKTsKICAgICAgICAgZW5jb2RlciA8PCBkYXRhLnN5bnRoZXRp Y09ibGlxdWUoKTsKICAgICB9CiAKLSAgICBlbmNvZGVQbGF0Zm9ybURhdGEoZW5jb2RlciwgaGFu ZGxlKTsKKyAgICBlbmNvZGVQbGF0Zm9ybURhdGEoZW5jb2RlciwgZm9udCk7CiB9CiAKLWJvb2wg QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIEZvbnRI YW5kbGUmIGhhbmRsZSkKK3N0YXRpYyBSZWY8Rm9udD4gY3JlYXRlRm9udChSZWY8U2hhcmVkQnVm ZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9udFNpemUs IGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCiB7Ci0gICAgT3B0aW9u YWw8Ym9vbD4gaGFzRm9udDsKLSAgICBkZWNvZGVyID4+IGhhc0ZvbnQ7Ci0gICAgaWYgKCFoYXNG b250Lmhhc1ZhbHVlKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGlmICghaGFzRm9u dC52YWx1ZSgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBib29sIHdyYXBwaW5nOworICAg IGF1dG8gY3VzdG9tRm9udERhdGEgPSBDYWNoZWRGb250OjpjcmVhdGVDdXN0b21Gb250RGF0YShm b250RmFjZURhdGEuZ2V0KCksIHsgfSwgd3JhcHBpbmcpOworICAgIEZvbnREZXNjcmlwdGlvbiBk ZXNjcmlwdGlvbjsKKyAgICBkZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZm9udFNpemUpOwor ICAgIHJldHVybiBGb250OjpjcmVhdGUoQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3Rv bURhdGEoKmN1c3RvbUZvbnREYXRhLCBkZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCB7IH0sIHsgfSksIG9yaWdpbik7Cit9CiAKK09wdGlvbmFsPFJlZjxGb250Pj4g QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKK3sKICAg ICBPcHRpb25hbDxib29sPiBoYXNGb250RmFjZURhdGE7CiAgICAgZGVjb2RlciA+PiBoYXNGb250 RmFjZURhdGE7CiAgICAgaWYgKCFoYXNGb250RmFjZURhdGEuaGFzVmFsdWUoKSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCisgICAgT3B0aW9u YWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiByZXN1bHQ7CiAgICAgaWYgKGhhc0ZvbnRGYWNlRGF0YS52 YWx1ZSgpKSB7CiAgICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGZvbnRGYWNlRGF0YTsKICAg ICAgICAgaWYgKCFkZWNvZGVTaGFyZWRCdWZmZXIoZGVjb2RlciwgZm9udEZhY2VEYXRhKSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 CiAKICAgICAgICAgaWYgKCFmb250RmFjZURhdGEpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGZs b2F0PiBmb250U2l6ZTsKICAgICAgICAgZGVjb2RlciA+PiBmb250U2l6ZTsKICAgICAgICAgaWYg KCFmb250U2l6ZSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAgT3B0aW9uYWw8Ym9vbD4gc3ludGhldGljQm9sZDsK ICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNCb2xkOwogICAgICAgICBpZiAoIXN5bnRoZXRp Y0JvbGQpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGJvb2w+IHN5bnRoZXRpY0l0YWxpYzsKICAg ICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNJdGFsaWM7CiAgICAgICAgIGlmICghc3ludGhldGlj SXRhbGljKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdU Rjo6bnVsbG9wdDsKIAogICAgICAgICBGb250RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CiAgICAg ICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZSgqZm9udFNpemUpOwotICAgICAgICBoYW5k bGUgPSB7IGZvbnRGYWNlRGF0YS5yZWxlYXNlTm9uTnVsbCgpLCBGb250OjpPcmlnaW46OlJlbW90 ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9sZCwgKnN5bnRoZXRpY0l0YWxpYyB9OworICAgICAg ICByZXN1bHQgPSBjcmVhdGVGb250KGZvbnRGYWNlRGF0YS5yZWxlYXNlTm9uTnVsbCgpLCBGb250 OjpPcmlnaW46OlJlbW90ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9sZCwgKnN5bnRoZXRpY0l0 YWxpYyk7CiAgICAgfQogCi0gICAgcmV0dXJuIGRlY29kZVBsYXRmb3JtRGF0YShkZWNvZGVyLCBo YW5kbGUpOworICAgIHJldHVybiBkZWNvZGVQbGF0Zm9ybURhdGEoZGVjb2RlciwgV1RGTW92ZShy ZXN1bHQpKTsKIH0KIAogdm9pZCBBcmd1bWVudENvZGVyPEN1cnNvcj46OmVuY29kZShFbmNvZGVy JiBlbmNvZGVyLCBjb25zdCBDdXJzb3ImIGN1cnNvcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKaW5kZXggYTlmODZkMjhmODg4YjVkMGE4YjA4NzQzOTdl OTQ0MTZhNjhiNDYyYy4uMjg2MjE5YzA2NWQ3ZmY5ZmEwNDNmYWFmMWMyZTczN2I0YTZhMTQ3MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgK KysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKQEAgLTk0 LDcgKzk0LDcgQEAgY2xhc3MgRmxvYXRSZWN0OwogY2xhc3MgRmxvYXRSb3VuZGVkUmVjdDsKIGNs YXNzIEZsb2F0U2l6ZTsKIGNsYXNzIEZpeGVkUG9zaXRpb25WaWV3cG9ydENvbnN0cmFpbnRzOwot Y2xhc3MgRm9udEhhbmRsZTsKK2NsYXNzIEZvbnQ7CiBjbGFzcyBIVFRQSGVhZGVyTWFwOwogY2xh c3MgSW1hZ2VIYW5kbGU7CiBjbGFzcyBJbnRQb2ludDsKQEAgLTQwNywxMSArNDA3LDExIEBAIHRl bXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Q3Vyc29yPiB7CiAgICAgc3Rh dGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZShEZWNvZGVyJiwgV2ViQ29yZTo6Q3Vy c29yJik7CiB9OwogCi10ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZv bnRIYW5kbGU+IHsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGUoRW5jb2RlciYsIGNvbnN0IFdlYkNv cmU6OkZvbnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJvb2wgZGVj b2RlKERlY29kZXImLCBXZWJDb3JlOjpGb250SGFuZGxlJik7Ci0gICAgc3RhdGljIHZvaWQgZW5j b2RlUGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBXZWJDb3JlOjpGb250SGFuZGxlJik7Ci0g ICAgc3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBib29sIGRlY29kZVBsYXRmb3JtRGF0YShEZWNv ZGVyJiwgV2ViQ29yZTo6Rm9udEhhbmRsZSYpOwordGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRD b2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGUoRW5jb2Rl ciYsIGNvbnN0IFJlZjxXZWJDb3JlOjpGb250PiYpOworICAgIHN0YXRpYyBPcHRpb25hbDxSZWY8 V2ViQ29yZTo6Rm9udD4+IGRlY29kZShEZWNvZGVyJik7CisgICAgc3RhdGljIHZvaWQgZW5jb2Rl UGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBSZWY8V2ViQ29yZTo6Rm9udD4mKTsKKyAgICBz dGF0aWMgT3B0aW9uYWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiBkZWNvZGVQbGF0Zm9ybURhdGEoRGVj b2RlciYsIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4mJik7CiB9OwogCiB0ZW1wbGF0ZTw+ IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkltYWdlSGFuZGxlPiB7Cg== 409967 2020-09-28 23:04:20 -0700 2020-09-29 01:15:37 -0700 Patch for committing bug-217076-20200928230419.patch text/plain 13188 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uZGQ4ZTIxMzZmNzJiMGFmMDAzMDYyYWIxNTMyZTg5 NzYyMzE4OTMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFRoZSBvbmx5IHJlYXNvbiBGb250SGFuZGxlIGV4aXN0cyBpcyB0byBiZSBh biBpbnRlcm5hbGx5LW51bGxhYmxlIHdyYXBwZXIgYXJvdW5kIFdlYkNvcmU6OkZvbnQuCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgY29kZXBhdGggaXMgb25seSBldmVyIGludm9rZWQgd2l0aCBub24t bnVsbCBmb250cywgc28gdGhlcmUncyBubyBwb2ludCBpbiBoYXZpbmcKKyAgICAgICAgdGhpcyB3 cmFwcGVyLiBUaGlzIHBhdGNoIHJlcGxhY2VzIGl0IHdpdGgganVzdCBSZWY8Rm9udD4uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgor CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250SGFuZGxlOjpGb250SGFuZGxlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjplbmNvZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmRlY29kZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaDoKKwogMjAyMC0w OS0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBb R1BVUF0gT3V0LW9mLWJhbmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0NDFlZGE5MmIxYjhhZjMw ZTI2ZTJhNjg2YTA0Y2I2YzIwMGUxYTBhLi42YjgwMDk2ZjE3ZDAwNGNlMDIwYWRjMmNjMTM4ZjA2 MzYyYjdkNGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTI4ICBNeWxlcyBD LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNz XSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgor CisgICAgICAgICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgor ICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxGb250Pj46OmVuY29kZVBsYXRmb3JtRGF0 YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZv cm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2Rl UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS ZWY8Rm9udD4+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpjcmVhdGVGb250KToKKyAgICAgICAg KElQQzo6QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUpOgorICAgICAgICAoSVBDOjpB cmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoSVBD OjpBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKwogMjAyMC0wOS0yOCAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gT3V0LW9mLWJh bmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApp bmRleCBiOWRkNzExYTI5MzZiZGIwYzM2OWYwOGNlOTA3NThlZWQ0ZDFkN2NiLi5iOGZkZTU3Y2Jj YTk1MzAwODVhMDJmNzdhMTM3YjcxNTQ4ZmU5NTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250LmNwcApAQCAtNTcsNiArNTcsMTUgQEAgY29uc3QgZmxvYXQgZW1waGFz aXNNYXJrRm9udFNpemVNdWx0aXBsaWVyID0gMC41ZjsKIAogREVGSU5FX0FMTE9DQVRPUl9XSVRI X0hFQVBfSURFTlRJRklFUihGb250KTsKIAorUmVmPEZvbnQ+IEZvbnQ6OmNyZWF0ZShSZWY8U2hh cmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9u dFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCit7CisgICAg Ym9vbCB3cmFwcGluZzsKKyAgICBhdXRvIGN1c3RvbUZvbnREYXRhID0gQ2FjaGVkRm9udDo6Y3Jl YXRlQ3VzdG9tRm9udERhdGEoZm9udEZhY2VEYXRhLmdldCgpLCB7IH0sIHdyYXBwaW5nKTsKKyAg ICBGb250RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CisgICAgZGVzY3JpcHRpb24uc2V0Q29tcHV0 ZWRTaXplKGZvbnRTaXplKTsKKyAgICByZXR1cm4gRm9udDo6Y3JlYXRlKENhY2hlZEZvbnQ6OnBs YXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKCpjdXN0b21Gb250RGF0YSwgZGVzY3JpcHRpb24sIHN5 bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYywgeyB9LCB7IH0pLCBvcmlnaW4pOworfQorCiBG b250OjpGb250KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSwgT3JpZ2luIG9y aWdpbiwgSW50ZXJzdGl0aWFsIGludGVyc3RpdGlhbCwgVmlzaWJpbGl0eSB2aXNpYmlsaXR5LCBP cmllbnRhdGlvbkZhbGxiYWNrIG9yaWVudGF0aW9uRmFsbGJhY2spCiAgICAgOiBtX3BsYXRmb3Jt RGF0YShwbGF0Zm9ybURhdGEpCiAgICAgLCBtX29yaWdpbihvcmlnaW4pCkBAIC03MTEsMTMgKzcy MCw0IEBAIHZvaWQgRm9udDo6c2V0Rm9udEZhY2VEYXRhKFJlZlB0cjxTaGFyZWRCdWZmZXI+JiYg Zm9udEZhY2VEYXRhKQogICAgIG1fZm9udEZhY2VEYXRhID0gV1RGTW92ZShmb250RmFjZURhdGEp OwogfQogCi1Gb250SGFuZGxlOjpGb250SGFuZGxlKFJlZjxTaGFyZWRCdWZmZXI+JiYgZm9udEZh Y2VEYXRhLCBGb250OjpPcmlnaW4gb3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0 aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYykKLXsKLSAgICBib29sIHdyYXBwaW5nOwotICAg IGF1dG8gY3VzdG9tRm9udERhdGEgPSBDYWNoZWRGb250OjpjcmVhdGVDdXN0b21Gb250RGF0YShm b250RmFjZURhdGEuZ2V0KCksIHsgfSwgd3JhcHBpbmcpOwotICAgIEZvbnREZXNjcmlwdGlvbiBk ZXNjcmlwdGlvbjsKLSAgICBkZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZm9udFNpemUpOwot ICAgIGZvbnQgPSBGb250OjpjcmVhdGUoQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3Rv bURhdGEoKmN1c3RvbUZvbnREYXRhLCBkZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCB7IH0sIHsgfSksIG9yaWdpbik7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCA3NzkzM2E2ODBj Njc0MDhiNzg3YTU2N2NlOTg0NzFmMmFlYmNiNzg1Li45MGU3YmMwNzkwYWQwNGRmMTdjMmZjNzdk YjMxODQzNTJiZjBjNTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5o CkBAIC05NCw2ICs5NCw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IEZvbnQocGxhdGZvcm1EYXRhLCBvcmlnaW4sIGludGVyc3RpdGlhbCwgdmlzaWJpbGl0 eSwgb3JpZW50YXRpb25GYWxsYmFjaykpOwogICAgIH0KKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgUmVmPEZvbnQ+IGNyZWF0ZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9u dDo6T3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRo ZXRpY0l0YWxpYyk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB+Rm9udCgpOwogCkBAIC0zMjgsMTQg KzMyOSw2IEBAIHByaXZhdGU6CiAjZW5kaWYKIH07CiAKLWNsYXNzIEZvbnRIYW5kbGUgewotcHVi bGljOgotICAgIEZvbnRIYW5kbGUoKSA9IGRlZmF1bHQ7Ci0gICAgV0VCQ09SRV9FWFBPUlQgRm9u dEhhbmRsZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luLCBm bG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYyk7 Ci0KLSAgICBSZWZQdHI8Rm9udD4gZm9udDsKLX07Ci0KICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogYm9vbCBmb250RmFtaWx5U2hvdWxkTm90QmVVc2VkRm9yQXJhYmljKENGU3RyaW5nUmVmKTsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlz cGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmgKaW5kZXggYjQ1ZTc5NzcyNThj ZTRjYWMxNWFhNzY3YjkzYjZlZmRiMjQ4ZTZlZC4uNWEyMjc1OWUxMzllMWE5NWIzY2Y0YzBkYzgx NzdkYTVkOWRiODU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCkBAIC0xMDkz LDkgKzEwOTMsNyBAQCBwcml2YXRlOgogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQgRHJh d0dseXBoczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgRm9udEhhbmRs ZSBoYW5kbGU7Ci0gICAgaGFuZGxlLmZvbnQgPSBtX2ZvbnQucHRyKCk7Ci0gICAgZW5jb2RlciA8 PCBoYW5kbGU7CisgICAgZW5jb2RlciA8PCBtX2ZvbnQ7CiAgICAgZW5jb2RlciA8PCBtX2dseXBo czsKICAgICBlbmNvZGVyIDw8IG1fYWR2YW5jZXM7CiAgICAgZW5jb2RlciA8PCBtX2Jsb2NrTG9j YXRpb247CkBAIC0xMTA2LDkgKzExMDQsOSBAQCB2b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4KIE9wdGlvbmFsPFJl ZjxEcmF3R2x5cGhzPj4gRHJhd0dseXBoczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0g ICAgT3B0aW9uYWw8Rm9udEhhbmRsZT4gaGFuZGxlOwotICAgIGRlY29kZXIgPj4gaGFuZGxlOwot ICAgIGlmICghaGFuZGxlIHx8ICFoYW5kbGUtPmZvbnQpCisgICAgT3B0aW9uYWw8UmVmPEZvbnQ+ PiBmb250OworICAgIGRlY29kZXIgPj4gZm9udDsKKyAgICBpZiAoIWZvbnQpCiAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBPcHRpb25hbDxWZWN0b3I8R2x5cGhCdWZmZXJHbHlw aCwgMTI4Pj4gZ2x5cGhzOwpAQCAtMTEzOSw3ICsxMTM3LDcgQEAgT3B0aW9uYWw8UmVmPERyYXdH bHlwaHM+PiBEcmF3R2x5cGhzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICBpZiAoIXNt b290aGluZ01vZGUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICByZXR1cm4g RHJhd0dseXBoczo6Y3JlYXRlKGhhbmRsZS0+Zm9udC5yZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3Zl KCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0aW9uLCAqbG9jYWxBbmNo b3IsICpzbW9vdGhpbmdNb2RlKTsKKyAgICByZXR1cm4gRHJhd0dseXBoczo6Y3JlYXRlKGZvbnQt PmdldCgpLCBXVEZNb3ZlKCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0 aW9uLCAqbG9jYWxBbmNob3IsICpzbW9vdGhpbmdNb2RlKTsKIH0KIAogY2xhc3MgRHJhd0ltYWdl IDogcHVibGljIERyYXdpbmdJdGVtIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXggZGVlMDMyMWJhYzBj NGU2YWY1MzIzNTRkOGZjYTlhODRiNTgxZDM4ZC4uNmRlNWRjYzE0NjY0YzFkZTYyNjM3YzZmN2Qx NzZiYTgxMjA2MjZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwNywyOSArNTA3LDI4IEBAIE9w dGlvbmFsPEZvbnRBdHRyaWJ1dGVzPiBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZvbnRBdHRyaWJ1 dGVzPjo6ZGVjb2RlUGxhdGZvcm1ECiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9CiAKLXZvaWQg QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRsZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8 Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgUmVmPFdl YkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGF1dG8gY3RGb250ID0gaGFuZGxlLmZvbnQgJiYg IWhhbmRsZS5mb250LT5mb250RmFjZURhdGEoKSA/IGhhbmRsZS5mb250LT5nZXRDVEZvbnQoKSA6 IG5pbDsKLSAgICBlbmNvZGVyIDw8ICEhY3RGb250OworICAgIGF1dG8gY3RGb250ID0gIWZvbnQt PmZvbnRGYWNlRGF0YSgpID8gZm9udC0+Z2V0Q1RGb250KCkgOiBuaWw7CisgICAgZW5jb2RlciA8 PCBzdGF0aWNfY2FzdDxib29sPihjdEZvbnQpOwogICAgIGlmIChjdEZvbnQpCiAgICAgICAgIGVu Y29kZXIgPDwgKF9fYnJpZGdlIENvY29hRm9udCAqKWN0Rm9udDsKIH0KIAotYm9vbCBBcmd1bWVu dENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBPcHRpb25hbDxS ZWY8V2ViQ29yZTo6Rm9udD4+JiYgZXhpc3RpbmdGb250KQogewogICAgIGJvb2wgaGFzUGxhdGZv cm1Gb250OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzUGxhdGZvcm1Gb250KSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgaWYg KCFoYXNQbGF0Zm9ybUZvbnQpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4g V1RGTW92ZShleGlzdGluZ0ZvbnQpOwogCiAgICAgUmV0YWluUHRyPENvY29hRm9udD4gZm9udDsK ICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGZvbnQpKQotICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBoYW5kbGUuZm9udCA9IEZv bnQ6OmNyZWF0ZSh7IChfX2JyaWRnZSBDVEZvbnRSZWYpZm9udC5nZXQoKSwgc3RhdGljX2Nhc3Q8 ZmxvYXQ+KFtmb250IHBvaW50U2l6ZV0pIH0pOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVy biBGb250OjpjcmVhdGUoeyAoX19icmlkZ2UgQ1RGb250UmVmKWZvbnQuZ2V0KCksIHN0YXRpY19j YXN0PGZsb2F0PihbZm9udCBwb2ludFNpemVdKSB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSVBD CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMu Y3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAppbmRl eCA3MTI3Zjk5YWJlNThhMWRjMzQyOTlhMjBmNTBkYzg5YmQ2ZWIzMGQ5Li4zMjQ2ZDI4NzRiYTI5 OTE2NjU0ZGE4YmU4OWMzM2M1NTU5YWYwNzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTExODAsNjkgKzExODAsNTggQEAgYm9vbCBB cmd1bWVudENvZGVyPE5hdGl2ZUltYWdlSGFuZGxlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIs IE5hdGl2ZUltYWdlSGFuZGwKICAgICByZXR1cm4gZGVjb2RlT3B0aW9uYWxOYXRpdmVJbWFnZShk ZWNvZGVyLCBpbWFnZUhhbmRsZS5pbWFnZSk7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRs ZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl ciwgY29uc3QgUmVmPFdlYkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGVuY29kZXIgPDwgISFo YW5kbGUuZm9udDsKLSAgICBpZiAoIWhhbmRsZS5mb250KQotICAgICAgICByZXR1cm47Ci0KLSAg ICBhdXRvKiBmb250RmFjZURhdGEgPSBoYW5kbGUuZm9udC0+Zm9udEZhY2VEYXRhKCk7Ci0gICAg ZW5jb2RlciA8PCAhIWZvbnRGYWNlRGF0YTsKKyAgICBhdXRvKiBmb250RmFjZURhdGEgPSBmb250 LT5mb250RmFjZURhdGEoKTsKKyAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KGZvbnRG YWNlRGF0YSk7CiAgICAgaWYgKGZvbnRGYWNlRGF0YSkgewogICAgICAgICBlbmNvZGVTaGFyZWRC dWZmZXIoZW5jb2RlciwgZm9udEZhY2VEYXRhKTsKLSAgICAgICAgYXV0byYgZGF0YSA9IGhhbmRs ZS5mb250LT5wbGF0Zm9ybURhdGEoKTsKKyAgICAgICAgYXV0byYgZGF0YSA9IGZvbnQtPnBsYXRm b3JtRGF0YSgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc2l6ZSgpOwogICAgICAgICBlbmNv ZGVyIDw8IGRhdGEuc3ludGhldGljQm9sZCgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc3lu dGhldGljT2JsaXF1ZSgpOwogICAgIH0KIAotICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVy LCBoYW5kbGUpOworICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVyLCBmb250KTsKIH0KIAot Ym9vbCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIE9wdGlvbmFsPGJvb2w+ IGhhc0ZvbnQ7Ci0gICAgZGVjb2RlciA+PiBoYXNGb250OwotICAgIGlmICghaGFzRm9udC5oYXNW YWx1ZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoIWhhc0ZvbnQudmFsdWUo KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KICAgICBPcHRpb25hbDxib29sPiBoYXNGb250RmFj ZURhdGE7CiAgICAgZGVjb2RlciA+PiBoYXNGb250RmFjZURhdGE7CiAgICAgaWYgKCFoYXNGb250 RmFjZURhdGEuaGFzVmFsdWUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCisgICAgT3B0aW9uYWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiByZXN1 bHQ7CiAgICAgaWYgKGhhc0ZvbnRGYWNlRGF0YS52YWx1ZSgpKSB7CiAgICAgICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IGZvbnRGYWNlRGF0YTsKICAgICAgICAgaWYgKCFkZWNvZGVTaGFyZWRCdWZm ZXIoZGVjb2RlciwgZm9udEZhY2VEYXRhKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAgaWYgKCFmb250RmFjZURh dGEpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGZsb2F0PiBmb250U2l6ZTsKICAgICAgICAgZGVj b2RlciA+PiBmb250U2l6ZTsKICAgICAgICAgaWYgKCFmb250U2l6ZSkKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAg T3B0aW9uYWw8Ym9vbD4gc3ludGhldGljQm9sZDsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0 aWNCb2xkOwogICAgICAgICBpZiAoIXN5bnRoZXRpY0JvbGQpCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlv bmFsPGJvb2w+IHN5bnRoZXRpY0l0YWxpYzsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNJ dGFsaWM7CiAgICAgICAgIGlmICghc3ludGhldGljSXRhbGljKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgICAgICBGb250 RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CiAgICAgICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVk U2l6ZSgqZm9udFNpemUpOwotICAgICAgICBoYW5kbGUgPSB7IGZvbnRGYWNlRGF0YS5yZWxlYXNl Tm9uTnVsbCgpLCBGb250OjpPcmlnaW46OlJlbW90ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9s ZCwgKnN5bnRoZXRpY0l0YWxpYyB9OworICAgICAgICByZXN1bHQgPSBGb250OjpjcmVhdGUoZm9u dEZhY2VEYXRhLnJlbGVhc2VOb25OdWxsKCksIEZvbnQ6Ok9yaWdpbjo6UmVtb3RlLCAqZm9udFNp emUsICpzeW50aGV0aWNCb2xkLCAqc3ludGhldGljSXRhbGljKTsKICAgICB9CiAKLSAgICByZXR1 cm4gZGVjb2RlUGxhdGZvcm1EYXRhKGRlY29kZXIsIGhhbmRsZSk7CisgICAgcmV0dXJuIGRlY29k ZVBsYXRmb3JtRGF0YShkZWNvZGVyLCBXVEZNb3ZlKHJlc3VsdCkpOwogfQogCiB2b2lkIEFyZ3Vt ZW50Q29kZXI8Q3Vyc29yPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEN1cnNvciYg Y3Vyc29yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApp bmRleCBhOWY4NmQyOGY4ODhiNWQwYThiMDg3NDM5N2U5NDQxNmE2OGI0NjJjLi4yODYyMTljMDY1 ZDdmZjlmYTA0M2ZhYWYxYzJlNzM3YjRhNmExNDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApAQCAtOTQsNyArOTQsNyBAQCBjbGFzcyBGbG9hdFJl Y3Q7CiBjbGFzcyBGbG9hdFJvdW5kZWRSZWN0OwogY2xhc3MgRmxvYXRTaXplOwogY2xhc3MgRml4 ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHM7Ci1jbGFzcyBGb250SGFuZGxlOworY2xhc3Mg Rm9udDsKIGNsYXNzIEhUVFBIZWFkZXJNYXA7CiBjbGFzcyBJbWFnZUhhbmRsZTsKIGNsYXNzIElu dFBvaW50OwpAQCAtNDA3LDExICs0MDcsMTEgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRD b2RlcjxXZWJDb3JlOjpDdXJzb3I+IHsKICAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJv b2wgZGVjb2RlKERlY29kZXImLCBXZWJDb3JlOjpDdXJzb3ImKTsKIH07CiAKLXRlbXBsYXRlPD4g c3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Rm9udEhhbmRsZT4gewotICAgIHN0YXRpYyB2 b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6Rm9udEhhbmRsZSYpOwotICAgIHN0 YXRpYyBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGUoRGVjb2RlciYsIFdlYkNvcmU6OkZv bnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYs IGNvbnN0IFdlYkNvcmU6OkZvbnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVU VVJOIGJvb2wgZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImLCBXZWJDb3JlOjpGb250SGFuZGxl Jik7Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj4g eworICAgIHN0YXRpYyB2b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgUmVmPFdlYkNvcmU6OkZv bnQ+Jik7CisgICAgc3RhdGljIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4gZGVjb2RlKERl Y29kZXImKTsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYsIGNv bnN0IFJlZjxXZWJDb3JlOjpGb250PiYpOworICAgIHN0YXRpYyBPcHRpb25hbDxSZWY8V2ViQ29y ZTo6Rm9udD4+IGRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiwgT3B0aW9uYWw8UmVmPFdlYkNv cmU6OkZvbnQ+PiYmKTsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2Vi Q29yZTo6SW1hZ2VIYW5kbGU+IHsK 409970 2020-09-29 01:07:54 -0700 2020-09-29 01:21:41 -0700 Patch for committing bug-217076-20200929010754.patch text/plain 15058 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uZGQ4ZTIxMzZmNzJiMGFmMDAzMDYyYWIxNTMyZTg5 NzYyMzE4OTMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFRoZSBvbmx5IHJlYXNvbiBGb250SGFuZGxlIGV4aXN0cyBpcyB0byBiZSBh biBpbnRlcm5hbGx5LW51bGxhYmxlIHdyYXBwZXIgYXJvdW5kIFdlYkNvcmU6OkZvbnQuCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgY29kZXBhdGggaXMgb25seSBldmVyIGludm9rZWQgd2l0aCBub24t bnVsbCBmb250cywgc28gdGhlcmUncyBubyBwb2ludCBpbiBoYXZpbmcKKyAgICAgICAgdGhpcyB3 cmFwcGVyLiBUaGlzIHBhdGNoIHJlcGxhY2VzIGl0IHdpdGgganVzdCBSZWY8Rm9udD4uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgor CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250SGFuZGxlOjpGb250SGFuZGxlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjplbmNvZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmRlY29kZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaDoKKwogMjAyMC0w OS0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBb R1BVUF0gT3V0LW9mLWJhbmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0NDFlZGE5MmIxYjhhZjMw ZTI2ZTJhNjg2YTA0Y2I2YzIwMGUxYTBhLi42YjgwMDk2ZjE3ZDAwNGNlMDIwYWRjMmNjMTM4ZjA2 MzYyYjdkNGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTI4ICBNeWxlcyBD LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNz XSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgor CisgICAgICAgICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgor ICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxGb250Pj46OmVuY29kZVBsYXRmb3JtRGF0 YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZv cm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2Rl UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS ZWY8Rm9udD4+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpjcmVhdGVGb250KToKKyAgICAgICAg KElQQzo6QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUpOgorICAgICAgICAoSVBDOjpB cmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoSVBD OjpBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKwogMjAyMC0wOS0yOCAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gT3V0LW9mLWJh bmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApp bmRleCBiOWRkNzExYTI5MzZiZGIwYzM2OWYwOGNlOTA3NThlZWQ0ZDFkN2NiLi5iOGZkZTU3Y2Jj YTk1MzAwODVhMDJmNzdhMTM3YjcxNTQ4ZmU5NTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250LmNwcApAQCAtNTcsNiArNTcsMTUgQEAgY29uc3QgZmxvYXQgZW1waGFz aXNNYXJrRm9udFNpemVNdWx0aXBsaWVyID0gMC41ZjsKIAogREVGSU5FX0FMTE9DQVRPUl9XSVRI X0hFQVBfSURFTlRJRklFUihGb250KTsKIAorUmVmPEZvbnQ+IEZvbnQ6OmNyZWF0ZShSZWY8U2hh cmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9u dFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCit7CisgICAg Ym9vbCB3cmFwcGluZzsKKyAgICBhdXRvIGN1c3RvbUZvbnREYXRhID0gQ2FjaGVkRm9udDo6Y3Jl YXRlQ3VzdG9tRm9udERhdGEoZm9udEZhY2VEYXRhLmdldCgpLCB7IH0sIHdyYXBwaW5nKTsKKyAg ICBGb250RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CisgICAgZGVzY3JpcHRpb24uc2V0Q29tcHV0 ZWRTaXplKGZvbnRTaXplKTsKKyAgICByZXR1cm4gRm9udDo6Y3JlYXRlKENhY2hlZEZvbnQ6OnBs YXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKCpjdXN0b21Gb250RGF0YSwgZGVzY3JpcHRpb24sIHN5 bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYywgeyB9LCB7IH0pLCBvcmlnaW4pOworfQorCiBG b250OjpGb250KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSwgT3JpZ2luIG9y aWdpbiwgSW50ZXJzdGl0aWFsIGludGVyc3RpdGlhbCwgVmlzaWJpbGl0eSB2aXNpYmlsaXR5LCBP cmllbnRhdGlvbkZhbGxiYWNrIG9yaWVudGF0aW9uRmFsbGJhY2spCiAgICAgOiBtX3BsYXRmb3Jt RGF0YShwbGF0Zm9ybURhdGEpCiAgICAgLCBtX29yaWdpbihvcmlnaW4pCkBAIC03MTEsMTMgKzcy MCw0IEBAIHZvaWQgRm9udDo6c2V0Rm9udEZhY2VEYXRhKFJlZlB0cjxTaGFyZWRCdWZmZXI+JiYg Zm9udEZhY2VEYXRhKQogICAgIG1fZm9udEZhY2VEYXRhID0gV1RGTW92ZShmb250RmFjZURhdGEp OwogfQogCi1Gb250SGFuZGxlOjpGb250SGFuZGxlKFJlZjxTaGFyZWRCdWZmZXI+JiYgZm9udEZh Y2VEYXRhLCBGb250OjpPcmlnaW4gb3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0 aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYykKLXsKLSAgICBib29sIHdyYXBwaW5nOwotICAg IGF1dG8gY3VzdG9tRm9udERhdGEgPSBDYWNoZWRGb250OjpjcmVhdGVDdXN0b21Gb250RGF0YShm b250RmFjZURhdGEuZ2V0KCksIHsgfSwgd3JhcHBpbmcpOwotICAgIEZvbnREZXNjcmlwdGlvbiBk ZXNjcmlwdGlvbjsKLSAgICBkZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZm9udFNpemUpOwot ICAgIGZvbnQgPSBGb250OjpjcmVhdGUoQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3Rv bURhdGEoKmN1c3RvbUZvbnREYXRhLCBkZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCB7IH0sIHsgfSksIG9yaWdpbik7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCA3NzkzM2E2ODBj Njc0MDhiNzg3YTU2N2NlOTg0NzFmMmFlYmNiNzg1Li45MGU3YmMwNzkwYWQwNGRmMTdjMmZjNzdk YjMxODQzNTJiZjBjNTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5o CkBAIC05NCw2ICs5NCw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IEZvbnQocGxhdGZvcm1EYXRhLCBvcmlnaW4sIGludGVyc3RpdGlhbCwgdmlzaWJpbGl0 eSwgb3JpZW50YXRpb25GYWxsYmFjaykpOwogICAgIH0KKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgUmVmPEZvbnQ+IGNyZWF0ZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9u dDo6T3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRo ZXRpY0l0YWxpYyk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB+Rm9udCgpOwogCkBAIC0zMjgsMTQg KzMyOSw2IEBAIHByaXZhdGU6CiAjZW5kaWYKIH07CiAKLWNsYXNzIEZvbnRIYW5kbGUgewotcHVi bGljOgotICAgIEZvbnRIYW5kbGUoKSA9IGRlZmF1bHQ7Ci0gICAgV0VCQ09SRV9FWFBPUlQgRm9u dEhhbmRsZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luLCBm bG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYyk7 Ci0KLSAgICBSZWZQdHI8Rm9udD4gZm9udDsKLX07Ci0KICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogYm9vbCBmb250RmFtaWx5U2hvdWxkTm90QmVVc2VkRm9yQXJhYmljKENGU3RyaW5nUmVmKTsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlz cGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmgKaW5kZXggYjQ1ZTc5NzcyNThj ZTRjYWMxNWFhNzY3YjkzYjZlZmRiMjQ4ZTZlZC4uNWEyMjc1OWUxMzllMWE5NWIzY2Y0YzBkYzgx NzdkYTVkOWRiODU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCkBAIC0xMDkz LDkgKzEwOTMsNyBAQCBwcml2YXRlOgogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQgRHJh d0dseXBoczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgRm9udEhhbmRs ZSBoYW5kbGU7Ci0gICAgaGFuZGxlLmZvbnQgPSBtX2ZvbnQucHRyKCk7Ci0gICAgZW5jb2RlciA8 PCBoYW5kbGU7CisgICAgZW5jb2RlciA8PCBtX2ZvbnQ7CiAgICAgZW5jb2RlciA8PCBtX2dseXBo czsKICAgICBlbmNvZGVyIDw8IG1fYWR2YW5jZXM7CiAgICAgZW5jb2RlciA8PCBtX2Jsb2NrTG9j YXRpb247CkBAIC0xMTA2LDkgKzExMDQsOSBAQCB2b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4KIE9wdGlvbmFsPFJl ZjxEcmF3R2x5cGhzPj4gRHJhd0dseXBoczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0g ICAgT3B0aW9uYWw8Rm9udEhhbmRsZT4gaGFuZGxlOwotICAgIGRlY29kZXIgPj4gaGFuZGxlOwot ICAgIGlmICghaGFuZGxlIHx8ICFoYW5kbGUtPmZvbnQpCisgICAgT3B0aW9uYWw8UmVmPEZvbnQ+ PiBmb250OworICAgIGRlY29kZXIgPj4gZm9udDsKKyAgICBpZiAoIWZvbnQpCiAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBPcHRpb25hbDxWZWN0b3I8R2x5cGhCdWZmZXJHbHlw aCwgMTI4Pj4gZ2x5cGhzOwpAQCAtMTEzOSw3ICsxMTM3LDcgQEAgT3B0aW9uYWw8UmVmPERyYXdH bHlwaHM+PiBEcmF3R2x5cGhzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICBpZiAoIXNt b290aGluZ01vZGUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICByZXR1cm4g RHJhd0dseXBoczo6Y3JlYXRlKGhhbmRsZS0+Zm9udC5yZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3Zl KCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0aW9uLCAqbG9jYWxBbmNo b3IsICpzbW9vdGhpbmdNb2RlKTsKKyAgICByZXR1cm4gRHJhd0dseXBoczo6Y3JlYXRlKGZvbnQt PmdldCgpLCBXVEZNb3ZlKCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0 aW9uLCAqbG9jYWxBbmNob3IsICpzbW9vdGhpbmdNb2RlKTsKIH0KIAogY2xhc3MgRHJhd0ltYWdl IDogcHVibGljIERyYXdpbmdJdGVtIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXggZGVlMDMyMWJhYzBj NGU2YWY1MzIzNTRkOGZjYTlhODRiNTgxZDM4ZC4uNmRlNWRjYzE0NjY0YzFkZTYyNjM3YzZmN2Qx NzZiYTgxMjA2MjZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwNywyOSArNTA3LDI4IEBAIE9w dGlvbmFsPEZvbnRBdHRyaWJ1dGVzPiBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZvbnRBdHRyaWJ1 dGVzPjo6ZGVjb2RlUGxhdGZvcm1ECiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9CiAKLXZvaWQg QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRsZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8 Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgUmVmPFdl YkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGF1dG8gY3RGb250ID0gaGFuZGxlLmZvbnQgJiYg IWhhbmRsZS5mb250LT5mb250RmFjZURhdGEoKSA/IGhhbmRsZS5mb250LT5nZXRDVEZvbnQoKSA6 IG5pbDsKLSAgICBlbmNvZGVyIDw8ICEhY3RGb250OworICAgIGF1dG8gY3RGb250ID0gIWZvbnQt PmZvbnRGYWNlRGF0YSgpID8gZm9udC0+Z2V0Q1RGb250KCkgOiBuaWw7CisgICAgZW5jb2RlciA8 PCBzdGF0aWNfY2FzdDxib29sPihjdEZvbnQpOwogICAgIGlmIChjdEZvbnQpCiAgICAgICAgIGVu Y29kZXIgPDwgKF9fYnJpZGdlIENvY29hRm9udCAqKWN0Rm9udDsKIH0KIAotYm9vbCBBcmd1bWVu dENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBPcHRpb25hbDxS ZWY8V2ViQ29yZTo6Rm9udD4+JiYgZXhpc3RpbmdGb250KQogewogICAgIGJvb2wgaGFzUGxhdGZv cm1Gb250OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzUGxhdGZvcm1Gb250KSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgaWYg KCFoYXNQbGF0Zm9ybUZvbnQpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4g V1RGTW92ZShleGlzdGluZ0ZvbnQpOwogCiAgICAgUmV0YWluUHRyPENvY29hRm9udD4gZm9udDsK ICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGZvbnQpKQotICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBoYW5kbGUuZm9udCA9IEZv bnQ6OmNyZWF0ZSh7IChfX2JyaWRnZSBDVEZvbnRSZWYpZm9udC5nZXQoKSwgc3RhdGljX2Nhc3Q8 ZmxvYXQ+KFtmb250IHBvaW50U2l6ZV0pIH0pOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVy biBGb250OjpjcmVhdGUoeyAoX19icmlkZ2UgQ1RGb250UmVmKWZvbnQuZ2V0KCksIHN0YXRpY19j YXN0PGZsb2F0PihbZm9udCBwb2ludFNpemVdKSB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSVBD CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMu Y3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAppbmRl eCA3MTI3Zjk5YWJlNThhMWRjMzQyOTlhMjBmNTBkYzg5YmQ2ZWIzMGQ5Li4zMjQ2ZDI4NzRiYTI5 OTE2NjU0ZGE4YmU4OWMzM2M1NTU5YWYwNzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTExODAsNjkgKzExODAsNTggQEAgYm9vbCBB cmd1bWVudENvZGVyPE5hdGl2ZUltYWdlSGFuZGxlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIs IE5hdGl2ZUltYWdlSGFuZGwKICAgICByZXR1cm4gZGVjb2RlT3B0aW9uYWxOYXRpdmVJbWFnZShk ZWNvZGVyLCBpbWFnZUhhbmRsZS5pbWFnZSk7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRs ZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl ciwgY29uc3QgUmVmPFdlYkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGVuY29kZXIgPDwgISFo YW5kbGUuZm9udDsKLSAgICBpZiAoIWhhbmRsZS5mb250KQotICAgICAgICByZXR1cm47Ci0KLSAg ICBhdXRvKiBmb250RmFjZURhdGEgPSBoYW5kbGUuZm9udC0+Zm9udEZhY2VEYXRhKCk7Ci0gICAg ZW5jb2RlciA8PCAhIWZvbnRGYWNlRGF0YTsKKyAgICBhdXRvKiBmb250RmFjZURhdGEgPSBmb250 LT5mb250RmFjZURhdGEoKTsKKyAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KGZvbnRG YWNlRGF0YSk7CiAgICAgaWYgKGZvbnRGYWNlRGF0YSkgewogICAgICAgICBlbmNvZGVTaGFyZWRC dWZmZXIoZW5jb2RlciwgZm9udEZhY2VEYXRhKTsKLSAgICAgICAgYXV0byYgZGF0YSA9IGhhbmRs ZS5mb250LT5wbGF0Zm9ybURhdGEoKTsKKyAgICAgICAgYXV0byYgZGF0YSA9IGZvbnQtPnBsYXRm b3JtRGF0YSgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc2l6ZSgpOwogICAgICAgICBlbmNv ZGVyIDw8IGRhdGEuc3ludGhldGljQm9sZCgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc3lu dGhldGljT2JsaXF1ZSgpOwogICAgIH0KIAotICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVy LCBoYW5kbGUpOworICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVyLCBmb250KTsKIH0KIAot Ym9vbCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIE9wdGlvbmFsPGJvb2w+ IGhhc0ZvbnQ7Ci0gICAgZGVjb2RlciA+PiBoYXNGb250OwotICAgIGlmICghaGFzRm9udC5oYXNW YWx1ZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoIWhhc0ZvbnQudmFsdWUo KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KICAgICBPcHRpb25hbDxib29sPiBoYXNGb250RmFj ZURhdGE7CiAgICAgZGVjb2RlciA+PiBoYXNGb250RmFjZURhdGE7CiAgICAgaWYgKCFoYXNGb250 RmFjZURhdGEuaGFzVmFsdWUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCisgICAgT3B0aW9uYWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiByZXN1 bHQ7CiAgICAgaWYgKGhhc0ZvbnRGYWNlRGF0YS52YWx1ZSgpKSB7CiAgICAgICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IGZvbnRGYWNlRGF0YTsKICAgICAgICAgaWYgKCFkZWNvZGVTaGFyZWRCdWZm ZXIoZGVjb2RlciwgZm9udEZhY2VEYXRhKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAgaWYgKCFmb250RmFjZURh dGEpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGZsb2F0PiBmb250U2l6ZTsKICAgICAgICAgZGVj b2RlciA+PiBmb250U2l6ZTsKICAgICAgICAgaWYgKCFmb250U2l6ZSkKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAg T3B0aW9uYWw8Ym9vbD4gc3ludGhldGljQm9sZDsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0 aWNCb2xkOwogICAgICAgICBpZiAoIXN5bnRoZXRpY0JvbGQpCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlv bmFsPGJvb2w+IHN5bnRoZXRpY0l0YWxpYzsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNJ dGFsaWM7CiAgICAgICAgIGlmICghc3ludGhldGljSXRhbGljKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgICAgICBGb250 RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CiAgICAgICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVk U2l6ZSgqZm9udFNpemUpOwotICAgICAgICBoYW5kbGUgPSB7IGZvbnRGYWNlRGF0YS5yZWxlYXNl Tm9uTnVsbCgpLCBGb250OjpPcmlnaW46OlJlbW90ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9s ZCwgKnN5bnRoZXRpY0l0YWxpYyB9OworICAgICAgICByZXN1bHQgPSBGb250OjpjcmVhdGUoZm9u dEZhY2VEYXRhLnJlbGVhc2VOb25OdWxsKCksIEZvbnQ6Ok9yaWdpbjo6UmVtb3RlLCAqZm9udFNp emUsICpzeW50aGV0aWNCb2xkLCAqc3ludGhldGljSXRhbGljKTsKICAgICB9CiAKLSAgICByZXR1 cm4gZGVjb2RlUGxhdGZvcm1EYXRhKGRlY29kZXIsIGhhbmRsZSk7CisgICAgcmV0dXJuIGRlY29k ZVBsYXRmb3JtRGF0YShkZWNvZGVyLCBXVEZNb3ZlKHJlc3VsdCkpOwogfQogCiB2b2lkIEFyZ3Vt ZW50Q29kZXI8Q3Vyc29yPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEN1cnNvciYg Y3Vyc29yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApp bmRleCBhOWY4NmQyOGY4ODhiNWQwYThiMDg3NDM5N2U5NDQxNmE2OGI0NjJjLi4yODYyMTljMDY1 ZDdmZjlmYTA0M2ZhYWYxYzJlNzM3YjRhNmExNDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApAQCAtOTQsNyArOTQsNyBAQCBjbGFzcyBGbG9hdFJl Y3Q7CiBjbGFzcyBGbG9hdFJvdW5kZWRSZWN0OwogY2xhc3MgRmxvYXRTaXplOwogY2xhc3MgRml4 ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHM7Ci1jbGFzcyBGb250SGFuZGxlOworY2xhc3Mg Rm9udDsKIGNsYXNzIEhUVFBIZWFkZXJNYXA7CiBjbGFzcyBJbWFnZUhhbmRsZTsKIGNsYXNzIElu dFBvaW50OwpAQCAtNDA3LDExICs0MDcsMTEgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRD b2RlcjxXZWJDb3JlOjpDdXJzb3I+IHsKICAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJv b2wgZGVjb2RlKERlY29kZXImLCBXZWJDb3JlOjpDdXJzb3ImKTsKIH07CiAKLXRlbXBsYXRlPD4g c3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Rm9udEhhbmRsZT4gewotICAgIHN0YXRpYyB2 b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6Rm9udEhhbmRsZSYpOwotICAgIHN0 YXRpYyBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGUoRGVjb2RlciYsIFdlYkNvcmU6OkZv bnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYs IGNvbnN0IFdlYkNvcmU6OkZvbnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVU VVJOIGJvb2wgZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImLCBXZWJDb3JlOjpGb250SGFuZGxl Jik7Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj4g eworICAgIHN0YXRpYyB2b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgUmVmPFdlYkNvcmU6OkZv bnQ+Jik7CisgICAgc3RhdGljIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4gZGVjb2RlKERl Y29kZXImKTsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYsIGNv bnN0IFJlZjxXZWJDb3JlOjpGb250PiYpOworICAgIHN0YXRpYyBPcHRpb25hbDxSZWY8V2ViQ29y ZTo6Rm9udD4+IGRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiwgT3B0aW9uYWw8UmVmPFdlYkNv cmU6OkZvbnQ+PiYmKTsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2Vi Q29yZTo6SW1hZ2VIYW5kbGU+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2N1 cmwvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9j dXJsL1dlYkNvcmVBcmd1bWVudENvZGVyc0N1cmwuY3BwCmluZGV4IDg5ZjZlNjFkNjU1NWRhNDdi NGQwMDBmMDkyYThiMjkwNmFkMGY3YTQuLjY5NGI2ODQyOTQ3MDY0YjRiZmIyMjU1ZTY4YTVjYjNl OGMwMjMwODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2N1cmwvV2ViQ29yZUFy Z3VtZW50Q29kZXJzQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvY3VybC9XZWJD b3JlQXJndW1lbnRDb2RlcnNDdXJsLmNwcApAQCAtMjM1LDE1ICsyMzUsMTUgQEAgYm9vbCBBcmd1 bWVudENvZGVyPERpY3Rpb25hcnlQb3B1cEluZm8+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2Rl ciYsIERpY3Rpb25hcnkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2Rl cjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBGb250SGFu ZGxlJikKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEo RW5jb2RlciYsIGNvbnN0IFJlZjxXZWJDb3JlOjpGb250PiYpCiB7CiAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CiB9CiAKLWJvb2wgQXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlUGxh dGZvcm1EYXRhKERlY29kZXImLCBGb250SGFuZGxlJikKK09wdGlvbmFsPEZvbnRQbGF0Zm9ybURh dGE+IEFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXIm KQogewogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICBy ZXR1cm4gV1RGOjpudWxsb3B0OwogfQogCiAjaWYgRU5BQkxFKFZJREVPKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcCBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAK aW5kZXggZjgyMTFiYmM0YTE2ZWQyNDBhOWM5N2E2Y2MzNzExY2UzY2YxNmM4My4uMTVhYzQ2ZDYy ZjY5N2VhOGY0MjdmNjIyOTJjMDZkNzFhZTU4ZWExNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCkBAIC0yNTIs MTUgKzI1MiwxNSBAQCBib29sIEFyZ3VtZW50Q29kZXI8RGljdGlvbmFyeVBvcHVwSW5mbz46OmRl Y29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiwgRGljdGlvbmFyeQogICAgIHJldHVybiBmYWxzZTsK IH0KIAotdm9pZCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjplbmNvZGVQbGF0Zm9ybURhdGEo RW5jb2RlciYsIGNvbnN0IEZvbnRIYW5kbGUmKQordm9pZCBBcmd1bWVudENvZGVyPFJlZjxGb250 Pj46OmVuY29kZVBsYXRmb3JtRGF0YShFbmNvZGVyJiwgY29uc3QgUmVmPFdlYkNvcmU6OkZvbnQ+ JikKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotYm9vbCBBcmd1bWVudENvZGVy PEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYsIEZvbnRIYW5kbGUmKQor T3B0aW9uYWw8Rm9udFBsYXRmb3JtRGF0YT4gQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNv ZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYpCiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0g ICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiB9CiAKICNpZiBFTkFC TEUoVklERU8pCg== 409973 2020-09-29 01:21:53 -0700 2020-09-29 21:36:32 -0700 Patch for committing bug-217076-20200929012152.patch text/plain 15026 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uZGQ4ZTIxMzZmNzJiMGFmMDAzMDYyYWIxNTMyZTg5 NzYyMzE4OTMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFRoZSBvbmx5IHJlYXNvbiBGb250SGFuZGxlIGV4aXN0cyBpcyB0byBiZSBh biBpbnRlcm5hbGx5LW51bGxhYmxlIHdyYXBwZXIgYXJvdW5kIFdlYkNvcmU6OkZvbnQuCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgY29kZXBhdGggaXMgb25seSBldmVyIGludm9rZWQgd2l0aCBub24t bnVsbCBmb250cywgc28gdGhlcmUncyBubyBwb2ludCBpbiBoYXZpbmcKKyAgICAgICAgdGhpcyB3 cmFwcGVyLiBUaGlzIHBhdGNoIHJlcGxhY2VzIGl0IHdpdGgganVzdCBSZWY8Rm9udD4uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgor CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250SGFuZGxlOjpGb250SGFuZGxlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjplbmNvZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmRlY29kZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaDoKKwogMjAyMC0w OS0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBb R1BVUF0gT3V0LW9mLWJhbmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0NDFlZGE5MmIxYjhhZjMw ZTI2ZTJhNjg2YTA0Y2I2YzIwMGUxYTBhLi42YjgwMDk2ZjE3ZDAwNGNlMDIwYWRjMmNjMTM4ZjA2 MzYyYjdkNGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTI4ICBNeWxlcyBD LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNz XSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgor CisgICAgICAgICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgor ICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxGb250Pj46OmVuY29kZVBsYXRmb3JtRGF0 YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZv cm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2Rl UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS ZWY8Rm9udD4+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpjcmVhdGVGb250KToKKyAgICAgICAg KElQQzo6QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUpOgorICAgICAgICAoSVBDOjpB cmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoSVBD OjpBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKwogMjAyMC0wOS0yOCAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gT3V0LW9mLWJh bmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApp bmRleCBiOWRkNzExYTI5MzZiZGIwYzM2OWYwOGNlOTA3NThlZWQ0ZDFkN2NiLi5iOGZkZTU3Y2Jj YTk1MzAwODVhMDJmNzdhMTM3YjcxNTQ4ZmU5NTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250LmNwcApAQCAtNTcsNiArNTcsMTUgQEAgY29uc3QgZmxvYXQgZW1waGFz aXNNYXJrRm9udFNpemVNdWx0aXBsaWVyID0gMC41ZjsKIAogREVGSU5FX0FMTE9DQVRPUl9XSVRI X0hFQVBfSURFTlRJRklFUihGb250KTsKIAorUmVmPEZvbnQ+IEZvbnQ6OmNyZWF0ZShSZWY8U2hh cmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9u dFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCit7CisgICAg Ym9vbCB3cmFwcGluZzsKKyAgICBhdXRvIGN1c3RvbUZvbnREYXRhID0gQ2FjaGVkRm9udDo6Y3Jl YXRlQ3VzdG9tRm9udERhdGEoZm9udEZhY2VEYXRhLmdldCgpLCB7IH0sIHdyYXBwaW5nKTsKKyAg ICBGb250RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CisgICAgZGVzY3JpcHRpb24uc2V0Q29tcHV0 ZWRTaXplKGZvbnRTaXplKTsKKyAgICByZXR1cm4gRm9udDo6Y3JlYXRlKENhY2hlZEZvbnQ6OnBs YXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKCpjdXN0b21Gb250RGF0YSwgZGVzY3JpcHRpb24sIHN5 bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYywgeyB9LCB7IH0pLCBvcmlnaW4pOworfQorCiBG b250OjpGb250KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSwgT3JpZ2luIG9y aWdpbiwgSW50ZXJzdGl0aWFsIGludGVyc3RpdGlhbCwgVmlzaWJpbGl0eSB2aXNpYmlsaXR5LCBP cmllbnRhdGlvbkZhbGxiYWNrIG9yaWVudGF0aW9uRmFsbGJhY2spCiAgICAgOiBtX3BsYXRmb3Jt RGF0YShwbGF0Zm9ybURhdGEpCiAgICAgLCBtX29yaWdpbihvcmlnaW4pCkBAIC03MTEsMTMgKzcy MCw0IEBAIHZvaWQgRm9udDo6c2V0Rm9udEZhY2VEYXRhKFJlZlB0cjxTaGFyZWRCdWZmZXI+JiYg Zm9udEZhY2VEYXRhKQogICAgIG1fZm9udEZhY2VEYXRhID0gV1RGTW92ZShmb250RmFjZURhdGEp OwogfQogCi1Gb250SGFuZGxlOjpGb250SGFuZGxlKFJlZjxTaGFyZWRCdWZmZXI+JiYgZm9udEZh Y2VEYXRhLCBGb250OjpPcmlnaW4gb3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0 aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYykKLXsKLSAgICBib29sIHdyYXBwaW5nOwotICAg IGF1dG8gY3VzdG9tRm9udERhdGEgPSBDYWNoZWRGb250OjpjcmVhdGVDdXN0b21Gb250RGF0YShm b250RmFjZURhdGEuZ2V0KCksIHsgfSwgd3JhcHBpbmcpOwotICAgIEZvbnREZXNjcmlwdGlvbiBk ZXNjcmlwdGlvbjsKLSAgICBkZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZm9udFNpemUpOwot ICAgIGZvbnQgPSBGb250OjpjcmVhdGUoQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3Rv bURhdGEoKmN1c3RvbUZvbnREYXRhLCBkZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCB7IH0sIHsgfSksIG9yaWdpbik7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCA3NzkzM2E2ODBj Njc0MDhiNzg3YTU2N2NlOTg0NzFmMmFlYmNiNzg1Li45MGU3YmMwNzkwYWQwNGRmMTdjMmZjNzdk YjMxODQzNTJiZjBjNTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5o CkBAIC05NCw2ICs5NCw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IEZvbnQocGxhdGZvcm1EYXRhLCBvcmlnaW4sIGludGVyc3RpdGlhbCwgdmlzaWJpbGl0 eSwgb3JpZW50YXRpb25GYWxsYmFjaykpOwogICAgIH0KKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgUmVmPEZvbnQ+IGNyZWF0ZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9u dDo6T3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRo ZXRpY0l0YWxpYyk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB+Rm9udCgpOwogCkBAIC0zMjgsMTQg KzMyOSw2IEBAIHByaXZhdGU6CiAjZW5kaWYKIH07CiAKLWNsYXNzIEZvbnRIYW5kbGUgewotcHVi bGljOgotICAgIEZvbnRIYW5kbGUoKSA9IGRlZmF1bHQ7Ci0gICAgV0VCQ09SRV9FWFBPUlQgRm9u dEhhbmRsZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luLCBm bG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYyk7 Ci0KLSAgICBSZWZQdHI8Rm9udD4gZm9udDsKLX07Ci0KICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogYm9vbCBmb250RmFtaWx5U2hvdWxkTm90QmVVc2VkRm9yQXJhYmljKENGU3RyaW5nUmVmKTsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlz cGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmgKaW5kZXggYjQ1ZTc5NzcyNThj ZTRjYWMxNWFhNzY3YjkzYjZlZmRiMjQ4ZTZlZC4uNWEyMjc1OWUxMzllMWE5NWIzY2Y0YzBkYzgx NzdkYTVkOWRiODU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCkBAIC0xMDkz LDkgKzEwOTMsNyBAQCBwcml2YXRlOgogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQgRHJh d0dseXBoczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgRm9udEhhbmRs ZSBoYW5kbGU7Ci0gICAgaGFuZGxlLmZvbnQgPSBtX2ZvbnQucHRyKCk7Ci0gICAgZW5jb2RlciA8 PCBoYW5kbGU7CisgICAgZW5jb2RlciA8PCBtX2ZvbnQ7CiAgICAgZW5jb2RlciA8PCBtX2dseXBo czsKICAgICBlbmNvZGVyIDw8IG1fYWR2YW5jZXM7CiAgICAgZW5jb2RlciA8PCBtX2Jsb2NrTG9j YXRpb247CkBAIC0xMTA2LDkgKzExMDQsOSBAQCB2b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4KIE9wdGlvbmFsPFJl ZjxEcmF3R2x5cGhzPj4gRHJhd0dseXBoczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0g ICAgT3B0aW9uYWw8Rm9udEhhbmRsZT4gaGFuZGxlOwotICAgIGRlY29kZXIgPj4gaGFuZGxlOwot ICAgIGlmICghaGFuZGxlIHx8ICFoYW5kbGUtPmZvbnQpCisgICAgT3B0aW9uYWw8UmVmPEZvbnQ+ PiBmb250OworICAgIGRlY29kZXIgPj4gZm9udDsKKyAgICBpZiAoIWZvbnQpCiAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBPcHRpb25hbDxWZWN0b3I8R2x5cGhCdWZmZXJHbHlw aCwgMTI4Pj4gZ2x5cGhzOwpAQCAtMTEzOSw3ICsxMTM3LDcgQEAgT3B0aW9uYWw8UmVmPERyYXdH bHlwaHM+PiBEcmF3R2x5cGhzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICBpZiAoIXNt b290aGluZ01vZGUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICByZXR1cm4g RHJhd0dseXBoczo6Y3JlYXRlKGhhbmRsZS0+Zm9udC5yZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3Zl KCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0aW9uLCAqbG9jYWxBbmNo b3IsICpzbW9vdGhpbmdNb2RlKTsKKyAgICByZXR1cm4gRHJhd0dseXBoczo6Y3JlYXRlKGZvbnQt PmdldCgpLCBXVEZNb3ZlKCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0 aW9uLCAqbG9jYWxBbmNob3IsICpzbW9vdGhpbmdNb2RlKTsKIH0KIAogY2xhc3MgRHJhd0ltYWdl IDogcHVibGljIERyYXdpbmdJdGVtIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXggZGVlMDMyMWJhYzBj NGU2YWY1MzIzNTRkOGZjYTlhODRiNTgxZDM4ZC4uNmRlNWRjYzE0NjY0YzFkZTYyNjM3YzZmN2Qx NzZiYTgxMjA2MjZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwNywyOSArNTA3LDI4IEBAIE9w dGlvbmFsPEZvbnRBdHRyaWJ1dGVzPiBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZvbnRBdHRyaWJ1 dGVzPjo6ZGVjb2RlUGxhdGZvcm1ECiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9CiAKLXZvaWQg QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRsZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8 Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgUmVmPFdl YkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGF1dG8gY3RGb250ID0gaGFuZGxlLmZvbnQgJiYg IWhhbmRsZS5mb250LT5mb250RmFjZURhdGEoKSA/IGhhbmRsZS5mb250LT5nZXRDVEZvbnQoKSA6 IG5pbDsKLSAgICBlbmNvZGVyIDw8ICEhY3RGb250OworICAgIGF1dG8gY3RGb250ID0gIWZvbnQt PmZvbnRGYWNlRGF0YSgpID8gZm9udC0+Z2V0Q1RGb250KCkgOiBuaWw7CisgICAgZW5jb2RlciA8 PCBzdGF0aWNfY2FzdDxib29sPihjdEZvbnQpOwogICAgIGlmIChjdEZvbnQpCiAgICAgICAgIGVu Y29kZXIgPDwgKF9fYnJpZGdlIENvY29hRm9udCAqKWN0Rm9udDsKIH0KIAotYm9vbCBBcmd1bWVu dENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBPcHRpb25hbDxS ZWY8V2ViQ29yZTo6Rm9udD4+JiYgZXhpc3RpbmdGb250KQogewogICAgIGJvb2wgaGFzUGxhdGZv cm1Gb250OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzUGxhdGZvcm1Gb250KSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgaWYg KCFoYXNQbGF0Zm9ybUZvbnQpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4g V1RGTW92ZShleGlzdGluZ0ZvbnQpOwogCiAgICAgUmV0YWluUHRyPENvY29hRm9udD4gZm9udDsK ICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGZvbnQpKQotICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBoYW5kbGUuZm9udCA9IEZv bnQ6OmNyZWF0ZSh7IChfX2JyaWRnZSBDVEZvbnRSZWYpZm9udC5nZXQoKSwgc3RhdGljX2Nhc3Q8 ZmxvYXQ+KFtmb250IHBvaW50U2l6ZV0pIH0pOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVy biBGb250OjpjcmVhdGUoeyAoX19icmlkZ2UgQ1RGb250UmVmKWZvbnQuZ2V0KCksIHN0YXRpY19j YXN0PGZsb2F0PihbZm9udCBwb2ludFNpemVdKSB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSVBD CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMu Y3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAppbmRl eCA3MTI3Zjk5YWJlNThhMWRjMzQyOTlhMjBmNTBkYzg5YmQ2ZWIzMGQ5Li4zMjQ2ZDI4NzRiYTI5 OTE2NjU0ZGE4YmU4OWMzM2M1NTU5YWYwNzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTExODAsNjkgKzExODAsNTggQEAgYm9vbCBB cmd1bWVudENvZGVyPE5hdGl2ZUltYWdlSGFuZGxlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIs IE5hdGl2ZUltYWdlSGFuZGwKICAgICByZXR1cm4gZGVjb2RlT3B0aW9uYWxOYXRpdmVJbWFnZShk ZWNvZGVyLCBpbWFnZUhhbmRsZS5pbWFnZSk7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRs ZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl ciwgY29uc3QgUmVmPFdlYkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGVuY29kZXIgPDwgISFo YW5kbGUuZm9udDsKLSAgICBpZiAoIWhhbmRsZS5mb250KQotICAgICAgICByZXR1cm47Ci0KLSAg ICBhdXRvKiBmb250RmFjZURhdGEgPSBoYW5kbGUuZm9udC0+Zm9udEZhY2VEYXRhKCk7Ci0gICAg ZW5jb2RlciA8PCAhIWZvbnRGYWNlRGF0YTsKKyAgICBhdXRvKiBmb250RmFjZURhdGEgPSBmb250 LT5mb250RmFjZURhdGEoKTsKKyAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KGZvbnRG YWNlRGF0YSk7CiAgICAgaWYgKGZvbnRGYWNlRGF0YSkgewogICAgICAgICBlbmNvZGVTaGFyZWRC dWZmZXIoZW5jb2RlciwgZm9udEZhY2VEYXRhKTsKLSAgICAgICAgYXV0byYgZGF0YSA9IGhhbmRs ZS5mb250LT5wbGF0Zm9ybURhdGEoKTsKKyAgICAgICAgYXV0byYgZGF0YSA9IGZvbnQtPnBsYXRm b3JtRGF0YSgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc2l6ZSgpOwogICAgICAgICBlbmNv ZGVyIDw8IGRhdGEuc3ludGhldGljQm9sZCgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc3lu dGhldGljT2JsaXF1ZSgpOwogICAgIH0KIAotICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVy LCBoYW5kbGUpOworICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVyLCBmb250KTsKIH0KIAot Ym9vbCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIE9wdGlvbmFsPGJvb2w+ IGhhc0ZvbnQ7Ci0gICAgZGVjb2RlciA+PiBoYXNGb250OwotICAgIGlmICghaGFzRm9udC5oYXNW YWx1ZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoIWhhc0ZvbnQudmFsdWUo KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KICAgICBPcHRpb25hbDxib29sPiBoYXNGb250RmFj ZURhdGE7CiAgICAgZGVjb2RlciA+PiBoYXNGb250RmFjZURhdGE7CiAgICAgaWYgKCFoYXNGb250 RmFjZURhdGEuaGFzVmFsdWUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCisgICAgT3B0aW9uYWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiByZXN1 bHQ7CiAgICAgaWYgKGhhc0ZvbnRGYWNlRGF0YS52YWx1ZSgpKSB7CiAgICAgICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IGZvbnRGYWNlRGF0YTsKICAgICAgICAgaWYgKCFkZWNvZGVTaGFyZWRCdWZm ZXIoZGVjb2RlciwgZm9udEZhY2VEYXRhKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAgaWYgKCFmb250RmFjZURh dGEpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGZsb2F0PiBmb250U2l6ZTsKICAgICAgICAgZGVj b2RlciA+PiBmb250U2l6ZTsKICAgICAgICAgaWYgKCFmb250U2l6ZSkKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAg T3B0aW9uYWw8Ym9vbD4gc3ludGhldGljQm9sZDsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0 aWNCb2xkOwogICAgICAgICBpZiAoIXN5bnRoZXRpY0JvbGQpCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlv bmFsPGJvb2w+IHN5bnRoZXRpY0l0YWxpYzsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNJ dGFsaWM7CiAgICAgICAgIGlmICghc3ludGhldGljSXRhbGljKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgICAgICBGb250 RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CiAgICAgICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVk U2l6ZSgqZm9udFNpemUpOwotICAgICAgICBoYW5kbGUgPSB7IGZvbnRGYWNlRGF0YS5yZWxlYXNl Tm9uTnVsbCgpLCBGb250OjpPcmlnaW46OlJlbW90ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9s ZCwgKnN5bnRoZXRpY0l0YWxpYyB9OworICAgICAgICByZXN1bHQgPSBGb250OjpjcmVhdGUoZm9u dEZhY2VEYXRhLnJlbGVhc2VOb25OdWxsKCksIEZvbnQ6Ok9yaWdpbjo6UmVtb3RlLCAqZm9udFNp emUsICpzeW50aGV0aWNCb2xkLCAqc3ludGhldGljSXRhbGljKTsKICAgICB9CiAKLSAgICByZXR1 cm4gZGVjb2RlUGxhdGZvcm1EYXRhKGRlY29kZXIsIGhhbmRsZSk7CisgICAgcmV0dXJuIGRlY29k ZVBsYXRmb3JtRGF0YShkZWNvZGVyLCBXVEZNb3ZlKHJlc3VsdCkpOwogfQogCiB2b2lkIEFyZ3Vt ZW50Q29kZXI8Q3Vyc29yPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEN1cnNvciYg Y3Vyc29yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApp bmRleCBhOWY4NmQyOGY4ODhiNWQwYThiMDg3NDM5N2U5NDQxNmE2OGI0NjJjLi4yODYyMTljMDY1 ZDdmZjlmYTA0M2ZhYWYxYzJlNzM3YjRhNmExNDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApAQCAtOTQsNyArOTQsNyBAQCBjbGFzcyBGbG9hdFJl Y3Q7CiBjbGFzcyBGbG9hdFJvdW5kZWRSZWN0OwogY2xhc3MgRmxvYXRTaXplOwogY2xhc3MgRml4 ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHM7Ci1jbGFzcyBGb250SGFuZGxlOworY2xhc3Mg Rm9udDsKIGNsYXNzIEhUVFBIZWFkZXJNYXA7CiBjbGFzcyBJbWFnZUhhbmRsZTsKIGNsYXNzIElu dFBvaW50OwpAQCAtNDA3LDExICs0MDcsMTEgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRD b2RlcjxXZWJDb3JlOjpDdXJzb3I+IHsKICAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJv b2wgZGVjb2RlKERlY29kZXImLCBXZWJDb3JlOjpDdXJzb3ImKTsKIH07CiAKLXRlbXBsYXRlPD4g c3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Rm9udEhhbmRsZT4gewotICAgIHN0YXRpYyB2 b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6Rm9udEhhbmRsZSYpOwotICAgIHN0 YXRpYyBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGUoRGVjb2RlciYsIFdlYkNvcmU6OkZv bnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYs IGNvbnN0IFdlYkNvcmU6OkZvbnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVU VVJOIGJvb2wgZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImLCBXZWJDb3JlOjpGb250SGFuZGxl Jik7Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj4g eworICAgIHN0YXRpYyB2b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgUmVmPFdlYkNvcmU6OkZv bnQ+Jik7CisgICAgc3RhdGljIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4gZGVjb2RlKERl Y29kZXImKTsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYsIGNv bnN0IFJlZjxXZWJDb3JlOjpGb250PiYpOworICAgIHN0YXRpYyBPcHRpb25hbDxSZWY8V2ViQ29y ZTo6Rm9udD4+IGRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiwgT3B0aW9uYWw8UmVmPFdlYkNv cmU6OkZvbnQ+PiYmKTsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2Vi Q29yZTo6SW1hZ2VIYW5kbGU+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2N1 cmwvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9j dXJsL1dlYkNvcmVBcmd1bWVudENvZGVyc0N1cmwuY3BwCmluZGV4IDg5ZjZlNjFkNjU1NWRhNDdi NGQwMDBmMDkyYThiMjkwNmFkMGY3YTQuLmU2OTk5MWNjZTRmZjNjZWE3Njk2ZTJkOWY0MTgyYjg1 ZDE1NTFkYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2N1cmwvV2ViQ29yZUFy Z3VtZW50Q29kZXJzQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvY3VybC9XZWJD b3JlQXJndW1lbnRDb2RlcnNDdXJsLmNwcApAQCAtMjM1LDE1ICsyMzUsMTUgQEAgYm9vbCBBcmd1 bWVudENvZGVyPERpY3Rpb25hcnlQb3B1cEluZm8+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2Rl ciYsIERpY3Rpb25hcnkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2Rl cjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBGb250SGFu ZGxlJikKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEo RW5jb2RlciYsIGNvbnN0IFJlZjxGb250PiYpCiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiB9CiAKLWJvb2wgQXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRh KERlY29kZXImLCBGb250SGFuZGxlJikKK09wdGlvbmFsPFJlZjxGb250Pj4gQXJndW1lbnRDb2Rl cjxSZWY8Rm9udD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYpCiB7CiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBXVEY6Om51bGxv cHQ7CiB9CiAKICNpZiBFTkFCTEUoVklERU8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwIGIvU291cmNlL1dlYktpdC9T aGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNTb3VwLmNwcAppbmRleCBmODIxMWJiYzRh MTZlZDI0MGE5Yzk3YTZjYzM3MTFjZTNjZjE2YzgzLi4wZWIzNmU5MDcwZWI2ZTU5NTFlY2U2M2Y3 NDgyMWEwZGMxOGVlNjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9zb3VwL1dl YkNvcmVBcmd1bWVudENvZGVyc1NvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3Nv dXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5jcHAKQEAgLTI1MiwxNSArMjUyLDE1IEBAIGJv b2wgQXJndW1lbnRDb2RlcjxEaWN0aW9uYXJ5UG9wdXBJbmZvPjo6ZGVjb2RlUGxhdGZvcm1EYXRh KERlY29kZXImLCBEaWN0aW9uYXJ5CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEFyZ3Vt ZW50Q29kZXI8Rm9udEhhbmRsZT46OmVuY29kZVBsYXRmb3JtRGF0YShFbmNvZGVyJiwgY29uc3Qg Rm9udEhhbmRsZSYpCit2b2lkIEFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZW5jb2RlUGxhdGZv cm1EYXRhKEVuY29kZXImLCBjb25zdCBSZWY8Rm9udD4mKQogewogICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogfQogCi1ib29sIEFyZ3VtZW50Q29kZXI8Rm9udEhhbmRsZT46OmRlY29kZVBsYXRm b3JtRGF0YShEZWNvZGVyJiwgRm9udEhhbmRsZSYpCitPcHRpb25hbDxSZWY8Rm9udD4+IEFyZ3Vt ZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImKQogewogICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gV1RG OjpudWxsb3B0OwogfQogCiAjaWYgRU5BQkxFKFZJREVPKQo= 410093 2020-09-29 21:36:17 -0700 2020-09-30 00:02:14 -0700 Patch for committing bug-217076-20200929213616.patch text/plain 15090 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZjYzQyMmJjOTdiZTAx MDA0MTRlM2I4M2RlYmVkZDBiMTU2MGNmMy4uZGQ4ZTIxMzZmNzJiMGFmMDAzMDYyYWIxNTMyZTg5 NzYyMzE4OTMwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9j ZXNzXSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIFRoZSBvbmx5IHJlYXNvbiBGb250SGFuZGxlIGV4aXN0cyBpcyB0byBiZSBh biBpbnRlcm5hbGx5LW51bGxhYmxlIHdyYXBwZXIgYXJvdW5kIFdlYkNvcmU6OkZvbnQuCisgICAg ICAgIEhvd2V2ZXIsIHRoaXMgY29kZXBhdGggaXMgb25seSBldmVyIGludm9rZWQgd2l0aCBub24t bnVsbCBmb250cywgc28gdGhlcmUncyBubyBwb2ludCBpbiBoYXZpbmcKKyAgICAgICAgdGhpcyB3 cmFwcGVyLiBUaGlzIHBhdGNoIHJlcGxhY2VzIGl0IHdpdGgganVzdCBSZWY8Rm9udD4uCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgor CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq IGxvYWRlci9jYWNoZS9DYWNoZWRGb250Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250SGFuZGxlOjpGb250SGFuZGxlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjplbmNvZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmRlY29kZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDdXN0b21QbGF0Zm9ybURhdGEuaDoKKwogMjAyMC0w OS0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBb R1BVUF0gT3V0LW9mLWJhbmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0NDFlZGE5MmIxYjhhZjMw ZTI2ZTJhNjg2YTA0Y2I2YzIwMGUxYTBhLi42YjgwMDk2ZjE3ZDAwNGNlMDIwYWRjMmNjMTM4ZjA2 MzYyYjdkNGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTI4ICBNeWxlcyBD LiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNz XSBSZW1vdmUgRm9udEhhbmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE3MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgor CisgICAgICAgICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgor ICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxGb250Pj46OmVuY29kZVBsYXRmb3JtRGF0 YSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPEZvbnQ+Pjo6ZGVjb2RlUGxhdGZv cm1EYXRhKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2Rl UGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS ZWY8Rm9udD4+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpjcmVhdGVGb250KToKKyAgICAgICAg KElQQzo6QXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNvZGUpOgorICAgICAgICAoSVBDOjpB cmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoSVBD OjpBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKwogMjAyMC0wOS0yOCAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gT3V0LW9mLWJh bmQgVGV4dFRyYWNrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApp bmRleCBiOWRkNzExYTI5MzZiZGIwYzM2OWYwOGNlOTA3NThlZWQ0ZDFkN2NiLi5iOGZkZTU3Y2Jj YTk1MzAwODVhMDJmNzdhMTM3YjcxNTQ4ZmU5NTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250LmNwcApAQCAtNTcsNiArNTcsMTUgQEAgY29uc3QgZmxvYXQgZW1waGFz aXNNYXJrRm9udFNpemVNdWx0aXBsaWVyID0gMC41ZjsKIAogREVGSU5FX0FMTE9DQVRPUl9XSVRI X0hFQVBfSURFTlRJRklFUihGb250KTsKIAorUmVmPEZvbnQ+IEZvbnQ6OmNyZWF0ZShSZWY8U2hh cmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luIG9yaWdpbiwgZmxvYXQgZm9u dFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCit7CisgICAg Ym9vbCB3cmFwcGluZzsKKyAgICBhdXRvIGN1c3RvbUZvbnREYXRhID0gQ2FjaGVkRm9udDo6Y3Jl YXRlQ3VzdG9tRm9udERhdGEoZm9udEZhY2VEYXRhLmdldCgpLCB7IH0sIHdyYXBwaW5nKTsKKyAg ICBGb250RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CisgICAgZGVzY3JpcHRpb24uc2V0Q29tcHV0 ZWRTaXplKGZvbnRTaXplKTsKKyAgICByZXR1cm4gRm9udDo6Y3JlYXRlKENhY2hlZEZvbnQ6OnBs YXRmb3JtRGF0YUZyb21DdXN0b21EYXRhKCpjdXN0b21Gb250RGF0YSwgZGVzY3JpcHRpb24sIHN5 bnRoZXRpY0JvbGQsIHN5bnRoZXRpY0l0YWxpYywgeyB9LCB7IH0pLCBvcmlnaW4pOworfQorCiBG b250OjpGb250KGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHBsYXRmb3JtRGF0YSwgT3JpZ2luIG9y aWdpbiwgSW50ZXJzdGl0aWFsIGludGVyc3RpdGlhbCwgVmlzaWJpbGl0eSB2aXNpYmlsaXR5LCBP cmllbnRhdGlvbkZhbGxiYWNrIG9yaWVudGF0aW9uRmFsbGJhY2spCiAgICAgOiBtX3BsYXRmb3Jt RGF0YShwbGF0Zm9ybURhdGEpCiAgICAgLCBtX29yaWdpbihvcmlnaW4pCkBAIC03MTEsMTMgKzcy MCw0IEBAIHZvaWQgRm9udDo6c2V0Rm9udEZhY2VEYXRhKFJlZlB0cjxTaGFyZWRCdWZmZXI+JiYg Zm9udEZhY2VEYXRhKQogICAgIG1fZm9udEZhY2VEYXRhID0gV1RGTW92ZShmb250RmFjZURhdGEp OwogfQogCi1Gb250SGFuZGxlOjpGb250SGFuZGxlKFJlZjxTaGFyZWRCdWZmZXI+JiYgZm9udEZh Y2VEYXRhLCBGb250OjpPcmlnaW4gb3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0 aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYykKLXsKLSAgICBib29sIHdyYXBwaW5nOwotICAg IGF1dG8gY3VzdG9tRm9udERhdGEgPSBDYWNoZWRGb250OjpjcmVhdGVDdXN0b21Gb250RGF0YShm b250RmFjZURhdGEuZ2V0KCksIHsgfSwgd3JhcHBpbmcpOwotICAgIEZvbnREZXNjcmlwdGlvbiBk ZXNjcmlwdGlvbjsKLSAgICBkZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZm9udFNpemUpOwot ICAgIGZvbnQgPSBGb250OjpjcmVhdGUoQ2FjaGVkRm9udDo6cGxhdGZvcm1EYXRhRnJvbUN1c3Rv bURhdGEoKmN1c3RvbUZvbnREYXRhLCBkZXNjcmlwdGlvbiwgc3ludGhldGljQm9sZCwgc3ludGhl dGljSXRhbGljLCB7IH0sIHsgfSksIG9yaWdpbik7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAppbmRleCA3NzkzM2E2ODBj Njc0MDhiNzg3YTU2N2NlOTg0NzFmMmFlYmNiNzg1Li45MGU3YmMwNzkwYWQwNGRmMTdjMmZjNzdk YjMxODQzNTJiZjBjNTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5o CkBAIC05NCw2ICs5NCw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJl ZigqbmV3IEZvbnQocGxhdGZvcm1EYXRhLCBvcmlnaW4sIGludGVyc3RpdGlhbCwgdmlzaWJpbGl0 eSwgb3JpZW50YXRpb25GYWxsYmFjaykpOwogICAgIH0KKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgUmVmPEZvbnQ+IGNyZWF0ZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9u dDo6T3JpZ2luLCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRo ZXRpY0l0YWxpYyk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB+Rm9udCgpOwogCkBAIC0zMjgsMTQg KzMyOSw2IEBAIHByaXZhdGU6CiAjZW5kaWYKIH07CiAKLWNsYXNzIEZvbnRIYW5kbGUgewotcHVi bGljOgotICAgIEZvbnRIYW5kbGUoKSA9IGRlZmF1bHQ7Ci0gICAgV0VCQ09SRV9FWFBPUlQgRm9u dEhhbmRsZShSZWY8U2hhcmVkQnVmZmVyPiYmIGZvbnRGYWNlRGF0YSwgRm9udDo6T3JpZ2luLCBm bG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYyk7 Ci0KLSAgICBSZWZQdHI8Rm9udD4gZm9udDsKLX07Ci0KICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogYm9vbCBmb250RmFtaWx5U2hvdWxkTm90QmVVc2VkRm9yQXJhYmljKENGU3RyaW5nUmVmKTsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlz cGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmgKaW5kZXggYjQ1ZTc5NzcyNThj ZTRjYWMxNWFhNzY3YjkzYjZlZmRiMjQ4ZTZlZC4uNWEyMjc1OWUxMzllMWE5NWIzY2Y0YzBkYzgx NzdkYTVkOWRiODU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5oCkBAIC0xMDkz LDkgKzEwOTMsNyBAQCBwcml2YXRlOgogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4KIHZvaWQgRHJh d0dseXBoczo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgRm9udEhhbmRs ZSBoYW5kbGU7Ci0gICAgaGFuZGxlLmZvbnQgPSBtX2ZvbnQucHRyKCk7Ci0gICAgZW5jb2RlciA8 PCBoYW5kbGU7CisgICAgZW5jb2RlciA8PCBtX2ZvbnQ7CiAgICAgZW5jb2RlciA8PCBtX2dseXBo czsKICAgICBlbmNvZGVyIDw8IG1fYWR2YW5jZXM7CiAgICAgZW5jb2RlciA8PCBtX2Jsb2NrTG9j YXRpb247CkBAIC0xMTA2LDkgKzExMDQsOSBAQCB2b2lkIERyYXdHbHlwaHM6OmVuY29kZShFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4KIE9wdGlvbmFsPFJl ZjxEcmF3R2x5cGhzPj4gRHJhd0dseXBoczo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7Ci0g ICAgT3B0aW9uYWw8Rm9udEhhbmRsZT4gaGFuZGxlOwotICAgIGRlY29kZXIgPj4gaGFuZGxlOwot ICAgIGlmICghaGFuZGxlIHx8ICFoYW5kbGUtPmZvbnQpCisgICAgT3B0aW9uYWw8UmVmPEZvbnQ+ PiBmb250OworICAgIGRlY29kZXIgPj4gZm9udDsKKyAgICBpZiAoIWZvbnQpCiAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICBPcHRpb25hbDxWZWN0b3I8R2x5cGhCdWZmZXJHbHlw aCwgMTI4Pj4gZ2x5cGhzOwpAQCAtMTEzOSw3ICsxMTM3LDcgQEAgT3B0aW9uYWw8UmVmPERyYXdH bHlwaHM+PiBEcmF3R2x5cGhzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICBpZiAoIXNt b290aGluZ01vZGUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICByZXR1cm4g RHJhd0dseXBoczo6Y3JlYXRlKGhhbmRsZS0+Zm9udC5yZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3Zl KCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0aW9uLCAqbG9jYWxBbmNo b3IsICpzbW9vdGhpbmdNb2RlKTsKKyAgICByZXR1cm4gRHJhd0dseXBoczo6Y3JlYXRlKGZvbnQt PmdldCgpLCBXVEZNb3ZlKCpnbHlwaHMpLCBXVEZNb3ZlKCphZHZhbmNlcyksICpibG9ja0xvY2F0 aW9uLCAqbG9jYWxBbmNob3IsICpzbW9vdGhpbmdNb2RlKTsKIH0KIAogY2xhc3MgRHJhd0ltYWdl IDogcHVibGljIERyYXdpbmdJdGVtIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXggZGVlMDMyMWJhYzBj NGU2YWY1MzIzNTRkOGZjYTlhODRiNTgxZDM4ZC4uNmRlNWRjYzE0NjY0YzFkZTYyNjM3YzZmN2Qx NzZiYTgxMjA2MjZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29j b2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwNywyOSArNTA3LDI4IEBAIE9w dGlvbmFsPEZvbnRBdHRyaWJ1dGVzPiBBcmd1bWVudENvZGVyPFdlYkNvcmU6OkZvbnRBdHRyaWJ1 dGVzPjo6ZGVjb2RlUGxhdGZvcm1ECiAgICAgcmV0dXJuIGF0dHJpYnV0ZXM7CiB9CiAKLXZvaWQg QXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRsZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8 Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uc3QgUmVmPFdl YkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGF1dG8gY3RGb250ID0gaGFuZGxlLmZvbnQgJiYg IWhhbmRsZS5mb250LT5mb250RmFjZURhdGEoKSA/IGhhbmRsZS5mb250LT5nZXRDVEZvbnQoKSA6 IG5pbDsKLSAgICBlbmNvZGVyIDw8ICEhY3RGb250OworICAgIGF1dG8gY3RGb250ID0gIWZvbnQt PmZvbnRGYWNlRGF0YSgpID8gZm9udC0+Z2V0Q1RGb250KCkgOiBuaWw7CisgICAgZW5jb2RlciA8 PCBzdGF0aWNfY2FzdDxib29sPihjdEZvbnQpOwogICAgIGlmIChjdEZvbnQpCiAgICAgICAgIGVu Y29kZXIgPDwgKF9fYnJpZGdlIENvY29hRm9udCAqKWN0Rm9udDsKIH0KIAotYm9vbCBBcmd1bWVu dENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyLCBPcHRpb25hbDxS ZWY8V2ViQ29yZTo6Rm9udD4+JiYgZXhpc3RpbmdGb250KQogewogICAgIGJvb2wgaGFzUGxhdGZv cm1Gb250OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzUGxhdGZvcm1Gb250KSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgaWYg KCFoYXNQbGF0Zm9ybUZvbnQpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4g V1RGTW92ZShleGlzdGluZ0ZvbnQpOwogCiAgICAgUmV0YWluUHRyPENvY29hRm9udD4gZm9udDsK ICAgICBpZiAoIUlQQzo6ZGVjb2RlKGRlY29kZXIsIGZvbnQpKQotICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBoYW5kbGUuZm9udCA9IEZv bnQ6OmNyZWF0ZSh7IChfX2JyaWRnZSBDVEZvbnRSZWYpZm9udC5nZXQoKSwgc3RhdGljX2Nhc3Q8 ZmxvYXQ+KFtmb250IHBvaW50U2l6ZV0pIH0pOwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVy biBGb250OjpjcmVhdGUoeyAoX19icmlkZ2UgQ1RGb250UmVmKWZvbnQuZ2V0KCksIHN0YXRpY19j YXN0PGZsb2F0PihbZm9udCBwb2ludFNpemVdKSB9KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSVBD CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMu Y3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAppbmRl eCA3MTI3Zjk5YWJlNThhMWRjMzQyOTlhMjBmNTBkYzg5YmQ2ZWIzMGQ5Li4zMjQ2ZDI4NzRiYTI5 OTE2NjU0ZGE4YmU4OWMzM2M1NTU5YWYwNzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKQEAgLTExODAsNjkgKzExODAsNTggQEAgYm9vbCBB cmd1bWVudENvZGVyPE5hdGl2ZUltYWdlSGFuZGxlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIs IE5hdGl2ZUltYWdlSGFuZGwKICAgICByZXR1cm4gZGVjb2RlT3B0aW9uYWxOYXRpdmVJbWFnZShk ZWNvZGVyLCBpbWFnZUhhbmRsZS5pbWFnZSk7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250 SGFuZGxlPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZvbnRIYW5kbGUmIGhhbmRs ZSkKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl ciwgY29uc3QgUmVmPFdlYkNvcmU6OkZvbnQ+JiBmb250KQogewotICAgIGVuY29kZXIgPDwgISFo YW5kbGUuZm9udDsKLSAgICBpZiAoIWhhbmRsZS5mb250KQotICAgICAgICByZXR1cm47Ci0KLSAg ICBhdXRvKiBmb250RmFjZURhdGEgPSBoYW5kbGUuZm9udC0+Zm9udEZhY2VEYXRhKCk7Ci0gICAg ZW5jb2RlciA8PCAhIWZvbnRGYWNlRGF0YTsKKyAgICBhdXRvKiBmb250RmFjZURhdGEgPSBmb250 LT5mb250RmFjZURhdGEoKTsKKyAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KGZvbnRG YWNlRGF0YSk7CiAgICAgaWYgKGZvbnRGYWNlRGF0YSkgewogICAgICAgICBlbmNvZGVTaGFyZWRC dWZmZXIoZW5jb2RlciwgZm9udEZhY2VEYXRhKTsKLSAgICAgICAgYXV0byYgZGF0YSA9IGhhbmRs ZS5mb250LT5wbGF0Zm9ybURhdGEoKTsKKyAgICAgICAgYXV0byYgZGF0YSA9IGZvbnQtPnBsYXRm b3JtRGF0YSgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc2l6ZSgpOwogICAgICAgICBlbmNv ZGVyIDw8IGRhdGEuc3ludGhldGljQm9sZCgpOwogICAgICAgICBlbmNvZGVyIDw8IGRhdGEuc3lu dGhldGljT2JsaXF1ZSgpOwogICAgIH0KIAotICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVy LCBoYW5kbGUpOworICAgIGVuY29kZVBsYXRmb3JtRGF0YShlbmNvZGVyLCBmb250KTsKIH0KIAot Ym9vbCBBcmd1bWVudENvZGVyPEZvbnRIYW5kbGU+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2Rlciwg Rm9udEhhbmRsZSYgaGFuZGxlKQorT3B0aW9uYWw8UmVmPEZvbnQ+PiBBcmd1bWVudENvZGVyPFJl ZjxGb250Pj46OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIE9wdGlvbmFsPGJvb2w+ IGhhc0ZvbnQ7Ci0gICAgZGVjb2RlciA+PiBoYXNGb250OwotICAgIGlmICghaGFzRm9udC5oYXNW YWx1ZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoIWhhc0ZvbnQudmFsdWUo KSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KICAgICBPcHRpb25hbDxib29sPiBoYXNGb250RmFj ZURhdGE7CiAgICAgZGVjb2RlciA+PiBoYXNGb250RmFjZURhdGE7CiAgICAgaWYgKCFoYXNGb250 RmFjZURhdGEuaGFzVmFsdWUoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogCisgICAgT3B0aW9uYWw8UmVmPFdlYkNvcmU6OkZvbnQ+PiByZXN1 bHQ7CiAgICAgaWYgKGhhc0ZvbnRGYWNlRGF0YS52YWx1ZSgpKSB7CiAgICAgICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IGZvbnRGYWNlRGF0YTsKICAgICAgICAgaWYgKCFkZWNvZGVTaGFyZWRCdWZm ZXIoZGVjb2RlciwgZm9udEZhY2VEYXRhKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAgaWYgKCFmb250RmFjZURh dGEpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OwogCiAgICAgICAgIE9wdGlvbmFsPGZsb2F0PiBmb250U2l6ZTsKICAgICAgICAgZGVj b2RlciA+PiBmb250U2l6ZTsKICAgICAgICAgaWYgKCFmb250U2l6ZSkKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKICAgICAgICAg T3B0aW9uYWw8Ym9vbD4gc3ludGhldGljQm9sZDsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0 aWNCb2xkOwogICAgICAgICBpZiAoIXN5bnRoZXRpY0JvbGQpCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAgICAgICAgIE9wdGlv bmFsPGJvb2w+IHN5bnRoZXRpY0l0YWxpYzsKICAgICAgICAgZGVjb2RlciA+PiBzeW50aGV0aWNJ dGFsaWM7CiAgICAgICAgIGlmICghc3ludGhldGljSXRhbGljKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgICAgICBGb250 RGVzY3JpcHRpb24gZGVzY3JpcHRpb247CiAgICAgICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVk U2l6ZSgqZm9udFNpemUpOwotICAgICAgICBoYW5kbGUgPSB7IGZvbnRGYWNlRGF0YS5yZWxlYXNl Tm9uTnVsbCgpLCBGb250OjpPcmlnaW46OlJlbW90ZSwgKmZvbnRTaXplLCAqc3ludGhldGljQm9s ZCwgKnN5bnRoZXRpY0l0YWxpYyB9OworICAgICAgICByZXN1bHQgPSBGb250OjpjcmVhdGUoZm9u dEZhY2VEYXRhLnJlbGVhc2VOb25OdWxsKCksIEZvbnQ6Ok9yaWdpbjo6UmVtb3RlLCAqZm9udFNp emUsICpzeW50aGV0aWNCb2xkLCAqc3ludGhldGljSXRhbGljKTsKICAgICB9CiAKLSAgICByZXR1 cm4gZGVjb2RlUGxhdGZvcm1EYXRhKGRlY29kZXIsIGhhbmRsZSk7CisgICAgcmV0dXJuIGRlY29k ZVBsYXRmb3JtRGF0YShkZWNvZGVyLCBXVEZNb3ZlKHJlc3VsdCkpOwogfQogCiB2b2lkIEFyZ3Vt ZW50Q29kZXI8Q3Vyc29yPjo6ZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEN1cnNvciYg Y3Vyc29yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApp bmRleCBhOWY4NmQyOGY4ODhiNWQwYThiMDg3NDM5N2U5NDQxNmE2OGI0NjJjLi4yODYyMTljMDY1 ZDdmZjlmYTA0M2ZhYWYxYzJlNzM3YjRhNmExNDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApAQCAtOTQsNyArOTQsNyBAQCBjbGFzcyBGbG9hdFJl Y3Q7CiBjbGFzcyBGbG9hdFJvdW5kZWRSZWN0OwogY2xhc3MgRmxvYXRTaXplOwogY2xhc3MgRml4 ZWRQb3NpdGlvblZpZXdwb3J0Q29uc3RyYWludHM7Ci1jbGFzcyBGb250SGFuZGxlOworY2xhc3Mg Rm9udDsKIGNsYXNzIEhUVFBIZWFkZXJNYXA7CiBjbGFzcyBJbWFnZUhhbmRsZTsKIGNsYXNzIElu dFBvaW50OwpAQCAtNDA3LDExICs0MDcsMTEgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRD b2RlcjxXZWJDb3JlOjpDdXJzb3I+IHsKICAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVUVVJOIGJv b2wgZGVjb2RlKERlY29kZXImLCBXZWJDb3JlOjpDdXJzb3ImKTsKIH07CiAKLXRlbXBsYXRlPD4g c3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Rm9udEhhbmRsZT4gewotICAgIHN0YXRpYyB2 b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6Rm9udEhhbmRsZSYpOwotICAgIHN0 YXRpYyBXQVJOX1VOVVNFRF9SRVRVUk4gYm9vbCBkZWNvZGUoRGVjb2RlciYsIFdlYkNvcmU6OkZv bnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYs IGNvbnN0IFdlYkNvcmU6OkZvbnRIYW5kbGUmKTsKLSAgICBzdGF0aWMgV0FSTl9VTlVTRURfUkVU VVJOIGJvb2wgZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImLCBXZWJDb3JlOjpGb250SGFuZGxl Jik7Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj4g eworICAgIHN0YXRpYyB2b2lkIGVuY29kZShFbmNvZGVyJiwgY29uc3QgUmVmPFdlYkNvcmU6OkZv bnQ+Jik7CisgICAgc3RhdGljIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4gZGVjb2RlKERl Y29kZXImKTsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYsIGNv bnN0IFJlZjxXZWJDb3JlOjpGb250PiYpOworICAgIHN0YXRpYyBPcHRpb25hbDxSZWY8V2ViQ29y ZTo6Rm9udD4+IGRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiwgT3B0aW9uYWw8UmVmPFdlYkNv cmU6OkZvbnQ+PiYmKTsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2Vi Q29yZTo6SW1hZ2VIYW5kbGU+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2N1 cmwvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9j dXJsL1dlYkNvcmVBcmd1bWVudENvZGVyc0N1cmwuY3BwCmluZGV4IDg5ZjZlNjFkNjU1NWRhNDdi NGQwMDBmMDkyYThiMjkwNmFkMGY3YTQuLmViYjlkYmFiMzhhZmQwZGRjZjM2NTVhY2I5ODNkZDFh NzViOTZkMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2N1cmwvV2ViQ29yZUFy Z3VtZW50Q29kZXJzQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvY3VybC9XZWJD b3JlQXJndW1lbnRDb2RlcnNDdXJsLmNwcApAQCAtMjM1LDE1ICsyMzUsMTUgQEAgYm9vbCBBcmd1 bWVudENvZGVyPERpY3Rpb25hcnlQb3B1cEluZm8+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2Rl ciYsIERpY3Rpb25hcnkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2Rl cjxGb250SGFuZGxlPjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBGb250SGFu ZGxlJikKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEo RW5jb2RlciYsIGNvbnN0IFJlZjxGb250PiYpCiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiB9CiAKLWJvb2wgQXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRh KERlY29kZXImLCBGb250SGFuZGxlJikKK09wdGlvbmFsPFJlZjxGb250Pj4gQXJndW1lbnRDb2Rl cjxSZWY8Rm9udD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYsIE9wdGlvbmFsPFJlZjxX ZWJDb3JlOjpGb250Pj4mJikKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1 cm4gZmFsc2U7CisgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIAogI2lmIEVOQUJMRShWSURF TykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9zb3VwL1dlYkNvcmVBcmd1bWVu dENvZGVyc1NvdXAuY3BwCmluZGV4IGY4MjExYmJjNGExNmVkMjQwYTljOTdhNmNjMzcxMWNlM2Nm MTZjODMuLjJkMjZkM2Y1Mjk0ODdhMDA3Y2RmNjQ5MTE5Yjg0OWY2NTU4MjUxNDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL3NvdXAvV2ViQ29yZUFyZ3VtZW50Q29kZXJzU291cC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvc291cC9XZWJDb3JlQXJndW1lbnRDb2RlcnNT b3VwLmNwcApAQCAtMjUyLDE1ICsyNTIsMTUgQEAgYm9vbCBBcmd1bWVudENvZGVyPERpY3Rpb25h cnlQb3B1cEluZm8+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYsIERpY3Rpb25hcnkKICAg ICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgQXJndW1lbnRDb2RlcjxGb250SGFuZGxlPjo6ZW5j b2RlUGxhdGZvcm1EYXRhKEVuY29kZXImLCBjb25zdCBGb250SGFuZGxlJikKK3ZvaWQgQXJndW1l bnRDb2RlcjxSZWY8Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYsIGNvbnN0IFJl ZjxGb250PiYpCiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKLWJvb2wgQXJndW1l bnRDb2RlcjxGb250SGFuZGxlPjo6ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImLCBGb250SGFu ZGxlJikKK09wdGlvbmFsPFJlZjxGb250Pj4gQXJndW1lbnRDb2RlcjxSZWY8Rm9udD4+OjpkZWNv ZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYsIE9wdGlvbmFsPFJlZjxXZWJDb3JlOjpGb250Pj4mJikK IHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0 dXJuIFdURjo6bnVsbG9wdDsKIH0KIAogI2lmIEVOQUJMRShWSURFTykK