235449 2022-01-21 11:18:19 -0800 REGRESSION(r282320): [Cocoa] User-installed fonts don't work in the GPU Process (in WKWebView) 2022-01-24 23:13:47 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield darin webkit-bug-importer oldest_to_newest 1832817 0 mmaxfield 2022-01-21 11:18:19 -0800 [Cocoa] User-installed fonts don't work in the GPU Process (in WKWebView) 1832818 1 449673 mmaxfield 2022-01-21 11:19:17 -0800 Created attachment 449673 WIP 1832819 2 mmaxfield 2022-01-21 11:19:48 -0800 <rdar://problem/84958961> 1832822 3 449673 mmaxfield 2022-01-21 11:34:22 -0800 Comment on attachment 449673 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=449673&action=review > Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h:99 > +typedef CF_OPTIONS(uint32_t, CTFontDescriptorOptions) { > +}; Apparently there has to be something inside the {}s :( 1832853 4 449687 mmaxfield 2022-01-21 12:38:09 -0800 Created attachment 449687 Patch 1832860 5 449689 mmaxfield 2022-01-21 13:03:14 -0800 Created attachment 449689 Patch 1832877 6 449689 darin 2022-01-21 13:38:05 -0800 Comment on attachment 449689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449689&action=review > Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h:100 > +typedef CF_OPTIONS(uint32_t, CTFontDescriptorOptions) { > + kCTFontDescriptorOptionThisIsNotARealOption = 0xFFFFFFFF > +}; Or we could just typedef it to uint32_t. > Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:468 > encoder << String(string); Seems a shame we have to convert CFString to String just to encode it on the wire. A repeated pattern. 1833430 7 449689 mmaxfield 2022-01-24 12:23:01 -0800 Comment on attachment 449689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449689&action=review >> Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h:100 >> +}; > > Or we could just typedef it to uint32_t. Do you think the typedef is preferable? I think I actually prefer the CF_OPTIONS thing, just because it more closely matches the original source. I don't want to delay this bug fix any longer, so I'll land this as is and if you prefer the typedef I'll make a follow-up patch. >> Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:468 >> encoder << String(string); > > Seems a shame we have to convert CFString to String just to encode it on the wire. A repeated pattern. I believe we send CFStrings in other places ... let me see if I can fix this... 1833434 8 449689 darin 2022-01-24 12:28:12 -0800 Comment on attachment 449689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449689&action=review >>> Source/WebCore/PAL/pal/spi/cf/CoreTextSPI.h:100 >>> +}; >> >> Or we could just typedef it to uint32_t. > > Do you think the typedef is preferable? I think I actually prefer the CF_OPTIONS thing, just because it more closely matches the original source. > > I don't want to delay this bug fix any longer, so I'll land this as is and if you prefer the typedef I'll make a follow-up patch. This is fine. I didn’t mean to cause delay! 1833537 9 449689 mmaxfield 2022-01-24 15:45:44 -0800 Comment on attachment 449689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449689&action=review >>> Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:468 >>> encoder << String(string); >> >> Seems a shame we have to convert CFString to String just to encode it on the wire. A repeated pattern. > > I believe we send CFStrings in other places ... let me see if I can fix this... Oh, yeah, of course - ArgumentCodersCF.h! 1833538 10 449689 darin 2022-01-24 15:46:49 -0800 Comment on attachment 449689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449689&action=review >>>> Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:468 >>>> encoder << String(string); >>> >>> Seems a shame we have to convert CFString to String just to encode it on the wire. A repeated pattern. >> >> I believe we send CFStrings in other places ... let me see if I can fix this... > > Oh, yeah, of course - ArgumentCodersCF.h! Should find the others who are calling String() just to encode a CFStringRef. I bet this is not the only place. 1833589 11 449891 mmaxfield 2022-01-24 20:28:09 -0800 Created attachment 449891 Patch for committing 1833590 12 449892 mmaxfield 2022-01-24 20:29:23 -0800 Created attachment 449892 Patch for committing 1833591 13 449893 mmaxfield 2022-01-24 20:30:32 -0800 Created attachment 449893 Patch for committing 1833602 14 449893 darin 2022-01-24 21:33:15 -0800 Comment on attachment 449893 Patch for committing View in context: https://bugs.webkit.org/attachment.cgi?id=449893&action=review Fine to land as-is, but I see one further refinement. > Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:486 > auto currentPostScriptName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontNameAttribute))); Given we only call CFEqual on this, we don’t need the static_cast to CFStringRef. I suggest just taking it out. 1833616 15 449893 mmaxfield 2022-01-24 22:44:54 -0800 Comment on attachment 449893 Patch for committing View in context: https://bugs.webkit.org/attachment.cgi?id=449893&action=review >> Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:486 >> auto currentPostScriptName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontNameAttribute))); > > Given we only call CFEqual on this, we don’t need the static_cast to CFStringRef. I suggest just taking it out. 🆒 I think I agree with you. This is more readable now. 1833624 16 mmaxfield 2022-01-24 23:13:47 -0800 Committed r288543 (246375@trunk): <https://commits.webkit.org/246375@trunk> 449673 2022-01-21 11:19:17 -0800 2022-01-21 12:49:34 -0800 WIP bug-235449-20220121111916.patch text/plain 5225 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBkZDFiZGQ3 ZDdjMzkyZmYyZmUyMTUxM2RkZjc1NjM5NzAyMWQwYTc5Li43M2I1YzdkY2IyNjY5YzhmNTQ0MDdi MDgyNTljZTRlODdlZGVlYzc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAyMi0wMS0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMgZG9uJ3Qgd29yayBpbiB0aGUgR1BV IFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNTQ0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oOgorCiAyMDIyLTAxLTE4 ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VXNlIGMrKzJhIGluc3RlYWQgb2YgZ251KysyYSBmb3IgQ29jb2EgYnVpbGRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4 IGY1MDZjNzcwN2ViZjA1NjMxNTUwYTM5N2JlMDViM2Y1NjRlMzVmYmQuLjliYjEwOTA4NTFiMDky MDVhYzQ4NTAwZDgxMDExYTMwZDYwMGM5YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw MjItMDEtMjEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAg ICAgICBbQ29jb2FdIFVzZXItaW5zdGFsbGVkIGZvbnRzIGRvbid0IHdvcmsgaW4gdGhlIEdQVSBQ cm9jZXNzIChpbiBXS1dlYlZpZXcpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzU0NDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9D b2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbToKKyAgICAgICAgKElQQzo6QXJndW1l bnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEpOgorICAgICAg ICAoSVBDOjpjcmVhdGVDVEZvbnQpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxX ZWJDb3JlOjpGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIwMjItMDEtMTkgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQ6OkRvd25sb2FkUHJv eHk6OnB1Ymxpc2hQcm9ncmVzcygpIGZhbGxzIHRocm91Z2ggQVNTRVJUX05PVF9SRUFDSEVEKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmgg Yi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCmluZGV4IDQ2MWJj NmQ1ZTVjZjY4Yjc3MzE1ZTZkMTMzNzc0OTIxMWY0NTlkMzYuLjM4ZjcwNmU4N2NhOTEwODE0Nzgw MWI0Zjg1YmQ2MmIwNDdkYmZjNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwv c3BpL2NmL0NvcmVUZXh0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2Yv Q29yZVRleHRTUEkuaApAQCAtOTUsNiArOTUsOSBAQCB0eXBlZGVmIENGX0VOVU0oQ0ZJbmRleCwg Q1RGb250UGFsZXR0ZSkKIAogdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX19PVFNWR1RhYmxlICogT1RT VkdUYWJsZVJlZjsKIAordHlwZWRlZiBDRl9PUFRJT05TKHVpbnQzMl90LCBDVEZvbnREZXNjcmlw dG9yT3B0aW9ucykgeworfTsKKwogI2VuZGlmCiAKIFdURl9FWFRFUk5fQ19CRUdJTgpAQCAtMjIy LDQgKzIyNSw2IEBAIGJvb2wgQ1RGb250SXNBcHBsZUNvbG9yRW1vamkoQ1RGb250UmVmKTsKIENU Rm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzKENURm9udFJlZiBjdXJyZW50Rm9udCwg Y29uc3QgVVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4IGxlbmd0aCwgQ0ZJbmRleCAqY292 ZXJlZExlbmd0aCk7CiBDR0Zsb2F0IENURm9udEdldFNiaXhJbWFnZVNpemVGb3JHbHlwaEFuZENv bnRlbnRzU2NhbGUoQ1RGb250UmVmLCBjb25zdCBDR0dseXBoLCBDR0Zsb2F0IGNvbnRlbnRzU2Nh bGUpOwogCitDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyBDVEZvbnREZXNjcmlwdG9yR2V0T3B0aW9u cyhDVEZvbnREZXNjcmlwdG9yUmVmKTsKKwogV1RGX0VYVEVSTl9DX0VORApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0g Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5t bQppbmRleCA0NDIyZDY3MjJmNTAzY2UyNzY4NTIwNTBhZGY4MTk0Njk3Y2EwNzhjLi5iN2I1MzBi YjVhNmVhZDZiNzBlMjIyNmFiNDlkOWFjZmRjMDM2OTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQpAQCAt NDYxLDYgKzQ2MSw4IEBAIHZvaWQgQXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+Ojpl bmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uCiAgICAgICAgIGVuY29kZXIg PDwgY3JlYXRpb25EYXRhLT5mb250RmFjZURhdGE7CiAgICAgICAgIGVuY29kZXIgPDwgY3JlYXRp b25EYXRhLT5pdGVtSW5Db2xsZWN0aW9uOwogICAgIH0gZWxzZSB7CisgICAgICAgIGF1dG8gb3B0 aW9ucyA9IENURm9udERlc2NyaXB0b3JHZXRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpKTsK KyAgICAgICAgZW5jb2RlciA8PCBvcHRpb25zOwogICAgICAgICBhdXRvIHJlZmVyZW5jZVVSTCA9 IGFkb3B0Q0Yoc3RhdGljX2Nhc3Q8Q0ZVUkxSZWY+KENURm9udENvcHlBdHRyaWJ1dGUoY3RGb250 LCBrQ1RGb250UmVmZXJlbmNlVVJMQXR0cmlidXRlKSkpOwogICAgICAgICBhdXRvIHN0cmluZyA9 IENGVVJMR2V0U3RyaW5nKHJlZmVyZW5jZVVSTC5nZXQoKSk7CiAgICAgICAgIGVuY29kZXIgPDwg U3RyaW5nKHN0cmluZyk7CkBAIC00ODgsMTEgKzQ5MCwxMSBAQCBzdGF0aWMgUmV0YWluUHRyPENU Rm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIHJlZmVy ZW5jZQogICAgIHJldHVybiBudWxscHRyOwogfQogCi1zdGF0aWMgUmV0YWluUHRyPENURm9udFJl Zj4gY3JlYXRlQ1RGb250KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9hdCBzaXplLCBj b25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5nJiBkZXNpcmVkUG9zdFNjcmlw dE5hbWUpCitzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gY3JlYXRlQ1RGb250KENGRGljdGlv bmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9hdCBzaXplLCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyBv cHRpb25zLCBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5nJiBkZXNpcmVk UG9zdFNjcmlwdE5hbWUpCiB7CiAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RG b250RGVzY3JpcHRvckNyZWF0ZVdpdGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsKICAgICBpZiAo Zm9udERlc2NyaXB0b3IpIHsKLSAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVh dGVXaXRoRm9udERlc2NyaXB0b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXpl LCBudWxscHRyLCBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCkpOworICAgICAgICBhdXRvIGZv bnQgPSBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvckFuZE9wdGlvbnMoZm9u dERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIsIG9wdGlvbnMpKTsKICAgICAgICAgU3Ry aW5nIGFjdHVhbFBvc3RTY3JpcHROYW1lKGFkb3B0Q0YoQ1RGb250Q29weVBvc3RTY3JpcHROYW1l KGZvbnQuZ2V0KCkpKS5nZXQoKSk7CiAgICAgICAgIGlmIChhY3R1YWxQb3N0U2NyaXB0TmFtZSA9 PSBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiAgICAgICAgICAgICByZXR1cm4gZm9udDsKQEAgLTU3 Nyw2ICs1NzksMTEgQEAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhPiBB cmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj46OmRlY28KICAgICAgICAgcmV0dXJuIFdl YkNvcmU6OkZvbnRQbGF0Zm9ybURhdGEoY3RGb250LmdldCgpLCAqc2l6ZSwgKnN5bnRoZXRpY0Jv bGQsICpzeW50aGV0aWNPYmxpcXVlLCAqb3JpZW50YXRpb24sICp3aWR0aFZhcmlhbnQsICp0ZXh0 UmVuZGVyaW5nTW9kZSwgJmNyZWF0aW9uRGF0YSk7CiAgICAgfQogCisgICAgc3RkOjpvcHRpb25h bDxDVEZvbnREZXNjcmlwdG9yT3B0aW9ucz4gb3B0aW9uczsKKyAgICBkZWNvZGVyID4+IG9wdGlv bnM7CisgICAgaWYgKCFvcHRpb25zKQorICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworCiAg ICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHJlZmVyZW5jZVVSTDsKICAgICBkZWNvZGVyID4+IHJl ZmVyZW5jZVVSTDsKICAgICBpZiAoIXJlZmVyZW5jZVVSTCkKQEAgLTU4Nyw3ICs1OTQsNyBAQCBz dGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8UmVm PFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjbwogICAgIGlmICghcG9zdFNjcmlwdE5hbWUpCiAgICAgICAg IHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBhdXRvIGN0Rm9udCA9IGNyZWF0ZUNURm9udChh dHRyaWJ1dGVzLT5nZXQoKSwgKnNpemUsICpyZWZlcmVuY2VVUkwsICpwb3N0U2NyaXB0TmFtZSk7 CisgICAgYXV0byBjdEZvbnQgPSBjcmVhdGVDVEZvbnQoYXR0cmlidXRlcy0+Z2V0KCksICpzaXpl LCAqb3B0aW9ucywgKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3JpcHROYW1lKTsKICAgICBpZiAoIWN0 Rm9udCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAo= 449687 2022-01-21 12:38:09 -0800 2022-01-21 13:03:12 -0800 Patch bug-235449-20220121123808.patch text/plain 8103 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBkZDFiZGQ3 ZDdjMzkyZmYyZmUyMTUxM2RkZjc1NjM5NzAyMWQwYTc5Li45ZGQwYjIxMWYxNTA0NmQyZTNjNjU5 ZmViMjYzY2Y5ZGNlOTNjNDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMi0wMS0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMg ZG9uJ3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmg6CisKIDIwMjItMDEtMTgg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBV c2UgYysrMmEgaW5zdGVhZCBvZiBnbnUrKzJhIGZvciBDb2NvYSBidWlsZHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg ZjUwNmM3NzA3ZWJmMDU2MzE1NTBhMzk3YmUwNWIzZjU2NGUzNWZiZC4uMTgyMTkwZTgxOTA1NDI1 MWMyZjI0OTQ4YmU3OTQ5NTU1MWZmYzQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAy Mi0wMS0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAg ICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMgZG9u J3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIHJlYXNvbiBmb3IgdGhpcyBidWcgd2FzIEkgd2FzIG1pc3VzaW5nIGtD VEZvbnRPcHRpb25zU3lzdGVtVUlGb250LiBJIHRob3VnaHQgdGhpcyBmbGFnIGp1c3QKKyAgICAg ICAgbWVhbnQgImFsbG93IHRoZSBjcmVhdGlvbiBvZiBzeXN0ZW0gZm9udHMiIGJ1dCBpdCB0dXJu cyBvdXQgaXQgbWVhbnMgc29tZXRoaW5nIG1vcmUgc3VidGxlIHRoYW4KKyAgICAgICAgdGhhdC4g SW5zdGVhZCBvZiB1bmNvbmRpdGlvbmFsbHkgc3BlY2lmeWluZyB0aGlzIGZsYWcsIHdlIHNob3Vs ZCBqdXN0IHB1bGwgb3V0IHRoZSBvcHRpb25zIGZpZWxkCisgICAgICAgIGZyb20gdGhlIHNvdXJj ZSBmb250ICh3aGljaCB3aWxsIGluY2x1ZGUgdGhhdCBmbGFnIGlmIHRoZSBmb250IHdhcyBhIHN5 c3RlbSBmb250KSBhbmQgdXNlIHRoYXQKKyAgICAgICAgaW5zdGVhZC4KKworICAgICAgICBUZXN0 OiBmYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLmh0bWwKKworICAgICAgICAqIFNoYXJl ZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbToKKyAgICAgICAgKElQQzo6QXJn dW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEpOgorICAg ICAgICAoSVBDOjpjcmVhdGVDVEZvbnQpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJl ZjxXZWJDb3JlOjpGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIwMjItMDEtMTkgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQ6OkRvd25sb2Fk UHJveHk6OnB1Ymxpc2hQcm9ncmVzcygpIGZhbGxzIHRocm91Z2ggQVNTRVJUX05PVF9SRUFDSEVE KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVUZXh0U1BJ LmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCmluZGV4IDQ2 MWJjNmQ1ZTVjZjY4Yjc3MzE1ZTZkMTMzNzc0OTIxMWY0NTlkMzYuLmYyNTdlMWE4ODRmZTMzY2E2 NDU4MTU4OGQyNDVkOGZkNTVlZGJmMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL2NmL0NvcmVUZXh0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkv Y2YvQ29yZVRleHRTUEkuaApAQCAtOTUsNiArOTUsMTAgQEAgdHlwZWRlZiBDRl9FTlVNKENGSW5k ZXgsIENURm9udFBhbGV0dGUpCiAKIHR5cGVkZWYgY29uc3Qgc3RydWN0IF9fT1RTVkdUYWJsZSAq IE9UU1ZHVGFibGVSZWY7CiAKK3R5cGVkZWYgQ0ZfT1BUSU9OUyh1aW50MzJfdCwgQ1RGb250RGVz Y3JpcHRvck9wdGlvbnMpIHsKKyAgICBrQ1RGb250RGVzY3JpcHRvck9wdGlvblRoaXNJc05vdEFS ZWFsT3B0aW9uID0gMHhGRkZGRkZGRgorfTsKKwogI2VuZGlmCiAKIFdURl9FWFRFUk5fQ19CRUdJ TgpAQCAtMjIyLDQgKzIyNiw2IEBAIGJvb2wgQ1RGb250SXNBcHBsZUNvbG9yRW1vamkoQ1RGb250 UmVmKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzKENURm9udFJlZiBjdXJy ZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4IGxlbmd0aCwgQ0ZJ bmRleCAqY292ZXJlZExlbmd0aCk7CiBDR0Zsb2F0IENURm9udEdldFNiaXhJbWFnZVNpemVGb3JH bHlwaEFuZENvbnRlbnRzU2NhbGUoQ1RGb250UmVmLCBjb25zdCBDR0dseXBoLCBDR0Zsb2F0IGNv bnRlbnRzU2NhbGUpOwogCitDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyBDVEZvbnREZXNjcmlwdG9y R2V0T3B0aW9ucyhDVEZvbnREZXNjcmlwdG9yUmVmKTsKKwogV1RGX0VYVEVSTl9DX0VORApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJz Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2Rl cnNDb2NvYS5tbQppbmRleCA0NDIyZDY3MjJmNTAzY2UyNzY4NTIwNTBhZGY4MTk0Njk3Y2EwNzhj Li5iN2I1MzBiYjVhNmVhZDZiNzBlMjIyNmFiNDlkOWFjZmRjMDM2OTM3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2Nv YS5tbQpAQCAtNDYxLDYgKzQ2MSw4IEBAIHZvaWQgQXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6 Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uCiAgICAgICAg IGVuY29kZXIgPDwgY3JlYXRpb25EYXRhLT5mb250RmFjZURhdGE7CiAgICAgICAgIGVuY29kZXIg PDwgY3JlYXRpb25EYXRhLT5pdGVtSW5Db2xsZWN0aW9uOwogICAgIH0gZWxzZSB7CisgICAgICAg IGF1dG8gb3B0aW9ucyA9IENURm9udERlc2NyaXB0b3JHZXRPcHRpb25zKGZvbnREZXNjcmlwdG9y LmdldCgpKTsKKyAgICAgICAgZW5jb2RlciA8PCBvcHRpb25zOwogICAgICAgICBhdXRvIHJlZmVy ZW5jZVVSTCA9IGFkb3B0Q0Yoc3RhdGljX2Nhc3Q8Q0ZVUkxSZWY+KENURm9udENvcHlBdHRyaWJ1 dGUoY3RGb250LCBrQ1RGb250UmVmZXJlbmNlVVJMQXR0cmlidXRlKSkpOwogICAgICAgICBhdXRv IHN0cmluZyA9IENGVVJMR2V0U3RyaW5nKHJlZmVyZW5jZVVSTC5nZXQoKSk7CiAgICAgICAgIGVu Y29kZXIgPDwgU3RyaW5nKHN0cmluZyk7CkBAIC00ODgsMTEgKzQ5MCwxMSBAQCBzdGF0aWMgUmV0 YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25zdCBTdHJp bmcmIHJlZmVyZW5jZQogICAgIHJldHVybiBudWxscHRyOwogfQogCi1zdGF0aWMgUmV0YWluUHRy PENURm9udFJlZj4gY3JlYXRlQ1RGb250KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9h dCBzaXplLCBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5nJiBkZXNpcmVk UG9zdFNjcmlwdE5hbWUpCitzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gY3JlYXRlQ1RGb250 KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9hdCBzaXplLCBDVEZvbnREZXNjcmlwdG9y T3B0aW9ucyBvcHRpb25zLCBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5n JiBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiB7CiAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFk b3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsK ICAgICBpZiAoZm9udERlc2NyaXB0b3IpIHsKLSAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihD VEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdl dCgpLCBzaXplLCBudWxscHRyLCBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCkpOworICAgICAg ICBhdXRvIGZvbnQgPSBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvckFuZE9w dGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIsIG9wdGlvbnMpKTsKICAg ICAgICAgU3RyaW5nIGFjdHVhbFBvc3RTY3JpcHROYW1lKGFkb3B0Q0YoQ1RGb250Q29weVBvc3RT Y3JpcHROYW1lKGZvbnQuZ2V0KCkpKS5nZXQoKSk7CiAgICAgICAgIGlmIChhY3R1YWxQb3N0U2Ny aXB0TmFtZSA9PSBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiAgICAgICAgICAgICByZXR1cm4gZm9u dDsKQEAgLTU3Nyw2ICs1NzksMTEgQEAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGb250UGxhdGZv cm1EYXRhPiBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj46OmRlY28KICAgICAgICAg cmV0dXJuIFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGEoY3RGb250LmdldCgpLCAqc2l6ZSwgKnN5 bnRoZXRpY0JvbGQsICpzeW50aGV0aWNPYmxpcXVlLCAqb3JpZW50YXRpb24sICp3aWR0aFZhcmlh bnQsICp0ZXh0UmVuZGVyaW5nTW9kZSwgJmNyZWF0aW9uRGF0YSk7CiAgICAgfQogCisgICAgc3Rk OjpvcHRpb25hbDxDVEZvbnREZXNjcmlwdG9yT3B0aW9ucz4gb3B0aW9uczsKKyAgICBkZWNvZGVy ID4+IG9wdGlvbnM7CisgICAgaWYgKCFvcHRpb25zKQorICAgICAgICByZXR1cm4gc3RkOjpudWxs b3B0OworCiAgICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHJlZmVyZW5jZVVSTDsKICAgICBkZWNv ZGVyID4+IHJlZmVyZW5jZVVSTDsKICAgICBpZiAoIXJlZmVyZW5jZVVSTCkKQEAgLTU4Nyw3ICs1 OTQsNyBAQCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50 Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjbwogICAgIGlmICghcG9zdFNjcmlwdE5hbWUp CiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBhdXRvIGN0Rm9udCA9IGNyZWF0 ZUNURm9udChhdHRyaWJ1dGVzLT5nZXQoKSwgKnNpemUsICpyZWZlcmVuY2VVUkwsICpwb3N0U2Ny aXB0TmFtZSk7CisgICAgYXV0byBjdEZvbnQgPSBjcmVhdGVDVEZvbnQoYXR0cmlidXRlcy0+Z2V0 KCksICpzaXplLCAqb3B0aW9ucywgKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3JpcHROYW1lKTsKICAg ICBpZiAoIWN0Rm9udCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGFj YWFlNjEyYmU4ZWE0N2E0OTk2OTQ3ODY2MzllMWE1ZDYxMmM4OGMuLjAwMTRhYjY3OTNjOWY2MGNj MDg0YjI4NWRhNWY1Mzk3MjVlYzVjYTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wMS0y MSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFJF R1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMgZG9uJ3Qgd29y ayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBmYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLWV4cGVjdGVkLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMuaHRtbDogQWRk ZWQuCisKIDIwMjItMDEtMTkgIFJvYmVydCBKZW5uZXIgIDxKZW5uZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjg4MTk3LgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBlY3RlZC5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLmJjZmM1MDg1YzA1ZDE4Yjg3YjViNzQ1MDAzZmExZmZiNWE1ODczYzcKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFz LWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlz IHRlc3QgbWFrZXMgc3VyZSB0aGF0IHVzZXItaW5zdGFsbGVkIGZvbnRzIHdvcmsgY29ycmVjdGx5 IHdoZW4gZHJhd24gaW50byBjYW52YXMuIFRoZSB0ZXN0IHBhc3NlcyBpZiB5b3Ugc2VlIGEgYmln IHNvbGlkIGJsYWNrIHNxdWFyZSBiZWxvdyAoYW5kIG5vdCBhbiBAIHNpZ24pLjwvcD4KKzxjYW52 YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjMwMCIgaGVpZ2h0PSIzMDAiPjwvY2FudmFzPgorPHNjcmlw dD4KK2xldCBjb250ZXh0ID0gY2FudmFzLmdldENvbnRleHQoIjJkIik7Citjb250ZXh0LmZpbGxS ZWN0KDAsIDAsIDMwMCwgMzAwKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjRjNmI2ZTY4ZTk2NTRmYzhiNmNkZjY0ZDExN2MwOGU3YTdkNzQ3N2EKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLmh0bWwK QEAgLTAsMCArMSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEg Y2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3QgbWFrZXMgc3Vy ZSB0aGF0IHVzZXItaW5zdGFsbGVkIGZvbnRzIHdvcmsgY29ycmVjdGx5IHdoZW4gZHJhd24gaW50 byBjYW52YXMuIFRoZSB0ZXN0IHBhc3NlcyBpZiB5b3Ugc2VlIGEgYmlnIHNvbGlkIGJsYWNrIHNx dWFyZSBiZWxvdyAoYW5kIG5vdCBhbiBAIHNpZ24pLjwvcD4KKzxjYW52YXMgaWQ9ImNhbnZhcyIg d2lkdGg9IjMwMCIgaGVpZ2h0PSIzMDAiPjwvY2FudmFzPgorPHNjcmlwdD4KK2xldCBjb250ZXh0 ID0gY2FudmFzLmdldENvbnRleHQoIjJkIik7Citjb250ZXh0LmZvbnQgPSAiNDAwcHggJ0FoZW0n IjsKK2NvbnRleHQuZmlsbFRleHQoIkEiLCAtNTAsIDI3MCk7Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4K 449689 2022-01-21 13:03:14 -0800 2022-01-21 18:57:09 -0800 Patch bug-235449-20220121130313.patch text/plain 8667 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBkZDFiZGQ3 ZDdjMzkyZmYyZmUyMTUxM2RkZjc1NjM5NzAyMWQwYTc5Li45ZGQwYjIxMWYxNTA0NmQyZTNjNjU5 ZmViMjYzY2Y5ZGNlOTNjNDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMi0wMS0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMg ZG9uJ3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmg6CisKIDIwMjItMDEtMTgg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBV c2UgYysrMmEgaW5zdGVhZCBvZiBnbnUrKzJhIGZvciBDb2NvYSBidWlsZHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg ZjUwNmM3NzA3ZWJmMDU2MzE1NTBhMzk3YmUwNWIzZjU2NGUzNWZiZC4uMTgyMTkwZTgxOTA1NDI1 MWMyZjI0OTQ4YmU3OTQ5NTU1MWZmYzQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAy Mi0wMS0yMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAg ICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMgZG9u J3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhlIHJlYXNvbiBmb3IgdGhpcyBidWcgd2FzIEkgd2FzIG1pc3VzaW5nIGtD VEZvbnRPcHRpb25zU3lzdGVtVUlGb250LiBJIHRob3VnaHQgdGhpcyBmbGFnIGp1c3QKKyAgICAg ICAgbWVhbnQgImFsbG93IHRoZSBjcmVhdGlvbiBvZiBzeXN0ZW0gZm9udHMiIGJ1dCBpdCB0dXJu cyBvdXQgaXQgbWVhbnMgc29tZXRoaW5nIG1vcmUgc3VidGxlIHRoYW4KKyAgICAgICAgdGhhdC4g SW5zdGVhZCBvZiB1bmNvbmRpdGlvbmFsbHkgc3BlY2lmeWluZyB0aGlzIGZsYWcsIHdlIHNob3Vs ZCBqdXN0IHB1bGwgb3V0IHRoZSBvcHRpb25zIGZpZWxkCisgICAgICAgIGZyb20gdGhlIHNvdXJj ZSBmb250ICh3aGljaCB3aWxsIGluY2x1ZGUgdGhhdCBmbGFnIGlmIHRoZSBmb250IHdhcyBhIHN5 c3RlbSBmb250KSBhbmQgdXNlIHRoYXQKKyAgICAgICAgaW5zdGVhZC4KKworICAgICAgICBUZXN0 OiBmYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLmh0bWwKKworICAgICAgICAqIFNoYXJl ZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbToKKyAgICAgICAgKElQQzo6QXJn dW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEpOgorICAg ICAgICAoSVBDOjpjcmVhdGVDVEZvbnQpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJl ZjxXZWJDb3JlOjpGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIwMjItMDEtMTkgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQ6OkRvd25sb2Fk UHJveHk6OnB1Ymxpc2hQcm9ncmVzcygpIGZhbGxzIHRocm91Z2ggQVNTRVJUX05PVF9SRUFDSEVE KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVUZXh0U1BJ LmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCmluZGV4IDQ2 MWJjNmQ1ZTVjZjY4Yjc3MzE1ZTZkMTMzNzc0OTIxMWY0NTlkMzYuLmYyNTdlMWE4ODRmZTMzY2E2 NDU4MTU4OGQyNDVkOGZkNTVlZGJmMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL2NmL0NvcmVUZXh0U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkv Y2YvQ29yZVRleHRTUEkuaApAQCAtOTUsNiArOTUsMTAgQEAgdHlwZWRlZiBDRl9FTlVNKENGSW5k ZXgsIENURm9udFBhbGV0dGUpCiAKIHR5cGVkZWYgY29uc3Qgc3RydWN0IF9fT1RTVkdUYWJsZSAq IE9UU1ZHVGFibGVSZWY7CiAKK3R5cGVkZWYgQ0ZfT1BUSU9OUyh1aW50MzJfdCwgQ1RGb250RGVz Y3JpcHRvck9wdGlvbnMpIHsKKyAgICBrQ1RGb250RGVzY3JpcHRvck9wdGlvblRoaXNJc05vdEFS ZWFsT3B0aW9uID0gMHhGRkZGRkZGRgorfTsKKwogI2VuZGlmCiAKIFdURl9FWFRFUk5fQ19CRUdJ TgpAQCAtMjIyLDQgKzIyNiw2IEBAIGJvb2wgQ1RGb250SXNBcHBsZUNvbG9yRW1vamkoQ1RGb250 UmVmKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzKENURm9udFJlZiBjdXJy ZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4IGxlbmd0aCwgQ0ZJ bmRleCAqY292ZXJlZExlbmd0aCk7CiBDR0Zsb2F0IENURm9udEdldFNiaXhJbWFnZVNpemVGb3JH bHlwaEFuZENvbnRlbnRzU2NhbGUoQ1RGb250UmVmLCBjb25zdCBDR0dseXBoLCBDR0Zsb2F0IGNv bnRlbnRzU2NhbGUpOwogCitDVEZvbnREZXNjcmlwdG9yT3B0aW9ucyBDVEZvbnREZXNjcmlwdG9y R2V0T3B0aW9ucyhDVEZvbnREZXNjcmlwdG9yUmVmKTsKKwogV1RGX0VYVEVSTl9DX0VORApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJz Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2Rl cnNDb2NvYS5tbQppbmRleCA0NDIyZDY3MjJmNTAzY2UyNzY4NTIwNTBhZGY4MTk0Njk3Y2EwNzhj Li4zMzQyYmNhNjEwNjA1MDA5MWRiYmZiNzRiMTVhNGZhOGQzYzNjOTYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2Nv YS5tbQpAQCAtNDYxLDYgKzQ2MSw4IEBAIHZvaWQgQXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6 Rm9udD4+OjplbmNvZGVQbGF0Zm9ybURhdGEoRW5jb2RlciYgZW5jb2RlciwgY29uCiAgICAgICAg IGVuY29kZXIgPDwgY3JlYXRpb25EYXRhLT5mb250RmFjZURhdGE7CiAgICAgICAgIGVuY29kZXIg PDwgY3JlYXRpb25EYXRhLT5pdGVtSW5Db2xsZWN0aW9uOwogICAgIH0gZWxzZSB7CisgICAgICAg IGF1dG8gb3B0aW9ucyA9IENURm9udERlc2NyaXB0b3JHZXRPcHRpb25zKGZvbnREZXNjcmlwdG9y LmdldCgpKTsKKyAgICAgICAgZW5jb2RlciA8PCBvcHRpb25zOwogICAgICAgICBhdXRvIHJlZmVy ZW5jZVVSTCA9IGFkb3B0Q0Yoc3RhdGljX2Nhc3Q8Q0ZVUkxSZWY+KENURm9udENvcHlBdHRyaWJ1 dGUoY3RGb250LCBrQ1RGb250UmVmZXJlbmNlVVJMQXR0cmlidXRlKSkpOwogICAgICAgICBhdXRv IHN0cmluZyA9IENGVVJMR2V0U3RyaW5nKHJlZmVyZW5jZVVSTC5nZXQoKSk7CiAgICAgICAgIGVu Y29kZXIgPDwgU3RyaW5nKHN0cmluZyk7CkBAIC00ODgsMTEgKzQ5MCwxMSBAQCBzdGF0aWMgUmV0 YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25zdCBTdHJp bmcmIHJlZmVyZW5jZQogICAgIHJldHVybiBudWxscHRyOwogfQogCi1zdGF0aWMgUmV0YWluUHRy PENURm9udFJlZj4gY3JlYXRlQ1RGb250KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9h dCBzaXplLCBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5nJiBkZXNpcmVk UG9zdFNjcmlwdE5hbWUpCitzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gY3JlYXRlQ1RGb250 KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9hdCBzaXplLCBDVEZvbnREZXNjcmlwdG9y T3B0aW9ucyBvcHRpb25zLCBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5n JiBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiB7CiAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFk b3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsK ICAgICBpZiAoZm9udERlc2NyaXB0b3IpIHsKLSAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihD VEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdl dCgpLCBzaXplLCBudWxscHRyLCBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCkpOworICAgICAg ICBhdXRvIGZvbnQgPSBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvckFuZE9w dGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIsIG9wdGlvbnMpKTsKICAg ICAgICAgU3RyaW5nIGFjdHVhbFBvc3RTY3JpcHROYW1lKGFkb3B0Q0YoQ1RGb250Q29weVBvc3RT Y3JpcHROYW1lKGZvbnQuZ2V0KCkpKS5nZXQoKSk7CiAgICAgICAgIGlmIChhY3R1YWxQb3N0U2Ny aXB0TmFtZSA9PSBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiAgICAgICAgICAgICByZXR1cm4gZm9u dDsKQEAgLTUwNiw3ICs1MDgsNyBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gY3JlYXRl Q1RGb250KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVzLCBmbG9hdCBzaXplLAogICAgICAgICBm b250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZUxhc3RSZXNvcnQo KSk7CiAgICAgfQogICAgIEFTU0VSVChmb250RGVzY3JpcHRvcik7Ci0gICAgcmV0dXJuIGFkb3B0 Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yQW5kT3B0aW9ucyhmb250RGVzY3JpcHRv ci5nZXQoKSwgc2l6ZSwgbnVsbHB0ciwga0NURm9udE9wdGlvbnNTeXN0ZW1VSUZvbnQpKTsKKyAg ICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JBbmRPcHRpb25z KGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBvcHRpb25zKSk7CiB9CiAKIHN0 ZDo6b3B0aW9uYWw8V2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YT4gQXJndW1lbnRDb2RlcjxSZWY8 V2ViQ29yZTo6Rm9udD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEoRGVjb2RlciYgZGVjb2RlcikKQEAg LTU3Nyw2ICs1NzksMTEgQEAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRh PiBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj46OmRlY28KICAgICAgICAgcmV0dXJu IFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGEoY3RGb250LmdldCgpLCAqc2l6ZSwgKnN5bnRoZXRp Y0JvbGQsICpzeW50aGV0aWNPYmxpcXVlLCAqb3JpZW50YXRpb24sICp3aWR0aFZhcmlhbnQsICp0 ZXh0UmVuZGVyaW5nTW9kZSwgJmNyZWF0aW9uRGF0YSk7CiAgICAgfQogCisgICAgc3RkOjpvcHRp b25hbDxDVEZvbnREZXNjcmlwdG9yT3B0aW9ucz4gb3B0aW9uczsKKyAgICBkZWNvZGVyID4+IG9w dGlvbnM7CisgICAgaWYgKCFvcHRpb25zKQorICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0Owor CiAgICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHJlZmVyZW5jZVVSTDsKICAgICBkZWNvZGVyID4+ IHJlZmVyZW5jZVVSTDsKICAgICBpZiAoIXJlZmVyZW5jZVVSTCkKQEAgLTU4Nyw3ICs1OTQsNyBA QCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8 UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjbwogICAgIGlmICghcG9zdFNjcmlwdE5hbWUpCiAgICAg ICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBhdXRvIGN0Rm9udCA9IGNyZWF0ZUNURm9u dChhdHRyaWJ1dGVzLT5nZXQoKSwgKnNpemUsICpyZWZlcmVuY2VVUkwsICpwb3N0U2NyaXB0TmFt ZSk7CisgICAgYXV0byBjdEZvbnQgPSBjcmVhdGVDVEZvbnQoYXR0cmlidXRlcy0+Z2V0KCksICpz aXplLCAqb3B0aW9ucywgKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3JpcHROYW1lKTsKICAgICBpZiAo IWN0Rm9udCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGFjYWFlNjEy YmU4ZWE0N2E0OTk2OTQ3ODY2MzllMWE1ZDYxMmM4OGMuLjAwMTRhYjY3OTNjOWY2MGNjMDg0YjI4 NWRhNWY1Mzk3MjVlYzVjYTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wMS0yMSAgTXls ZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMgZG9uJ3Qgd29yayBpbiB0 aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ5 NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBmYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMuaHRtbDogQWRkZWQuCisK IDIwMjItMDEtMTkgIFJvYmVydCBKZW5uZXIgIDxKZW5uZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJldmVydGluZyByMjg4MTk3LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBlY3RlZC5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLmJjZmM1MDg1YzA1ZDE4Yjg3YjViNzQ1MDAzZmExZmZiNWE1ODczYzcKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLWV4cGVj dGVkLmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3Qg bWFrZXMgc3VyZSB0aGF0IHVzZXItaW5zdGFsbGVkIGZvbnRzIHdvcmsgY29ycmVjdGx5IHdoZW4g ZHJhd24gaW50byBjYW52YXMuIFRoZSB0ZXN0IHBhc3NlcyBpZiB5b3Ugc2VlIGEgYmlnIHNvbGlk IGJsYWNrIHNxdWFyZSBiZWxvdyAoYW5kIG5vdCBhbiBAIHNpZ24pLjwvcD4KKzxjYW52YXMgaWQ9 ImNhbnZhcyIgd2lkdGg9IjMwMCIgaGVpZ2h0PSIzMDAiPjwvY2FudmFzPgorPHNjcmlwdD4KK2xl dCBjb250ZXh0ID0gY2FudmFzLmdldENvbnRleHQoIjJkIik7Citjb250ZXh0LmZpbGxSZWN0KDAs IDAsIDMwMCwgMzAwKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRj NmI2ZTY4ZTk2NTRmYzhiNmNkZjY0ZDExN2MwOGU3YTdkNzQ3N2EKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdXNlci1pbnN0YWxsZWQtY2FudmFzLmh0bWwKQEAgLTAs MCArMSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNl dD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0 IHVzZXItaW5zdGFsbGVkIGZvbnRzIHdvcmsgY29ycmVjdGx5IHdoZW4gZHJhd24gaW50byBjYW52 YXMuIFRoZSB0ZXN0IHBhc3NlcyBpZiB5b3Ugc2VlIGEgYmlnIHNvbGlkIGJsYWNrIHNxdWFyZSBi ZWxvdyAoYW5kIG5vdCBhbiBAIHNpZ24pLjwvcD4KKzxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9 IjMwMCIgaGVpZ2h0PSIzMDAiPjwvY2FudmFzPgorPHNjcmlwdD4KK2xldCBjb250ZXh0ID0gY2Fu dmFzLmdldENvbnRleHQoIjJkIik7Citjb250ZXh0LmZvbnQgPSAiNDAwcHggJ0FoZW0nIjsKK2Nv bnRleHQuZmlsbFRleHQoIkEiLCAtNTAsIDI3MCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4K 449891 2022-01-24 20:28:09 -0800 2022-01-24 20:30:49 -0800 Patch for committing bug-235449-20220124202808.patch text/plain 10207 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCAxMDNjOTQ5 M2ZjODNkNGM3MzBhMDNhMzE0MDA1NWU0Yzc3MDAyNDAzLi4wNWM1YWJmYTRhM2QyNzRiNGJjMmUw NzhhMDY0MzJhNmVjMWMwODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMi0wMS0yNCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMg ZG9uJ3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmg6CisKIDIwMjItMDEtMjQgIERh dmlkIFF1ZXNhZGEgIDxkYXZpZF9xdWVzYWRhQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlm eSBhY2Nlc3NlcyB0byBTeXN0ZW1WZXJzaW9uLnBsaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2NDFmYTgzMDZj OWVjYTJmM2QzY2YzODA4NzZjYmJiZTdhMDE3NzAuLjlmY2M0NjY0NzEyNDRkNmM1NzdjNzczNzI5 M2I4MDBjYzY3NGEyZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDEtMjQgIE15 bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OKHIyODIzMjApOiBbQ29jb2FdIFVzZXItaW5zdGFsbGVkIGZvbnRzIGRvbid0IHdvcmsgaW4g dGhlIEdQVSBQcm9jZXNzIChpbiBXS1dlYlZpZXcpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0NDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg0 OTU4OTYxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFRo ZSByZWFzb24gZm9yIHRoaXMgYnVnIHdhcyBJIHdhcyBtaXN1c2luZyBrQ1RGb250T3B0aW9uc1N5 c3RlbVVJRm9udC4gSSB0aG91Z2h0IHRoaXMgZmxhZyBqdXN0CisgICAgICAgIG1lYW50ICJhbGxv dyB0aGUgY3JlYXRpb24gb2Ygc3lzdGVtIGZvbnRzIiBidXQgaXQgdHVybnMgb3V0IGl0IG1lYW5z IHNvbWV0aGluZyBtb3JlIHN1YnRsZSB0aGFuCisgICAgICAgIHRoYXQuIEluc3RlYWQgb2YgdW5j b25kaXRpb25hbGx5IHNwZWNpZnlpbmcgdGhpcyBmbGFnLCB3ZSBzaG91bGQganVzdCBwdWxsIG91 dCB0aGUgb3B0aW9ucyBmaWVsZAorICAgICAgICBmcm9tIHRoZSBzb3VyY2UgZm9udCAod2hpY2gg d2lsbCBpbmNsdWRlIHRoYXQgZmxhZyBpZiB0aGUgZm9udCB3YXMgYSBzeXN0ZW0gZm9udCkgYW5k IHVzZSB0aGF0CisgICAgICAgIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L3Vz ZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2ViQ29y ZUFyZ3VtZW50Q29kZXJzQ29jb2EubW06CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVm PFdlYkNvcmU6OkZvbnQ+Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKElQQzo6Y3Jl YXRlQ1RGb250KToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9u dD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEpOgorCiAyMDIyLTAxLTI0ICBEYXZpZCBRdWVzYWRhICA8 ZGF2aWRfcXVlc2FkYUBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgYWNjZXNzZXMgdG8g U3lzdGVtVmVyc2lvbi5wbGlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY2YvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVU ZXh0U1BJLmgKaW5kZXggNDYxYmM2ZDVlNWNmNjhiNzczMTVlNmQxMzM3NzQ5MjExZjQ1OWQzNi4u ZjI1N2UxYTg4NGZlMzNjYTY0NTgxNTg4ZDI0NWQ4ZmQ1NWVkYmYyYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCkBAIC05NSw2ICs5NSwxMCBAQCB0eXBl ZGVmIENGX0VOVU0oQ0ZJbmRleCwgQ1RGb250UGFsZXR0ZSkKIAogdHlwZWRlZiBjb25zdCBzdHJ1 Y3QgX19PVFNWR1RhYmxlICogT1RTVkdUYWJsZVJlZjsKIAordHlwZWRlZiBDRl9PUFRJT05TKHVp bnQzMl90LCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucykgeworICAgIGtDVEZvbnREZXNjcmlwdG9y T3B0aW9uVGhpc0lzTm90QVJlYWxPcHRpb24gPSAweEZGRkZGRkZGCit9OworCiAjZW5kaWYKIAog V1RGX0VYVEVSTl9DX0JFR0lOCkBAIC0yMjIsNCArMjI2LDYgQEAgYm9vbCBDVEZvbnRJc0FwcGxl Q29sb3JFbW9qaShDVEZvbnRSZWYpOwogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3Rl cnMoQ1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENG SW5kZXggbGVuZ3RoLCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKIENHRmxvYXQgQ1RGb250R2V0 U2JpeEltYWdlU2l6ZUZvckdseXBoQW5kQ29udGVudHNTY2FsZShDVEZvbnRSZWYsIGNvbnN0IENH R2x5cGgsIENHRmxvYXQgY29udGVudHNTY2FsZSk7CiAKK0NURm9udERlc2NyaXB0b3JPcHRpb25z IENURm9udERlc2NyaXB0b3JHZXRPcHRpb25zKENURm9udERlc2NyaXB0b3JSZWYpOworCiBXVEZf RVhURVJOX0NfRU5ECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJD b3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dl YkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tCmluZGV4IDQ0MjJkNjcyMmY1MDNjZTI3Njg1MjA1 MGFkZjgxOTQ2OTdjYTA3OGMuLmE1M2E2MGYzMzlmM2Y4NDczZDg2NmU4NTYzZjUxNjU2YzU4OTJl YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVu dENvZGVyc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVB cmd1bWVudENvZGVyc0NvY29hLm1tCkBAIC00NjEsMTYgKzQ2MSwxOCBAQCB2b2lkIEFyZ3VtZW50 Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbgogICAgICAgICBlbmNvZGVyIDw8IGNyZWF0aW9uRGF0YS0+Zm9udEZhY2VEYXRh OwogICAgICAgICBlbmNvZGVyIDw8IGNyZWF0aW9uRGF0YS0+aXRlbUluQ29sbGVjdGlvbjsKICAg ICB9IGVsc2UgeworICAgICAgICBhdXRvIG9wdGlvbnMgPSBDVEZvbnREZXNjcmlwdG9yR2V0T3B0 aW9ucyhmb250RGVzY3JpcHRvci5nZXQoKSk7CisgICAgICAgIGVuY29kZXIgPDwgb3B0aW9uczsK ICAgICAgICAgYXV0byByZWZlcmVuY2VVUkwgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGVVJMUmVm PihDVEZvbnRDb3B5QXR0cmlidXRlKGN0Rm9udCwga0NURm9udFJlZmVyZW5jZVVSTEF0dHJpYnV0 ZSkpKTsKICAgICAgICAgYXV0byBzdHJpbmcgPSBDRlVSTEdldFN0cmluZyhyZWZlcmVuY2VVUkwu Z2V0KCkpOwotICAgICAgICBlbmNvZGVyIDw8IFN0cmluZyhzdHJpbmcpOwotICAgICAgICBlbmNv ZGVyIDw8IFN0cmluZyhhZG9wdENGKENURm9udENvcHlQb3N0U2NyaXB0TmFtZShjdEZvbnQpKS5n ZXQoKSk7CisgICAgICAgIGVuY29kZXIgPDwgc3RyaW5nOworICAgICAgICBlbmNvZGVyIDw8IGFk b3B0Q0YoQ1RGb250Q29weVBvc3RTY3JpcHROYW1lKGN0Rm9udCkpLmdldCgpOwogICAgIH0KIH0K IAotc3RhdGljIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmaW5kRm9udERlc2NyaXB0 b3IoY29uc3QgU3RyaW5nJiByZWZlcmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgcG9zdFNjcmlwdE5h bWUpCitzdGF0aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3Jp cHRvcihDRlN0cmluZ1JlZiByZWZlcmVuY2VVUkwsIENGU3RyaW5nUmVmIHBvc3RTY3JpcHROYW1l KQogewotICAgIGF1dG8gdXJsID0gYWRvcHRDRihDRlVSTENyZWF0ZVdpdGhTdHJpbmcoa0NGQWxs b2NhdG9yRGVmYXVsdCwgcmVmZXJlbmNlVVJMLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIG51bGxw dHIpKTsKKyAgICBhdXRvIHVybCA9IGFkb3B0Q0YoQ0ZVUkxDcmVhdGVXaXRoU3RyaW5nKGtDRkFs bG9jYXRvckRlZmF1bHQsIHJlZmVyZW5jZVVSTCwgbnVsbHB0cikpOwogICAgIGlmICghdXJsKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBhdXRvIGZvbnREZXNjcmlwdG9ycyA9IGFkb3B0 Q0YoQ1RGb250TWFuYWdlckNyZWF0ZUZvbnREZXNjcmlwdG9yc0Zyb21VUkwodXJsLmdldCgpKSk7 CkBAIC00ODIsMTkgKzQ4NCwxOSBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JS ZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIHJlZmVyZW5jZQogICAgIGZvciAo Q0ZJbmRleCBpID0gMDsgaSA8IENGQXJyYXlHZXRDb3VudChmb250RGVzY3JpcHRvcnMuZ2V0KCkp OyArK2kpIHsKICAgICAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IHN0YXRpY19jYXN0PENURm9u dERlc2NyaXB0b3JSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoZm9udERlc2NyaXB0b3JzLmdl dCgpLCBpKSk7CiAgICAgICAgIGF1dG8gY3VycmVudFBvc3RTY3JpcHROYW1lID0gYWRvcHRDRihz dGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUoZm9u dERlc2NyaXB0b3IsIGtDVEZvbnROYW1lQXR0cmlidXRlKSkpOwotICAgICAgICBpZiAoU3RyaW5n KGN1cnJlbnRQb3N0U2NyaXB0TmFtZS5nZXQoKSkgPT0gcG9zdFNjcmlwdE5hbWUpCisgICAgICAg IGlmIChDRkVxdWFsKGN1cnJlbnRQb3N0U2NyaXB0TmFtZS5nZXQoKSwgcG9zdFNjcmlwdE5hbWUp KQogICAgICAgICAgICAgcmV0dXJuIGZvbnREZXNjcmlwdG9yOwogICAgIH0KICAgICByZXR1cm4g bnVsbHB0cjsKIH0KIAotc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChD RkRpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywgZmxvYXQgc2l6ZSwgY29uc3QgU3RyaW5nJiByZWZl cmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgZGVzaXJlZFBvc3RTY3JpcHROYW1lKQorc3RhdGljIFJl dGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRl cywgZmxvYXQgc2l6ZSwgQ1RGb250RGVzY3JpcHRvck9wdGlvbnMgb3B0aW9ucywgQ0ZTdHJpbmdS ZWYgcmVmZXJlbmNlVVJMLCBDRlN0cmluZ1JlZiBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiB7CiAg ICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdp dGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsKICAgICBpZiAoZm9udERlc2NyaXB0b3IpIHsKLSAg ICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JB bmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBrQ1RGb250T3B0 aW9uc1N5c3RlbVVJRm9udCkpOworICAgICAgICBhdXRvIGZvbnQgPSBhZG9wdENGKENURm9udENy ZWF0ZVdpdGhGb250RGVzY3JpcHRvckFuZE9wdGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNp emUsIG51bGxwdHIsIG9wdGlvbnMpKTsKICAgICAgICAgU3RyaW5nIGFjdHVhbFBvc3RTY3JpcHRO YW1lKGFkb3B0Q0YoQ1RGb250Q29weVBvc3RTY3JpcHROYW1lKGZvbnQuZ2V0KCkpKS5nZXQoKSk7 Ci0gICAgICAgIGlmIChhY3R1YWxQb3N0U2NyaXB0TmFtZSA9PSBkZXNpcmVkUG9zdFNjcmlwdE5h bWUpCisgICAgICAgIGlmIChDRkVxdWFsKGFjdHVhbFBvc3RTY3JpcHROYW1lLCBkZXNpcmVkUG9z dFNjcmlwdE5hbWUpKQogICAgICAgICAgICAgcmV0dXJuIGZvbnQ7CiAgICAgfQogCkBAIC01MDYs NyArNTA4LDcgQEAgc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRp Y3Rpb25hcnlSZWYgYXR0cmlidXRlcywgZmxvYXQgc2l6ZSwKICAgICAgICAgZm9udERlc2NyaXB0 b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVMYXN0UmVzb3J0KCkpOwogICAgIH0K ICAgICBBU1NFUlQoZm9udERlc2NyaXB0b3IpOwotICAgIHJldHVybiBhZG9wdENGKENURm9udENy ZWF0ZVdpdGhGb250RGVzY3JpcHRvckFuZE9wdGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNp emUsIG51bGxwdHIsIGtDVEZvbnRPcHRpb25zU3lzdGVtVUlGb250KSk7CisgICAgcmV0dXJuIGFk b3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yQW5kT3B0aW9ucyhmb250RGVzY3Jp cHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0ciwgb3B0aW9ucykpOwogfQogCiBzdGQ6Om9wdGlvbmFs PFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZv bnQ+Pjo6ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIpCkBAIC01NzcsMTcgKzU3 OSwyMiBAQCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50 Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjbwogICAgICAgICByZXR1cm4gV2ViQ29yZTo6 Rm9udFBsYXRmb3JtRGF0YShjdEZvbnQuZ2V0KCksICpzaXplLCAqc3ludGhldGljQm9sZCwgKnN5 bnRoZXRpY09ibGlxdWUsICpvcmllbnRhdGlvbiwgKndpZHRoVmFyaWFudCwgKnRleHRSZW5kZXJp bmdNb2RlLCAmY3JlYXRpb25EYXRhKTsKICAgICB9CiAKLSAgICBzdGQ6Om9wdGlvbmFsPFN0cmlu Zz4gcmVmZXJlbmNlVVJMOworICAgIHN0ZDo6b3B0aW9uYWw8Q1RGb250RGVzY3JpcHRvck9wdGlv bnM+IG9wdGlvbnM7CisgICAgZGVjb2RlciA+PiBvcHRpb25zOworICAgIGlmICghb3B0aW9ucykK KyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKworICAgIHN0ZDo6b3B0aW9uYWw8UmV0YWlu UHRyPENGU3RyaW5nUmVmPj4gcmVmZXJlbmNlVVJMOwogICAgIGRlY29kZXIgPj4gcmVmZXJlbmNl VVJMOwotICAgIGlmICghcmVmZXJlbmNlVVJMKQorICAgIGlmICghcmVmZXJlbmNlVVJMIHx8ICEq cmVmZXJlbmNlVVJMKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCi0gICAgc3RkOjpv cHRpb25hbDxTdHJpbmc+IHBvc3RTY3JpcHROYW1lOworICAgIHN0ZDo6b3B0aW9uYWw8UmV0YWlu UHRyPENGU3RyaW5nUmVmPj4gcG9zdFNjcmlwdE5hbWU7CiAgICAgZGVjb2RlciA+PiBwb3N0U2Ny aXB0TmFtZTsKLSAgICBpZiAoIXBvc3RTY3JpcHROYW1lKQorICAgIGlmICghcG9zdFNjcmlwdE5h bWUgfHwgISpwb3N0U2NyaXB0TmFtZSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAot ICAgIGF1dG8gY3RGb250ID0gY3JlYXRlQ1RGb250KGF0dHJpYnV0ZXMtPmdldCgpLCAqc2l6ZSwg KnJlZmVyZW5jZVVSTCwgKnBvc3RTY3JpcHROYW1lKTsKKyAgICBhdXRvIGN0Rm9udCA9IGNyZWF0 ZUNURm9udChhdHRyaWJ1dGVzLT5nZXQoKSwgKnNpemUsICpvcHRpb25zLCByZWZlcmVuY2VVUkwt PmdldCgpLCBwb3N0U2NyaXB0TmFtZS0+Z2V0KCkpOwogICAgIGlmICghY3RGb250KQogICAgICAg ICByZXR1cm4gc3RkOjpudWxsb3B0OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTFjOWFiM2M1ODUzMjM5ZTk1YzU0N2Y5 OTk4M2U5NjNlYjhlNDVjNi4uZDUxOTgyMGZjYTQ2NWQ4ODdkNzcxNzMwN2I1NjNhZmMyNzZjYjI0 OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAxLTI0ICBNeWxlcyBDLiBNYXhmaWVsZCAg PG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjgyMzIwKTogW0Nv Y29hXSBVc2VyLWluc3RhbGxlZCBmb250cyBkb24ndCB3b3JrIGluIHRoZSBHUFUgUHJvY2VzcyAo aW4gV0tXZWJWaWV3KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM1NDQ5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDk1ODk2MT4KKworICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIGZhc3QvdGV4dC91c2VyLWlu c3RhbGxlZC1jYW52YXMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0 L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sOiBBZGRlZC4KKwogMjAyMi0wMS0yNCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgcGl4ZWwgdG9s ZXJhbmNlIHRvIHNvbWUgY29tcG9zaXRpbmcgdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMtZXhwZWN0ZWQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5iY2ZjNTA4NWMwNWQxOGI4N2I1Yjc0NTAwM2ZhMWZmYjVhNTg3M2M3Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBl Y3RlZC5odG1sCkBAIC0wLDAgKzEsMTQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh ZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0 IG1ha2VzIHN1cmUgdGhhdCB1c2VyLWluc3RhbGxlZCBmb250cyB3b3JrIGNvcnJlY3RseSB3aGVu IGRyYXduIGludG8gY2FudmFzLiBUaGUgdGVzdCBwYXNzZXMgaWYgeW91IHNlZSBhIGJpZyBzb2xp ZCBibGFjayBzcXVhcmUgYmVsb3cgKGFuZCBub3QgYW4gQCBzaWduKS48L3A+Cis8Y2FudmFzIGlk PSJjYW52YXMiIHdpZHRoPSIzMDAiIGhlaWdodD0iMzAwIj48L2NhbnZhcz4KKzxzY3JpcHQ+Cits ZXQgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworY29udGV4dC5maWxsUmVjdCgw LCAwLCAzMDAsIDMwMCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40 YzZiNmU2OGU5NjU0ZmM4YjZjZGY2NGQxMTdjMDhlN2E3ZDc0NzdhCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCkBAIC0w LDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJz ZXQ9InV0Zi04Ij4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhh dCB1c2VyLWluc3RhbGxlZCBmb250cyB3b3JrIGNvcnJlY3RseSB3aGVuIGRyYXduIGludG8gY2Fu dmFzLiBUaGUgdGVzdCBwYXNzZXMgaWYgeW91IHNlZSBhIGJpZyBzb2xpZCBibGFjayBzcXVhcmUg YmVsb3cgKGFuZCBub3QgYW4gQCBzaWduKS48L3A+Cis8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRo PSIzMDAiIGhlaWdodD0iMzAwIj48L2NhbnZhcz4KKzxzY3JpcHQ+CitsZXQgY29udGV4dCA9IGNh bnZhcy5nZXRDb250ZXh0KCIyZCIpOworY29udGV4dC5mb250ID0gIjQwMHB4ICdBaGVtJyI7Citj b250ZXh0LmZpbGxUZXh0KCJBIiwgLTUwLCAyNzApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+Cg== 449892 2022-01-24 20:29:23 -0800 2022-01-24 20:31:01 -0800 Patch for committing bug-235449-20220124202922.patch text/plain 10297 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCAxMDNjOTQ5 M2ZjODNkNGM3MzBhMDNhMzE0MDA1NWU0Yzc3MDAyNDAzLi4wNWM1YWJmYTRhM2QyNzRiNGJjMmUw NzhhMDY0MzJhNmVjMWMwODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMi0wMS0yNCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMg ZG9uJ3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmg6CisKIDIwMjItMDEtMjQgIERh dmlkIFF1ZXNhZGEgIDxkYXZpZF9xdWVzYWRhQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlm eSBhY2Nlc3NlcyB0byBTeXN0ZW1WZXJzaW9uLnBsaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2NDFmYTgzMDZj OWVjYTJmM2QzY2YzODA4NzZjYmJiZTdhMDE3NzAuLjlmY2M0NjY0NzEyNDRkNmM1NzdjNzczNzI5 M2I4MDBjYzY3NGEyZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDEtMjQgIE15 bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OKHIyODIzMjApOiBbQ29jb2FdIFVzZXItaW5zdGFsbGVkIGZvbnRzIGRvbid0IHdvcmsgaW4g dGhlIEdQVSBQcm9jZXNzIChpbiBXS1dlYlZpZXcpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0NDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg0 OTU4OTYxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFRo ZSByZWFzb24gZm9yIHRoaXMgYnVnIHdhcyBJIHdhcyBtaXN1c2luZyBrQ1RGb250T3B0aW9uc1N5 c3RlbVVJRm9udC4gSSB0aG91Z2h0IHRoaXMgZmxhZyBqdXN0CisgICAgICAgIG1lYW50ICJhbGxv dyB0aGUgY3JlYXRpb24gb2Ygc3lzdGVtIGZvbnRzIiBidXQgaXQgdHVybnMgb3V0IGl0IG1lYW5z IHNvbWV0aGluZyBtb3JlIHN1YnRsZSB0aGFuCisgICAgICAgIHRoYXQuIEluc3RlYWQgb2YgdW5j b25kaXRpb25hbGx5IHNwZWNpZnlpbmcgdGhpcyBmbGFnLCB3ZSBzaG91bGQganVzdCBwdWxsIG91 dCB0aGUgb3B0aW9ucyBmaWVsZAorICAgICAgICBmcm9tIHRoZSBzb3VyY2UgZm9udCAod2hpY2gg d2lsbCBpbmNsdWRlIHRoYXQgZmxhZyBpZiB0aGUgZm9udCB3YXMgYSBzeXN0ZW0gZm9udCkgYW5k IHVzZSB0aGF0CisgICAgICAgIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L3Vz ZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2ViQ29y ZUFyZ3VtZW50Q29kZXJzQ29jb2EubW06CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVm PFdlYkNvcmU6OkZvbnQ+Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKElQQzo6Y3Jl YXRlQ1RGb250KToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9u dD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEpOgorCiAyMDIyLTAxLTI0ICBEYXZpZCBRdWVzYWRhICA8 ZGF2aWRfcXVlc2FkYUBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgYWNjZXNzZXMgdG8g U3lzdGVtVmVyc2lvbi5wbGlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY2YvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVU ZXh0U1BJLmgKaW5kZXggNDYxYmM2ZDVlNWNmNjhiNzczMTVlNmQxMzM3NzQ5MjExZjQ1OWQzNi4u ZjI1N2UxYTg4NGZlMzNjYTY0NTgxNTg4ZDI0NWQ4ZmQ1NWVkYmYyYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCkBAIC05NSw2ICs5NSwxMCBAQCB0eXBl ZGVmIENGX0VOVU0oQ0ZJbmRleCwgQ1RGb250UGFsZXR0ZSkKIAogdHlwZWRlZiBjb25zdCBzdHJ1 Y3QgX19PVFNWR1RhYmxlICogT1RTVkdUYWJsZVJlZjsKIAordHlwZWRlZiBDRl9PUFRJT05TKHVp bnQzMl90LCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucykgeworICAgIGtDVEZvbnREZXNjcmlwdG9y T3B0aW9uVGhpc0lzTm90QVJlYWxPcHRpb24gPSAweEZGRkZGRkZGCit9OworCiAjZW5kaWYKIAog V1RGX0VYVEVSTl9DX0JFR0lOCkBAIC0yMjIsNCArMjI2LDYgQEAgYm9vbCBDVEZvbnRJc0FwcGxl Q29sb3JFbW9qaShDVEZvbnRSZWYpOwogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3Rl cnMoQ1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENG SW5kZXggbGVuZ3RoLCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKIENHRmxvYXQgQ1RGb250R2V0 U2JpeEltYWdlU2l6ZUZvckdseXBoQW5kQ29udGVudHNTY2FsZShDVEZvbnRSZWYsIGNvbnN0IENH R2x5cGgsIENHRmxvYXQgY29udGVudHNTY2FsZSk7CiAKK0NURm9udERlc2NyaXB0b3JPcHRpb25z IENURm9udERlc2NyaXB0b3JHZXRPcHRpb25zKENURm9udERlc2NyaXB0b3JSZWYpOworCiBXVEZf RVhURVJOX0NfRU5ECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJD b3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dl YkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tCmluZGV4IDQ0MjJkNjcyMmY1MDNjZTI3Njg1MjA1 MGFkZjgxOTQ2OTdjYTA3OGMuLjdlYTYyMjRjY2U2YTBmNzIwYzY1MjJjOGNhMTQ0ZWQwMmY1NmFk ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVu dENvZGVyc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVB cmd1bWVudENvZGVyc0NvY29hLm1tCkBAIC00NjEsMTYgKzQ2MSwxOCBAQCB2b2lkIEFyZ3VtZW50 Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbgogICAgICAgICBlbmNvZGVyIDw8IGNyZWF0aW9uRGF0YS0+Zm9udEZhY2VEYXRh OwogICAgICAgICBlbmNvZGVyIDw8IGNyZWF0aW9uRGF0YS0+aXRlbUluQ29sbGVjdGlvbjsKICAg ICB9IGVsc2UgeworICAgICAgICBhdXRvIG9wdGlvbnMgPSBDVEZvbnREZXNjcmlwdG9yR2V0T3B0 aW9ucyhmb250RGVzY3JpcHRvci5nZXQoKSk7CisgICAgICAgIGVuY29kZXIgPDwgb3B0aW9uczsK ICAgICAgICAgYXV0byByZWZlcmVuY2VVUkwgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGVVJMUmVm PihDVEZvbnRDb3B5QXR0cmlidXRlKGN0Rm9udCwga0NURm9udFJlZmVyZW5jZVVSTEF0dHJpYnV0 ZSkpKTsKICAgICAgICAgYXV0byBzdHJpbmcgPSBDRlVSTEdldFN0cmluZyhyZWZlcmVuY2VVUkwu Z2V0KCkpOwotICAgICAgICBlbmNvZGVyIDw8IFN0cmluZyhzdHJpbmcpOwotICAgICAgICBlbmNv ZGVyIDw8IFN0cmluZyhhZG9wdENGKENURm9udENvcHlQb3N0U2NyaXB0TmFtZShjdEZvbnQpKS5n ZXQoKSk7CisgICAgICAgIGVuY29kZXIgPDwgc3RyaW5nOworICAgICAgICBlbmNvZGVyIDw8IGFk b3B0Q0YoQ1RGb250Q29weVBvc3RTY3JpcHROYW1lKGN0Rm9udCkpLmdldCgpOwogICAgIH0KIH0K IAotc3RhdGljIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmaW5kRm9udERlc2NyaXB0 b3IoY29uc3QgU3RyaW5nJiByZWZlcmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgcG9zdFNjcmlwdE5h bWUpCitzdGF0aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3Jp cHRvcihDRlN0cmluZ1JlZiByZWZlcmVuY2VVUkwsIENGU3RyaW5nUmVmIHBvc3RTY3JpcHROYW1l KQogewotICAgIGF1dG8gdXJsID0gYWRvcHRDRihDRlVSTENyZWF0ZVdpdGhTdHJpbmcoa0NGQWxs b2NhdG9yRGVmYXVsdCwgcmVmZXJlbmNlVVJMLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIG51bGxw dHIpKTsKKyAgICBhdXRvIHVybCA9IGFkb3B0Q0YoQ0ZVUkxDcmVhdGVXaXRoU3RyaW5nKGtDRkFs bG9jYXRvckRlZmF1bHQsIHJlZmVyZW5jZVVSTCwgbnVsbHB0cikpOwogICAgIGlmICghdXJsKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBhdXRvIGZvbnREZXNjcmlwdG9ycyA9IGFkb3B0 Q0YoQ1RGb250TWFuYWdlckNyZWF0ZUZvbnREZXNjcmlwdG9yc0Zyb21VUkwodXJsLmdldCgpKSk7 CkBAIC00ODIsMTkgKzQ4NCwxOSBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JS ZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIHJlZmVyZW5jZQogICAgIGZvciAo Q0ZJbmRleCBpID0gMDsgaSA8IENGQXJyYXlHZXRDb3VudChmb250RGVzY3JpcHRvcnMuZ2V0KCkp OyArK2kpIHsKICAgICAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IHN0YXRpY19jYXN0PENURm9u dERlc2NyaXB0b3JSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoZm9udERlc2NyaXB0b3JzLmdl dCgpLCBpKSk7CiAgICAgICAgIGF1dG8gY3VycmVudFBvc3RTY3JpcHROYW1lID0gYWRvcHRDRihz dGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUoZm9u dERlc2NyaXB0b3IsIGtDVEZvbnROYW1lQXR0cmlidXRlKSkpOwotICAgICAgICBpZiAoU3RyaW5n KGN1cnJlbnRQb3N0U2NyaXB0TmFtZS5nZXQoKSkgPT0gcG9zdFNjcmlwdE5hbWUpCisgICAgICAg IGlmIChDRkVxdWFsKGN1cnJlbnRQb3N0U2NyaXB0TmFtZS5nZXQoKSwgcG9zdFNjcmlwdE5hbWUp KQogICAgICAgICAgICAgcmV0dXJuIGZvbnREZXNjcmlwdG9yOwogICAgIH0KICAgICByZXR1cm4g bnVsbHB0cjsKIH0KIAotc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChD RkRpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywgZmxvYXQgc2l6ZSwgY29uc3QgU3RyaW5nJiByZWZl cmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgZGVzaXJlZFBvc3RTY3JpcHROYW1lKQorc3RhdGljIFJl dGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRl cywgZmxvYXQgc2l6ZSwgQ1RGb250RGVzY3JpcHRvck9wdGlvbnMgb3B0aW9ucywgQ0ZTdHJpbmdS ZWYgcmVmZXJlbmNlVVJMLCBDRlN0cmluZ1JlZiBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiB7CiAg ICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdp dGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsKICAgICBpZiAoZm9udERlc2NyaXB0b3IpIHsKLSAg ICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JB bmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBrQ1RGb250T3B0 aW9uc1N5c3RlbVVJRm9udCkpOwotICAgICAgICBTdHJpbmcgYWN0dWFsUG9zdFNjcmlwdE5hbWUo YWRvcHRDRihDVEZvbnRDb3B5UG9zdFNjcmlwdE5hbWUoZm9udC5nZXQoKSkpLmdldCgpKTsKLSAg ICAgICAgaWYgKGFjdHVhbFBvc3RTY3JpcHROYW1lID09IGRlc2lyZWRQb3N0U2NyaXB0TmFtZSkK KyAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0 b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBvcHRpb25z KSk7CisgICAgICAgIGF1dG8gYWN0dWFsUG9zdFNjcmlwdE5hbWUgPSBhZG9wdENGKENURm9udENv cHlQb3N0U2NyaXB0TmFtZShmb250LmdldCgpKSk7CisgICAgICAgIGlmIChDRkVxdWFsKGFjdHVh bFBvc3RTY3JpcHROYW1lLCBkZXNpcmVkUG9zdFNjcmlwdE5hbWUuZ2V0KCkpKQogICAgICAgICAg ICAgcmV0dXJuIGZvbnQ7CiAgICAgfQogCkBAIC01MDYsNyArNTA4LDcgQEAgc3RhdGljIFJldGFp blB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywg ZmxvYXQgc2l6ZSwKICAgICAgICAgZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2Ny aXB0b3JDcmVhdGVMYXN0UmVzb3J0KCkpOwogICAgIH0KICAgICBBU1NFUlQoZm9udERlc2NyaXB0 b3IpOwotICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvckFu ZE9wdGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIsIGtDVEZvbnRPcHRp b25zU3lzdGVtVUlGb250KSk7CisgICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZv bnREZXNjcmlwdG9yQW5kT3B0aW9ucyhmb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0 ciwgb3B0aW9ucykpOwogfQogCiBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURh dGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjb2RlUGxhdGZvcm1EYXRh KERlY29kZXImIGRlY29kZXIpCkBAIC01NzcsMTcgKzU3OSwyMiBAQCBzdGQ6Om9wdGlvbmFsPFdl YkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+ Pjo6ZGVjbwogICAgICAgICByZXR1cm4gV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YShjdEZvbnQu Z2V0KCksICpzaXplLCAqc3ludGhldGljQm9sZCwgKnN5bnRoZXRpY09ibGlxdWUsICpvcmllbnRh dGlvbiwgKndpZHRoVmFyaWFudCwgKnRleHRSZW5kZXJpbmdNb2RlLCAmY3JlYXRpb25EYXRhKTsK ICAgICB9CiAKLSAgICBzdGQ6Om9wdGlvbmFsPFN0cmluZz4gcmVmZXJlbmNlVVJMOworICAgIHN0 ZDo6b3B0aW9uYWw8Q1RGb250RGVzY3JpcHRvck9wdGlvbnM+IG9wdGlvbnM7CisgICAgZGVjb2Rl ciA+PiBvcHRpb25zOworICAgIGlmICghb3B0aW9ucykKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVs bG9wdDsKKworICAgIHN0ZDo6b3B0aW9uYWw8UmV0YWluUHRyPENGU3RyaW5nUmVmPj4gcmVmZXJl bmNlVVJMOwogICAgIGRlY29kZXIgPj4gcmVmZXJlbmNlVVJMOwotICAgIGlmICghcmVmZXJlbmNl VVJMKQorICAgIGlmICghcmVmZXJlbmNlVVJMIHx8ICEqcmVmZXJlbmNlVVJMKQogICAgICAgICBy ZXR1cm4gc3RkOjpudWxsb3B0OwogCi0gICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHBvc3RTY3Jp cHROYW1lOworICAgIHN0ZDo6b3B0aW9uYWw8UmV0YWluUHRyPENGU3RyaW5nUmVmPj4gcG9zdFNj cmlwdE5hbWU7CiAgICAgZGVjb2RlciA+PiBwb3N0U2NyaXB0TmFtZTsKLSAgICBpZiAoIXBvc3RT Y3JpcHROYW1lKQorICAgIGlmICghcG9zdFNjcmlwdE5hbWUgfHwgISpwb3N0U2NyaXB0TmFtZSkK ICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIGF1dG8gY3RGb250ID0gY3JlYXRl Q1RGb250KGF0dHJpYnV0ZXMtPmdldCgpLCAqc2l6ZSwgKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3Jp cHROYW1lKTsKKyAgICBhdXRvIGN0Rm9udCA9IGNyZWF0ZUNURm9udChhdHRyaWJ1dGVzLT5nZXQo KSwgKnNpemUsICpvcHRpb25zLCByZWZlcmVuY2VVUkwtPmdldCgpLCBwb3N0U2NyaXB0TmFtZS0+ Z2V0KCkpOwogICAgIGlmICghY3RGb250KQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0Owog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggYTFjOWFiM2M1ODUzMjM5ZTk1YzU0N2Y5OTk4M2U5NjNlYjhlNDVjNi4uZDUxOTgy MGZjYTQ2NWQ4ODdkNzcxNzMwN2I1NjNhZmMyNzZjYjI0OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIyLTAxLTI0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTihyMjgyMzIwKTogW0NvY29hXSBVc2VyLWluc3RhbGxlZCBmb250 cyBkb24ndCB3b3JrIGluIHRoZSBHUFUgUHJvY2VzcyAoaW4gV0tXZWJWaWV3KQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1NDQ5CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS84NDk1ODk2MT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KKworICAgICAgICAqIGZhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMtZXhwZWN0ZWQu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5o dG1sOiBBZGRlZC4KKwogMjAyMi0wMS0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgcGl4ZWwgdG9sZXJhbmNlIHRvIHNvbWUgY29tcG9zaXRp bmcgdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWluc3RhbGxl ZC1jYW52YXMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWluc3Rh bGxlZC1jYW52YXMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iY2ZjNTA4NWMwNWQxOGI4N2I1 Yjc0NTAwM2ZhMWZmYjVhNTg3M2M3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTQg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04 Ij4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCB1c2VyLWlu c3RhbGxlZCBmb250cyB3b3JrIGNvcnJlY3RseSB3aGVuIGRyYXduIGludG8gY2FudmFzLiBUaGUg dGVzdCBwYXNzZXMgaWYgeW91IHNlZSBhIGJpZyBzb2xpZCBibGFjayBzcXVhcmUgYmVsb3cgKGFu ZCBub3QgYW4gQCBzaWduKS48L3A+Cis8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIzMDAiIGhl aWdodD0iMzAwIj48L2NhbnZhcz4KKzxzY3JpcHQ+CitsZXQgY29udGV4dCA9IGNhbnZhcy5nZXRD b250ZXh0KCIyZCIpOworY29udGV4dC5maWxsUmVjdCgwLCAwLCAzMDAsIDMwMCk7Cis8L3Njcmlw dD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91 c2VyLWluc3RhbGxlZC1jYW52YXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWlu c3RhbGxlZC1jYW52YXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40YzZiNmU2OGU5NjU0ZmM4YjZjZGY2NGQx MTdjMDhlN2E3ZDc0NzdhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzwvaGVhZD4KKzxi b2R5PgorPHA+VGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCB1c2VyLWluc3RhbGxlZCBmb250cyB3 b3JrIGNvcnJlY3RseSB3aGVuIGRyYXduIGludG8gY2FudmFzLiBUaGUgdGVzdCBwYXNzZXMgaWYg eW91IHNlZSBhIGJpZyBzb2xpZCBibGFjayBzcXVhcmUgYmVsb3cgKGFuZCBub3QgYW4gQCBzaWdu KS48L3A+Cis8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIzMDAiIGhlaWdodD0iMzAwIj48L2Nh bnZhcz4KKzxzY3JpcHQ+CitsZXQgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOwor Y29udGV4dC5mb250ID0gIjQwMHB4ICdBaGVtJyI7Citjb250ZXh0LmZpbGxUZXh0KCJBIiwgLTUw LCAyNzApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 449893 2022-01-24 20:30:32 -0800 2022-01-24 20:30:32 -0800 Patch for committing bug-235449-20220124203032.patch text/plain 10297 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCAxMDNjOTQ5 M2ZjODNkNGM3MzBhMDNhMzE0MDA1NWU0Yzc3MDAyNDAzLi4wNWM1YWJmYTRhM2QyNzRiNGJjMmUw NzhhMDY0MzJhNmVjMWMwODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAyMi0wMS0yNCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg ICAgICAgIFJFR1JFU1NJT04ocjI4MjMyMCk6IFtDb2NvYV0gVXNlci1pbnN0YWxsZWQgZm9udHMg ZG9uJ3Qgd29yayBpbiB0aGUgR1BVIFByb2Nlc3MgKGluIFdLV2ViVmlldykKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTQ0OQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vODQ5NTg5NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CisKKyAgICAgICAgKiBwYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmg6CisKIDIwMjItMDEtMjQgIERh dmlkIFF1ZXNhZGEgIDxkYXZpZF9xdWVzYWRhQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlm eSBhY2Nlc3NlcyB0byBTeXN0ZW1WZXJzaW9uLnBsaXN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2NDFmYTgzMDZj OWVjYTJmM2QzY2YzODA4NzZjYmJiZTdhMDE3NzAuLjlmY2M0NjY0NzEyNDRkNmM1NzdjNzczNzI5 M2I4MDBjYzY3NGEyZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDEtMjQgIE15 bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OKHIyODIzMjApOiBbQ29jb2FdIFVzZXItaW5zdGFsbGVkIGZvbnRzIGRvbid0IHdvcmsgaW4g dGhlIEdQVSBQcm9jZXNzIChpbiBXS1dlYlZpZXcpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU0NDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg0 OTU4OTYxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFRo ZSByZWFzb24gZm9yIHRoaXMgYnVnIHdhcyBJIHdhcyBtaXN1c2luZyBrQ1RGb250T3B0aW9uc1N5 c3RlbVVJRm9udC4gSSB0aG91Z2h0IHRoaXMgZmxhZyBqdXN0CisgICAgICAgIG1lYW50ICJhbGxv dyB0aGUgY3JlYXRpb24gb2Ygc3lzdGVtIGZvbnRzIiBidXQgaXQgdHVybnMgb3V0IGl0IG1lYW5z IHNvbWV0aGluZyBtb3JlIHN1YnRsZSB0aGFuCisgICAgICAgIHRoYXQuIEluc3RlYWQgb2YgdW5j b25kaXRpb25hbGx5IHNwZWNpZnlpbmcgdGhpcyBmbGFnLCB3ZSBzaG91bGQganVzdCBwdWxsIG91 dCB0aGUgb3B0aW9ucyBmaWVsZAorICAgICAgICBmcm9tIHRoZSBzb3VyY2UgZm9udCAod2hpY2gg d2lsbCBpbmNsdWRlIHRoYXQgZmxhZyBpZiB0aGUgZm9udCB3YXMgYSBzeXN0ZW0gZm9udCkgYW5k IHVzZSB0aGF0CisgICAgICAgIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L3Vz ZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2ViQ29y ZUFyZ3VtZW50Q29kZXJzQ29jb2EubW06CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVm PFdlYkNvcmU6OkZvbnQ+Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKElQQzo6Y3Jl YXRlQ1RGb250KToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9u dD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEpOgorCiAyMDIyLTAxLTI0ICBEYXZpZCBRdWVzYWRhICA8 ZGF2aWRfcXVlc2FkYUBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgYWNjZXNzZXMgdG8g U3lzdGVtVmVyc2lvbi5wbGlzdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY2YvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVU ZXh0U1BJLmgKaW5kZXggNDYxYmM2ZDVlNWNmNjhiNzczMTVlNmQxMzM3NzQ5MjExZjQ1OWQzNi4u ZjI1N2UxYTg4NGZlMzNjYTY0NTgxNTg4ZDI0NWQ4ZmQ1NWVkYmYyYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCkBAIC05NSw2ICs5NSwxMCBAQCB0eXBl ZGVmIENGX0VOVU0oQ0ZJbmRleCwgQ1RGb250UGFsZXR0ZSkKIAogdHlwZWRlZiBjb25zdCBzdHJ1 Y3QgX19PVFNWR1RhYmxlICogT1RTVkdUYWJsZVJlZjsKIAordHlwZWRlZiBDRl9PUFRJT05TKHVp bnQzMl90LCBDVEZvbnREZXNjcmlwdG9yT3B0aW9ucykgeworICAgIGtDVEZvbnREZXNjcmlwdG9y T3B0aW9uVGhpc0lzTm90QVJlYWxPcHRpb24gPSAweEZGRkZGRkZGCit9OworCiAjZW5kaWYKIAog V1RGX0VYVEVSTl9DX0JFR0lOCkBAIC0yMjIsNCArMjI2LDYgQEAgYm9vbCBDVEZvbnRJc0FwcGxl Q29sb3JFbW9qaShDVEZvbnRSZWYpOwogQ1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3Rl cnMoQ1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENG SW5kZXggbGVuZ3RoLCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKIENHRmxvYXQgQ1RGb250R2V0 U2JpeEltYWdlU2l6ZUZvckdseXBoQW5kQ29udGVudHNTY2FsZShDVEZvbnRSZWYsIGNvbnN0IENH R2x5cGgsIENHRmxvYXQgY29udGVudHNTY2FsZSk7CiAKK0NURm9udERlc2NyaXB0b3JPcHRpb25z IENURm9udERlc2NyaXB0b3JHZXRPcHRpb25zKENURm9udERlc2NyaXB0b3JSZWYpOworCiBXVEZf RVhURVJOX0NfRU5ECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJD b3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dl YkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tCmluZGV4IDQ0MjJkNjcyMmY1MDNjZTI3Njg1MjA1 MGFkZjgxOTQ2OTdjYTA3OGMuLjE0M2I3Mjc5NDk1MmZlMjNmMTJlMTUyYjVmZWZmMTFiYjkyYjRk ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVu dENvZGVyc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVB cmd1bWVudENvZGVyc0NvY29hLm1tCkBAIC00NjEsMTYgKzQ2MSwxOCBAQCB2b2lkIEFyZ3VtZW50 Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZW5jb2RlUGxhdGZvcm1EYXRhKEVuY29kZXImIGVu Y29kZXIsIGNvbgogICAgICAgICBlbmNvZGVyIDw8IGNyZWF0aW9uRGF0YS0+Zm9udEZhY2VEYXRh OwogICAgICAgICBlbmNvZGVyIDw8IGNyZWF0aW9uRGF0YS0+aXRlbUluQ29sbGVjdGlvbjsKICAg ICB9IGVsc2UgeworICAgICAgICBhdXRvIG9wdGlvbnMgPSBDVEZvbnREZXNjcmlwdG9yR2V0T3B0 aW9ucyhmb250RGVzY3JpcHRvci5nZXQoKSk7CisgICAgICAgIGVuY29kZXIgPDwgb3B0aW9uczsK ICAgICAgICAgYXV0byByZWZlcmVuY2VVUkwgPSBhZG9wdENGKHN0YXRpY19jYXN0PENGVVJMUmVm PihDVEZvbnRDb3B5QXR0cmlidXRlKGN0Rm9udCwga0NURm9udFJlZmVyZW5jZVVSTEF0dHJpYnV0 ZSkpKTsKICAgICAgICAgYXV0byBzdHJpbmcgPSBDRlVSTEdldFN0cmluZyhyZWZlcmVuY2VVUkwu Z2V0KCkpOwotICAgICAgICBlbmNvZGVyIDw8IFN0cmluZyhzdHJpbmcpOwotICAgICAgICBlbmNv ZGVyIDw8IFN0cmluZyhhZG9wdENGKENURm9udENvcHlQb3N0U2NyaXB0TmFtZShjdEZvbnQpKS5n ZXQoKSk7CisgICAgICAgIGVuY29kZXIgPDwgc3RyaW5nOworICAgICAgICBlbmNvZGVyIDw8IGFk b3B0Q0YoQ1RGb250Q29weVBvc3RTY3JpcHROYW1lKGN0Rm9udCkpLmdldCgpOwogICAgIH0KIH0K IAotc3RhdGljIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmaW5kRm9udERlc2NyaXB0 b3IoY29uc3QgU3RyaW5nJiByZWZlcmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgcG9zdFNjcmlwdE5h bWUpCitzdGF0aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3Jp cHRvcihDRlN0cmluZ1JlZiByZWZlcmVuY2VVUkwsIENGU3RyaW5nUmVmIHBvc3RTY3JpcHROYW1l KQogewotICAgIGF1dG8gdXJsID0gYWRvcHRDRihDRlVSTENyZWF0ZVdpdGhTdHJpbmcoa0NGQWxs b2NhdG9yRGVmYXVsdCwgcmVmZXJlbmNlVVJMLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIG51bGxw dHIpKTsKKyAgICBhdXRvIHVybCA9IGFkb3B0Q0YoQ0ZVUkxDcmVhdGVXaXRoU3RyaW5nKGtDRkFs bG9jYXRvckRlZmF1bHQsIHJlZmVyZW5jZVVSTCwgbnVsbHB0cikpOwogICAgIGlmICghdXJsKQog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBhdXRvIGZvbnREZXNjcmlwdG9ycyA9IGFkb3B0 Q0YoQ1RGb250TWFuYWdlckNyZWF0ZUZvbnREZXNjcmlwdG9yc0Zyb21VUkwodXJsLmdldCgpKSk7 CkBAIC00ODIsMTkgKzQ4NCwxOSBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JS ZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25zdCBTdHJpbmcmIHJlZmVyZW5jZQogICAgIGZvciAo Q0ZJbmRleCBpID0gMDsgaSA8IENGQXJyYXlHZXRDb3VudChmb250RGVzY3JpcHRvcnMuZ2V0KCkp OyArK2kpIHsKICAgICAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IHN0YXRpY19jYXN0PENURm9u dERlc2NyaXB0b3JSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoZm9udERlc2NyaXB0b3JzLmdl dCgpLCBpKSk7CiAgICAgICAgIGF1dG8gY3VycmVudFBvc3RTY3JpcHROYW1lID0gYWRvcHRDRihz dGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUoZm9u dERlc2NyaXB0b3IsIGtDVEZvbnROYW1lQXR0cmlidXRlKSkpOwotICAgICAgICBpZiAoU3RyaW5n KGN1cnJlbnRQb3N0U2NyaXB0TmFtZS5nZXQoKSkgPT0gcG9zdFNjcmlwdE5hbWUpCisgICAgICAg IGlmIChDRkVxdWFsKGN1cnJlbnRQb3N0U2NyaXB0TmFtZS5nZXQoKSwgcG9zdFNjcmlwdE5hbWUp KQogICAgICAgICAgICAgcmV0dXJuIGZvbnREZXNjcmlwdG9yOwogICAgIH0KICAgICByZXR1cm4g bnVsbHB0cjsKIH0KIAotc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChD RkRpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywgZmxvYXQgc2l6ZSwgY29uc3QgU3RyaW5nJiByZWZl cmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgZGVzaXJlZFBvc3RTY3JpcHROYW1lKQorc3RhdGljIFJl dGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRl cywgZmxvYXQgc2l6ZSwgQ1RGb250RGVzY3JpcHRvck9wdGlvbnMgb3B0aW9ucywgQ0ZTdHJpbmdS ZWYgcmVmZXJlbmNlVVJMLCBDRlN0cmluZ1JlZiBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpCiB7CiAg ICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdp dGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsKICAgICBpZiAoZm9udERlc2NyaXB0b3IpIHsKLSAg ICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JB bmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBrQ1RGb250T3B0 aW9uc1N5c3RlbVVJRm9udCkpOwotICAgICAgICBTdHJpbmcgYWN0dWFsUG9zdFNjcmlwdE5hbWUo YWRvcHRDRihDVEZvbnRDb3B5UG9zdFNjcmlwdE5hbWUoZm9udC5nZXQoKSkpLmdldCgpKTsKLSAg ICAgICAgaWYgKGFjdHVhbFBvc3RTY3JpcHROYW1lID09IGRlc2lyZWRQb3N0U2NyaXB0TmFtZSkK KyAgICAgICAgYXV0byBmb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0 b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBvcHRpb25z KSk7CisgICAgICAgIGF1dG8gYWN0dWFsUG9zdFNjcmlwdE5hbWUgPSBhZG9wdENGKENURm9udENv cHlQb3N0U2NyaXB0TmFtZShmb250LmdldCgpKSk7CisgICAgICAgIGlmIChDRkVxdWFsKGFjdHVh bFBvc3RTY3JpcHROYW1lLmdldCgpLCBkZXNpcmVkUG9zdFNjcmlwdE5hbWUpKQogICAgICAgICAg ICAgcmV0dXJuIGZvbnQ7CiAgICAgfQogCkBAIC01MDYsNyArNTA4LDcgQEAgc3RhdGljIFJldGFp blB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywg ZmxvYXQgc2l6ZSwKICAgICAgICAgZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2Ny aXB0b3JDcmVhdGVMYXN0UmVzb3J0KCkpOwogICAgIH0KICAgICBBU1NFUlQoZm9udERlc2NyaXB0 b3IpOwotICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvckFu ZE9wdGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIsIGtDVEZvbnRPcHRp b25zU3lzdGVtVUlGb250KSk7CisgICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZv bnREZXNjcmlwdG9yQW5kT3B0aW9ucyhmb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0 ciwgb3B0aW9ucykpOwogfQogCiBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURh dGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjb2RlUGxhdGZvcm1EYXRh KERlY29kZXImIGRlY29kZXIpCkBAIC01NzcsMTcgKzU3OSwyMiBAQCBzdGQ6Om9wdGlvbmFsPFdl YkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+ Pjo6ZGVjbwogICAgICAgICByZXR1cm4gV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YShjdEZvbnQu Z2V0KCksICpzaXplLCAqc3ludGhldGljQm9sZCwgKnN5bnRoZXRpY09ibGlxdWUsICpvcmllbnRh dGlvbiwgKndpZHRoVmFyaWFudCwgKnRleHRSZW5kZXJpbmdNb2RlLCAmY3JlYXRpb25EYXRhKTsK ICAgICB9CiAKLSAgICBzdGQ6Om9wdGlvbmFsPFN0cmluZz4gcmVmZXJlbmNlVVJMOworICAgIHN0 ZDo6b3B0aW9uYWw8Q1RGb250RGVzY3JpcHRvck9wdGlvbnM+IG9wdGlvbnM7CisgICAgZGVjb2Rl ciA+PiBvcHRpb25zOworICAgIGlmICghb3B0aW9ucykKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVs bG9wdDsKKworICAgIHN0ZDo6b3B0aW9uYWw8UmV0YWluUHRyPENGU3RyaW5nUmVmPj4gcmVmZXJl bmNlVVJMOwogICAgIGRlY29kZXIgPj4gcmVmZXJlbmNlVVJMOwotICAgIGlmICghcmVmZXJlbmNl VVJMKQorICAgIGlmICghcmVmZXJlbmNlVVJMIHx8ICEqcmVmZXJlbmNlVVJMKQogICAgICAgICBy ZXR1cm4gc3RkOjpudWxsb3B0OwogCi0gICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IHBvc3RTY3Jp cHROYW1lOworICAgIHN0ZDo6b3B0aW9uYWw8UmV0YWluUHRyPENGU3RyaW5nUmVmPj4gcG9zdFNj cmlwdE5hbWU7CiAgICAgZGVjb2RlciA+PiBwb3N0U2NyaXB0TmFtZTsKLSAgICBpZiAoIXBvc3RT Y3JpcHROYW1lKQorICAgIGlmICghcG9zdFNjcmlwdE5hbWUgfHwgISpwb3N0U2NyaXB0TmFtZSkK ICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIGF1dG8gY3RGb250ID0gY3JlYXRl Q1RGb250KGF0dHJpYnV0ZXMtPmdldCgpLCAqc2l6ZSwgKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3Jp cHROYW1lKTsKKyAgICBhdXRvIGN0Rm9udCA9IGNyZWF0ZUNURm9udChhdHRyaWJ1dGVzLT5nZXQo KSwgKnNpemUsICpvcHRpb25zLCByZWZlcmVuY2VVUkwtPmdldCgpLCBwb3N0U2NyaXB0TmFtZS0+ Z2V0KCkpOwogICAgIGlmICghY3RGb250KQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0Owog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggYTFjOWFiM2M1ODUzMjM5ZTk1YzU0N2Y5OTk4M2U5NjNlYjhlNDVjNi4uZDUxOTgy MGZjYTQ2NWQ4ODdkNzcxNzMwN2I1NjNhZmMyNzZjYjI0OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIyLTAxLTI0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisK KyAgICAgICAgUkVHUkVTU0lPTihyMjgyMzIwKTogW0NvY29hXSBVc2VyLWluc3RhbGxlZCBmb250 cyBkb24ndCB3b3JrIGluIHRoZSBHUFUgUHJvY2VzcyAoaW4gV0tXZWJWaWV3KQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1NDQ5CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS84NDk1ODk2MT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KKworICAgICAgICAqIGZhc3QvdGV4dC91c2VyLWluc3RhbGxlZC1jYW52YXMtZXhwZWN0ZWQu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5o dG1sOiBBZGRlZC4KKwogMjAyMi0wMS0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgcGl4ZWwgdG9sZXJhbmNlIHRvIHNvbWUgY29tcG9zaXRp bmcgdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWluc3RhbGxl ZC1jYW52YXMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWluc3Rh bGxlZC1jYW52YXMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iY2ZjNTA4NWMwNWQxOGI4N2I1 Yjc0NTAwM2ZhMWZmYjVhNTg3M2M3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC90ZXh0L3VzZXItaW5zdGFsbGVkLWNhbnZhcy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTQg QEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04 Ij4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCB1c2VyLWlu c3RhbGxlZCBmb250cyB3b3JrIGNvcnJlY3RseSB3aGVuIGRyYXduIGludG8gY2FudmFzLiBUaGUg dGVzdCBwYXNzZXMgaWYgeW91IHNlZSBhIGJpZyBzb2xpZCBibGFjayBzcXVhcmUgYmVsb3cgKGFu ZCBub3QgYW4gQCBzaWduKS48L3A+Cis8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIzMDAiIGhl aWdodD0iMzAwIj48L2NhbnZhcz4KKzxzY3JpcHQ+CitsZXQgY29udGV4dCA9IGNhbnZhcy5nZXRD b250ZXh0KCIyZCIpOworY29udGV4dC5maWxsUmVjdCgwLCAwLCAzMDAsIDMwMCk7Cis8L3Njcmlw dD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91 c2VyLWluc3RhbGxlZC1jYW52YXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC91c2VyLWlu c3RhbGxlZC1jYW52YXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40YzZiNmU2OGU5NjU0ZmM4YjZjZGY2NGQx MTdjMDhlN2E3ZDc0NzdhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L3VzZXItaW5zdGFsbGVkLWNhbnZhcy5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzwvaGVhZD4KKzxi b2R5PgorPHA+VGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCB1c2VyLWluc3RhbGxlZCBmb250cyB3 b3JrIGNvcnJlY3RseSB3aGVuIGRyYXduIGludG8gY2FudmFzLiBUaGUgdGVzdCBwYXNzZXMgaWYg eW91IHNlZSBhIGJpZyBzb2xpZCBibGFjayBzcXVhcmUgYmVsb3cgKGFuZCBub3QgYW4gQCBzaWdu KS48L3A+Cis8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIzMDAiIGhlaWdodD0iMzAwIj48L2Nh bnZhcz4KKzxzY3JpcHQ+CitsZXQgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOwor Y29udGV4dC5mb250ID0gIjQwMHB4ICdBaGVtJyI7Citjb250ZXh0LmZpbGxUZXh0KCJBIiwgLTUw LCAyNzApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==