200065 2019-07-23 17:25:12 -0700 REGRESSION(r241288): Text on Yahoo Japan mobile looks too bold 2019-07-30 14:48:34 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 200047 1 mmaxfield mmaxfield ap benjamin cdumez cmarcelo dbates dino ews-watchlist jonlee rniwa simon.fraser thorton webkit-bug-importer oldest_to_newest 1555242 0 mmaxfield 2019-07-23 17:25:12 -0700 REGRESSION(r241288): Text on Yahoo Japan mobile looks too bold 1555248 1 374741 mmaxfield 2019-07-23 17:34:40 -0700 Created attachment 374741 Patch 1555249 2 mmaxfield 2019-07-23 17:34:43 -0700 <rdar://problem/50912757> 1555283 3 374741 simon.fraser 2019-07-23 19:08:42 -0700 Comment on attachment 374741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374741&action=review > Source/WTF/wtf/Platform.h:1619 > +#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000) > +#define USE_HIRAGINO_SANS_WORKAROUND 1 > +#endif Seems wrong for something so specific to be in Platform.h > Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp:1156 > + // This is yucky code, but it's necessary for yahoo.co.jp. > + // FIXME: https://bugs.webkit.org/show_bug.cgi?id=200047 Remove this code. Should this then be a Quirk? 1555319 4 ap 2019-07-23 23:09:45 -0700 > Seems wrong for something so specific to be in Platform.h What would you suggest? My understanding is that Platform.h is exactly where such things need to be. Seems like we want to be checking for PLATFORM(IOS) not PLATFORM(IOS_FAMILY) here. 1555436 5 374741 simon.fraser 2019-07-24 11:15:59 -0700 Comment on attachment 374741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374741&action=review >> Source/WTF/wtf/Platform.h:1619 >> +#endif > > Seems wrong for something so specific to be in Platform.h Would this stay in the tree in perpetuity? When would we know that we can remove it? 1556643 6 mmaxfield 2019-07-29 12:03:01 -0700 Hooking this up to a quirk appears to be fairly difficult, since control flows through a singleton FontDatabase object which owns all the CTFonts. Instead, I'll try to modify the request rather than modify the font object. 1556883 7 375139 mmaxfield 2019-07-29 19:18:13 -0700 Created attachment 375139 Patch 1556897 8 375144 mmaxfield 2019-07-29 20:58:06 -0700 Created attachment 375144 Patch 1557030 9 375144 simon.fraser 2019-07-30 11:20:59 -0700 Comment on attachment 375144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375144&action=review > Source/WebCore/page/Quirks.cpp:396 > + // FIXME: https://bugs.webkit.org/show_bug.cgi?id=200047 Remove this quirk. Nicer to use webkit.org/b/200047 1557082 10 mmaxfield 2019-07-30 14:48:34 -0700 Committed r248018: <https://trac.webkit.org/changeset/248018> 374741 2019-07-23 17:34:40 -0700 2019-07-29 19:18:12 -0700 Patch bug-200065-20190723173440.patch text/plain 8065 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDNmYTkwYjA4YzMwMGY5YWVjMzdkNjI3 ZDA3ZGZkOTI4MTUyZTI5ZjYuLjgzY2ZlMjEyOGRjZjQwZmUzMjcxMmM1MzY0YWVjNTk5N2ZjYjIz MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDctMjMgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDEyODgpOiBUZXh0 IG9uIFlhaG9vIEphcGFuIG1vYmlsZSBsb29rcyB0b28gYm9sZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMDY1CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81MDkxMjc1Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDE5LTA3LTIzICBBbGljaWEgQm95YSBHYXJj w61hICA8YWJveWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1RGXSBBZGQgRGF0YU11dGV4IGFu ZCBNYWluVGhyZWFkRGF0YSB3cmFwcGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDViNzE2YmJhMzBlMTU0M2Zl MmQ0NmJlYmRhZTEwNjJmNmVkMTMwOGMuLjQ0ZGY4YTJlNzQyOTZiNGQzMGMwNDk3ZTdkZjkwN2Uy MTI2ZGQ0YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxOS0wNy0yMyAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04o cjI0MTI4OCk6IFRleHQgb24gWWFob28gSmFwYW4gbW9iaWxlIGxvb2tzIHRvbyBib2xkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAwNjUKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzUwOTEyNzU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEJlZm9yZSByMjQxMjg4LCB3ZSB3ZXJlIG1hcHBpbmcgSmFw YW5lc2Ugc2Fucy1zZXJpZiB0byBIaXJhZ2lubyBLYWt1IEdvdGhpYyBQcm9OLCB3aGljaAorICAg ICAgICBoYXMgYSAzMDAgd2VpZ2h0IGFuZCBhIDYwMCB3ZWlnaHQuIEhvd2V2ZXIsIHdlIGNhbid0 IHVzZSB0aGF0IGZvbnQgYmVjYXVzZSBpdCdzIHVzZXItaW5zdGFsbGVkLAorICAgICAgICBzbyBp biByMjQxMjg4IHdlIHN3aXRjaGVkIHRvIHVzaW5nIEhpcmFnaW5vIFNhbnMsIHdoaWNoIGhhcyBh IDMwMCB3ZWlnaHQsIGEgNjAwIHdlaWdodCwgYW5kIGFuCisgICAgICAgIDgwMCB3ZWlnaHQuIEFj Y29yZGluZyB0byB0aGUgQ1NTIGZvbnQgc2VsZWN0aW9uIGFsZ29yaXRobSwgc2l0ZXMgdGhhdCBy ZXF1ZXN0IGEgd2VpZ2h0IG9mIDcwMAorICAgICAgICB3b3VsZCBnZXQgdGhlIDgwMCB3ZWlnaHQg aW5zdGVhZCBvZiB0aGUgNjAwIHdlaWdodCwgd2hpY2ggY2F1c2VkIHRoZSB0ZXh0IHRvIGxvb2sg dG9vIGhlYXZ5LgorICAgICAgICBUaGVyZWZvcmUsIHRoZSBhcHBhcmVudCB2aXN1YWwgY2hhbmdl IGlzIGZyb20gYSB3ZWlnaHQgY2hhbmdlIGZyb20gNjAwIHRvIDgwMC4KKworICAgICAgICBUbyBm aXggdGhpcywgd2UgY2FuIHNpbXBseSBwcmV0ZW5kIHRoYXQgdGhlIDYwMCB3ZWlnaHQgb2YgSGly YWdpbm8gU2FucyBoYXMgYSB3ZWlnaHQgb2YgNzAwLAorICAgICAgICB3aGljaCB0cmlja3MgdGhl IENTUyBmb250IHNlbGVjdGlvbiBhbGdvcml0aG0gdG8gdXNlIHRoZSA2MDAgd2VpZ2h0IGZvciBy ZXF1ZXN0cyBvZiB3ZWlnaHQgNjAwCisgICAgICAgIGFuZCA3MDAuIFJlcXVlc3RzIG9mIHdlaWdo dCA4MDAgYW5kIDkwMCB3b3VsZCBzdGlsbCBmaW5kIHRoZSA4MDAgd2VpZ2h0LiBFdmVyeXRoaW5n IGVsc2Ugd291bGQKKyAgICAgICAgYmUgdW5jaGFuZ2VkLgorCisgICAgICAgIFRlc3RzOiBwbGF0 Zm9ybS9pb3MvZmFzdC90ZXh0L3NhbnMtc2VyaWYtamEtMi5odG1sCisgICAgICAgICAgICAgICBw bGF0Zm9ybS9pb3MvZmFzdC90ZXh0L3NhbnMtc2VyaWYtamEuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y2FwYWJpbGl0aWVzRm9yRm9udERlc2NyaXB0b3IpOgorCiAyMDE5LTA3LTIzICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIExvbmcgcHJlc3Mg aGludCBvZiBBaXJQb2RzIGJ1eSBidXR0b25zIGFyZSB0YWxsIGFuZCBuYXJyb3cgZHVyaW5nIGFu aW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaCBiL1NvdXJjZS9X VEYvd3RmL1BsYXRmb3JtLmgKaW5kZXggYWVjYWI4MDA4YjZjZmIxYmJmNDc0OWQ2YzNmNjhmMmJm NWQ3YjM3ZC4uMGZmYjBmMTQwN2U3MDQyZWY0NGMyMDBlMmQyZjZiY2ZjODRlN2E0YyAxMDA2NDQK LS0tIGEvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0 Zm9ybS5oCkBAIC0xNjEzLDMgKzE2MTMsNyBAQAogI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNTAwKSB8fCAoUExBVEZPUk0oSU9TKSAm JiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzAwMDApIHx8IChQTEFURk9S TShXQVRDSE9TKSAmJiBfX1dBVENIX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDYwMDAwKSB8 fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19UVl9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MzAwMDApCiAjZGVmaW5lIEhBVkVfREVTSUdOX1NZU1RFTV9VSV9GT05UUyAxCiAjZW5kaWYKKwor I2lmIChQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFV SVJFRCA+PSAxMzAwMDApIHx8IChQTEFURk9STShXQVRDSE9TKSAmJiBfX1dBVENIX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDYwMDAwKSB8fCAoUExBVEZPUk0oQVBQTEVUVikgJiYgX19UVl9P U19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzAwMDApCisjZGVmaW5lIFVTRV9ISVJBR0lOT19T QU5TX1dPUktBUk9VTkQgMQorI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKaW5kZXggMDk1 MzBlNjA3NDUzZTJiZDY0OTkwNjY3NTMyMTA3NjM1NjUzMjMzMS4uOGQ2YjdhYmQ1ZDcxNmVjOWY2 NWU4ZTUzZGJhMmZiMmVmMGY0MzFjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcApAQCAtMTE0 OSw2ICsxMTQ5LDE2IEBAIEZvbnRTZWxlY3Rpb25DYXBhYmlsaXRpZXMgY2FwYWJpbGl0aWVzRm9y Rm9udERlc2NyaXB0b3IoQ1RGb250RGVzY3JpcHRvclJlZiBmb250CiAgICAgfQogI2VuZGlmCiAK KyNpZiBVU0UoSElSQUdJTk9fU0FOU19XT1JLQVJPVU5EKQorICAgIC8vIGxhbmc9ImphIiBzdHls ZT0iZm9udDogYm9sZCBzYW5zLXNlcmlmOyIgY29udGVudCB3b3VsZCBuYXR1cmFsbHkgZ2V0IEhp cmFnaW5vU2Fucy1XOCBoZXJlLCBidXQgdGhhdCdzIHZpc3VhbGx5CisgICAgLy8gdG9vIGJvbGQu IEluc3RlYWQsIHdlIHNob3VsZCBwcmV0ZW5kIHRoYXQgSGlyYWdpbm9TYW5zLVc2IGhhcyBhIHdl aWdodCBvZiA3MDAgc28gdGhhdCBvbmUgZ2V0cyBwaWNrZWQgaW5zdGVhZC4KKyAgICAvLyBUaGlz IGlzIHl1Y2t5IGNvZGUsIGJ1dCBpdCdzIG5lY2Vzc2FyeSBmb3IgeWFob28uY28uanAuCisgICAg Ly8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAwNDcg UmVtb3ZlIHRoaXMgY29kZS4KKyAgICBhdXRvIGZhbWlseSA9IGFkb3B0Q0Yoc3RhdGljX2Nhc3Q8 Q0ZEaWN0aW9uYXJ5UmVmPihDVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZShmb250RGVzY3Jp cHRvciwga0NURm9udE5hbWVBdHRyaWJ1dGUpKSk7CisgICAgaWYgKENGRXF1YWwoZmFtaWx5Lmdl dCgpLCBDRlNUUigiSGlyYWdpbm9TYW5zLVc2IikpKQorICAgICAgICB2YXJpYXRpb25DYXBhYmls aXRpZXMud2VpZ2h0ID0ge3sgNzAwLjBmLCA3MDAuMGYgfX07CisjZW5kaWYKKwogICAgIEZvbnRT ZWxlY3Rpb25DYXBhYmlsaXRpZXMgcmVzdWx0ID0ge3sgRm9udFNlbGVjdGlvblZhbHVlKHZhcmlh dGlvbkNhcGFiaWxpdGllcy53ZWlnaHQudmFsdWUoKS5taW5pbXVtKSwgRm9udFNlbGVjdGlvblZh bHVlKHZhcmlhdGlvbkNhcGFiaWxpdGllcy53ZWlnaHQudmFsdWUoKS5tYXhpbXVtKSB9LAogICAg ICAgICB7IEZvbnRTZWxlY3Rpb25WYWx1ZSh2YXJpYXRpb25DYXBhYmlsaXRpZXMud2lkdGgudmFs dWUoKS5taW5pbXVtKSwgRm9udFNlbGVjdGlvblZhbHVlKHZhcmlhdGlvbkNhcGFiaWxpdGllcy53 aWR0aC52YWx1ZSgpLm1heGltdW0pIH0sCiAgICAgICAgIHsgRm9udFNlbGVjdGlvblZhbHVlKHZh cmlhdGlvbkNhcGFiaWxpdGllcy5zbG9wZS52YWx1ZSgpLm1pbmltdW0pLCBGb250U2VsZWN0aW9u VmFsdWUodmFyaWF0aW9uQ2FwYWJpbGl0aWVzLnNsb3BlLnZhbHVlKCkubWF4aW11bSkgfX07CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggMmIzN2VhYjA2NDlmNDg4YjQ2OTkxNGE5YTQ4NjRkMGM5ODEwMDQ5Zi4uNTdjOWU3NDg0 NzJiODc2ZDY2NjdlNzMzMDU4NDhiYTU4N2M4ZDA1OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDE5LTA3LTIzICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAg ICAgICAgUkVHUkVTU0lPTihyMjQxMjg4KTogVGV4dCBvbiBZYWhvbyBKYXBhbiBtb2JpbGUgbG9v a3MgdG9vIGJvbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMDA2NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTA5MTI3NTc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvZmFz dC90ZXh0L3NhbnMtc2VyaWYtamEtMi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBw bGF0Zm9ybS9pb3MvZmFzdC90ZXh0L3NhbnMtc2VyaWYtamEtMi5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9pb3MvZmFzdC90ZXh0L3NhbnMtc2VyaWYtamEtZXhwZWN0ZWQtbWlzbWF0 Y2guaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vaW9zL2Zhc3QvdGV4dC9zYW5zLXNl cmlmLWphLmh0bWw6IEFkZGVkLgorCiAyMDE5LTA3LTIzICBUaW0gSG9ydG9uICA8dGltb3RoeV9o b3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIExvbmcgcHJlc3MgaGludCBvZiBBaXJQb2RzIGJ1 eSBidXR0b25zIGFyZSB0YWxsIGFuZCBuYXJyb3cgZHVyaW5nIGFuaW1hdGlvbgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2Zhc3QvdGV4dC9zYW5zLXNlcmlmLWphLTItZXhw ZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0L3RleHQvc2Fucy1zZXJp Zi1qYS0yLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzZlNGQ2YjdlYzA2MWU1ZTZiZmUxODJh ZTYwMjljYjJmN2U1NDY4MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2lvcy9mYXN0L3RleHQvc2Fucy1zZXJpZi1qYS0yLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwx MCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRm LTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgaXNuJ3QgYWN0dWFsbHkgYSBjb3JyZWN0 bmVzcyB0ZXN0LCBidXQgaXQncyBpbnN0ZWFkIGEgY2FuYXJ5IHRvIGxldCB1cyBrbm93IHdoZW4g dGhlIEphcGFuZXNlIHNhbnMtc2VyaWYgZm9udCBjaGFuZ2VzLgorPGRpdiBsYW5nPSJqYSIgc3R5 bGU9ImZvbnQ6IDEwMHB4ICdIaXJhZ2lubyBTYW5zJzsiPuWVjzwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2Zhc3QvdGV4dC9zYW5z LXNlcmlmLWphLTIuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0L3RleHQvc2Fu cy1zZXJpZi1qYS0yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmJiMGE3Y2MwZTgyMWE2M2Q5OWU1ODMwOTVm NmM3MjQ0ZTY2NjNmOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lv cy9mYXN0L3RleHQvc2Fucy1zZXJpZi1qYS0yLmh0bWwKQEAgLTAsMCArMSwxMCBAQAorPCFET0NU WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFk PgorPGJvZHk+CitUaGlzIHRlc3QgaXNuJ3QgYWN0dWFsbHkgYSBjb3JyZWN0bmVzcyB0ZXN0LCBi dXQgaXQncyBpbnN0ZWFkIGEgY2FuYXJ5IHRvIGxldCB1cyBrbm93IHdoZW4gdGhlIEphcGFuZXNl IHNhbnMtc2VyaWYgZm9udCBjaGFuZ2VzLgorPGRpdiBsYW5nPSJqYSIgc3R5bGU9ImZvbnQ6IDEw MHB4IHNhbnMtc2VyaWY7Ij7llY88L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0L3RleHQvc2Fucy1zZXJpZi1qYS1leHBlY3Rl ZC1taXNtYXRjaC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2Zhc3QvdGV4dC9zYW5z LXNlcmlmLWphLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmNkY2U0YThmMTE4 ZjRmZDViNTEwMDdlMmYwMjZjMjM2NGEyMDRkNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2lvcy9mYXN0L3RleHQvc2Fucy1zZXJpZi1qYS1leHBlY3RlZC1taXNtYXRj aC5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PG1ldGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGxhbmc9ImphIiBz dHlsZT0iZm9udDogODAwIDEwMHB4IHNhbnMtc2VyaWY7Ij7llY88L2Rpdj4KKzwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0L3RleHQvc2Fu cy1zZXJpZi1qYS5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2Zhc3QvdGV4dC9zYW5z LXNlcmlmLWphLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTg4MzQ2OWNmODVlY2QyYzVjMjVmOGU0ZjFlN2Q1 YzY1NjgyYmE0NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9m YXN0L3RleHQvc2Fucy1zZXJpZi1qYS5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJv ZHk+Cis8ZGl2IGxhbmc9ImphIiBzdHlsZT0iZm9udDogYm9sZCAxMDBweCBzYW5zLXNlcmlmOyI+ 5ZWPPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 375139 2019-07-29 19:18:13 -0700 2019-07-29 20:58:04 -0700 Patch bug-200065-20190729191812.patch text/plain 9264 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3ODQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDdiY2ZjNzVjNDk5YWNiZjQxMDU5ZGM3 ZWEwYmM0Mzk4NjE0MDcwM2YuLjY2MzU5MjA0ZWI1ZGZhN2ZjMjkxNzMwZmM4YjBjZWVlMzUwNzZk YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDctMjkgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDEyODgpOiBUZXh0 IG9uIFlhaG9vIEphcGFuIG1vYmlsZSBsb29rcyB0b28gYm9sZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMDY1CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81MDkxMjc1Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDE5LTA3LTI1ICBEZWFuIEphY2tzb24gIDxk aW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgaGVscGVyIGZvciBpZ25vcmluZyBkZXByZWNh dGVkIGltcGxlbWVudGF0aW9uIHdhcm5pbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg4MjlmZTQ1YTBjOWQ4 NzhiMzhkZDA0Yjc1YmYwOGI3MGM2NDdkYi4uMzc2NWI1OTc0NzQyYzkxYzExOGYxYzYwMzIzNzE2 OGU5OGUwMzZjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTA3LTI5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP TihyMjQxMjg4KTogVGV4dCBvbiBZYWhvbyBKYXBhbiBtb2JpbGUgbG9va3MgdG9vIGJvbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDA2NQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTA5MTI3NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQmVmb3JlIHIyNDEyODgsIHdlIHdlcmUgbWFwcGluZyBK YXBhbmVzZSBzYW5zLXNlcmlmIHRvIEhpcmFnaW5vIEtha3UgR290aGljIFByb04sIHdoaWNoCisg ICAgICAgIGhhcyBhIDMwMCB3ZWlnaHQgYW5kIGEgNjAwIHdlaWdodC4gSG93ZXZlciwgd2UgY2Fu J3QgdXNlIHRoYXQgZm9udCBiZWNhdXNlIGl0J3MgdXNlci1pbnN0YWxsZWQsCisgICAgICAgIHNv IGluIHIyNDEyODggd2Ugc3dpdGNoZWQgdG8gdXNpbmcgSGlyYWdpbm8gU2Fucywgd2hpY2ggaGFz IGEgMzAwIHdlaWdodCwgYSA2MDAgd2VpZ2h0LCBhbmQgYW4KKyAgICAgICAgODAwIHdlaWdodC4g QWNjb3JkaW5nIHRvIHRoZSBDU1MgZm9udCBzZWxlY3Rpb24gYWxnb3JpdGhtLCBzaXRlcyB0aGF0 IHJlcXVlc3QgYSB3ZWlnaHQgb2YgNzAwCisgICAgICAgIHdvdWxkIGdldCB0aGUgODAwIHdlaWdo dCBpbnN0ZWFkIG9mIHRoZSA2MDAgd2VpZ2h0LCB3aGljaCBjYXVzZWQgdGhlIHRleHQgdG8gbG9v ayB0b28gaGVhdnkuCisgICAgICAgIFRoZXJlZm9yZSwgdGhlIGFwcGFyZW50IHZpc3VhbCBjaGFu Z2UgaXMgZnJvbSBhIHdlaWdodCBjaGFuZ2UgZnJvbSA2MDAgdG8gODAwLgorCisgICAgICAgIElu IGdlbmVyYWwsIHRoaXMgaXMgd29ya2luZyBhcyBpbnRlbmRlZC4gSG93ZXZlciwgdGV4dCBvbiBZ YWhvbyBKYXBhbiBsb29rcyB0b28gaGVhdnkgaW4gd2VpZ2h0CisgICAgICAgIDgwMC4gSW5zdGVh ZCwgdGhpcyBwYXRjaCBhZGRzIGEgcXVpcmsgc3BlY2lmaWMgdG8gWWFob28gSmFwYW4gdGhhdCBv dmVyd3JpdGVzIGFueSBmb250IHJlcXVlc3RzCisgICAgICAgIHRvIGdpdmUgdGhlbSBhIHdlaWdo dCBvZiA2MDAgaW5zdGVhZCBvZiA3MDAuIFRoaXMgd2F5LCB0aGUgbGlnaHRlciBmb250IHdpbGwg YmUgdXNlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBxdWlya3MgY2Fubm90IGJl IHRlc3RlZC4KKworICAgICAgICAqIGNzcy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6cmVzb2x2ZUdlbmVyaWNGYW1pbHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9u dFNlbGVjdG9yOjpmb250UmFuZ2VzRm9yRmFtaWx5KToKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpRdWlya3M6OnNob3VsZExpZ2h0ZW5KYXBhbmVzZUJvbGRT YW5zU2VyaWYgY29uc3QpOgorICAgICAgICAqIHBhZ2UvUXVpcmtzLmg6CisKIDIwMTktMDctMjUg IEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIElXSUNC aXRtYXAgKHJhdGhlciB0aGFuIElEMkQxQml0bWFwKSBmb3IgTmF0aXZlSW1hZ2VQdHIgb24gRlRX CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYv UGxhdGZvcm0uaAppbmRleCBmMTNmMzBhMmZmOGQ4NWI1OWUxMDU3NzQ0YzliNTM1OWM3OTViMmZm Li5kNTZhMTk4ZTI2NzU1OGM0ZjdkMDcxY2Y5ZDFhOWRlZDljYjc0OWQ4IDEwMDY0NAotLS0gYS9T b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgK QEAgLTE2MTYsMyArMTYxNiw3IEBACiAjaWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9W RVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE1MDApIHx8IChQTEFURk9STShJT1MpICYmIF9fSVBI T05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkgfHwgKFBMQVRGT1JNKFdBVENI T1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gNjAwMDApIHx8IChQTEFU Rk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkK ICNkZWZpbmUgSEFWRV9ERVNJR05fU1lTVEVNX1VJX0ZPTlRTIDEKICNlbmRpZgorCisjaWYgKFBM QVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEzMDAwMCkgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gNjAwMDApIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkKKyNkZWZpbmUgVVNFX0hJUkFHSU5PX1NBTlNfV09S S0FST1VORCAxCisjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250 U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5k ZXggZGIyZTc5OTg1MTVlY2Y5M2Q2NTRlNmU5MGJhMzJlZDIxN2NmNTljNC4uN2EzYzI4NWYxY2Fh NGIxMzE5NWUxYjZiZGRmOGRiZjFiZDY2YjU5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRT ZWxlY3Rvci5jcHAKQEAgLTQ2LDYgKzQ2LDcgQEAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1 ZGUgIkZyYW1lTG9hZGVyLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlF1aXJr cy5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9hZE9ic2VydmVyLmgiCiAjaW5jbHVkZSAiUnVudGlt ZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCkBAIC0yNzQsMTQgKzI3 NSwxNCBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6Zm9udENhY2hlSW52YWxpZGF0ZWQoKQogICAg IGRpc3BhdGNoSW52YWxpZGF0aW9uQ2FsbGJhY2tzKCk7CiB9CiAKLXN0YXRpYyBBdG9tU3RyaW5n IHJlc29sdmVHZW5lcmljRmFtaWx5KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgRm9udERlc2Ny aXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21TdHJpbmcmIGZhbWlseU5hbWUpCitz dGF0aWMgT3B0aW9uYWw8QXRvbVN0cmluZz4gcmVzb2x2ZUdlbmVyaWNGYW1pbHkoRG9jdW1lbnQq IGRvY3VtZW50LCBjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3Qg QXRvbVN0cmluZyYgZmFtaWx5TmFtZSkKIHsKICAgICBhdXRvIHBsYXRmb3JtUmVzdWx0ID0gRm9u dERlc2NyaXB0aW9uOjpwbGF0Zm9ybVJlc29sdmVHZW5lcmljRmFtaWx5KGZvbnREZXNjcmlwdGlv bi5zY3JpcHQoKSwgZm9udERlc2NyaXB0aW9uLmxvY2FsZSgpLCBmYW1pbHlOYW1lKTsKICAgICBp ZiAoIXBsYXRmb3JtUmVzdWx0LmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gcGxhdGZvcm1SZXN1 bHQ7CiAKICAgICBpZiAoIWRvY3VtZW50KQotICAgICAgICByZXR1cm4gZmFtaWx5TmFtZTsKKyAg ICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgIGNvbnN0IFNldHRpbmdzJiBzZXR0aW5n cyA9IGRvY3VtZW50LT5zZXR0aW5ncygpOwogCkBAIC0zMDEsNyArMzAyLDcgQEAgc3RhdGljIEF0 b21TdHJpbmcgcmVzb2x2ZUdlbmVyaWNGYW1pbHkoRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBG b250RGVzY3JpcHRpb24KICAgICBpZiAoZmFtaWx5TmFtZSA9PSBzdGFuZGFyZEZhbWlseSkKICAg ICAgICAgcmV0dXJuIHNldHRpbmdzLnN0YW5kYXJkRm9udEZhbWlseShzY3JpcHQpOwogCi0gICAg cmV0dXJuIGZhbWlseU5hbWU7CisgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIAogRm9udFJh bmdlcyBDU1NGb250U2VsZWN0b3I6OmZvbnRSYW5nZXNGb3JGYW1pbHkoY29uc3QgRm9udERlc2Ny aXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21TdHJpbmcmIGZhbWlseU5hbWUpCkBA IC0zMTIsMTggKzMxMywzNCBAQCBGb250UmFuZ2VzIENTU0ZvbnRTZWxlY3Rvcjo6Zm9udFJhbmdl c0ZvckZhbWlseShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcgogICAgIC8vIEZJWE1F OiBUaGUgc3BlYyAoYW5kIEZpcmVmb3gpIHNheXMgdXNlciBzcGVjaWZpZWQgZ2VuZXJpYyBmYW1p bGllcyAoc2Fucy1zZXJpZiBldGMuKSBzaG91bGQgYmUgcmVzb2x2ZWQgYmVmb3JlIHRoZSBAZm9u dC1mYWNlIGxvb2t1cCB0b28uCiAgICAgYm9vbCByZXNvbHZlR2VuZXJpY0ZhbWlseUZpcnN0ID0g ZmFtaWx5TmFtZSA9PSBzdGFuZGFyZEZhbWlseTsKIAotICAgIEF0b21TdHJpbmcgZmFtaWx5Rm9y TG9va3VwID0gcmVzb2x2ZUdlbmVyaWNGYW1pbHlGaXJzdCA/IHJlc29sdmVHZW5lcmljRmFtaWx5 KG1fZG9jdW1lbnQuZ2V0KCksIGZvbnREZXNjcmlwdGlvbiwgZmFtaWx5TmFtZSkgOiBmYW1pbHlO YW1lOwotICAgIGF1dG8qIGZhY2UgPSBtX2Nzc0ZvbnRGYWNlU2V0LT5mb250RmFjZShmb250RGVz Y3JpcHRpb24uZm9udFNlbGVjdGlvblJlcXVlc3QoKSwgZmFtaWx5Rm9yTG9va3VwKTsKKyAgICBB dG9tU3RyaW5nIGZhbWlseUZvckxvb2t1cCA9IGZhbWlseU5hbWU7CisgICAgT3B0aW9uYWw8Rm9u dERlc2NyaXB0aW9uPiBvdmVycmlkZUZvbnREZXNjcmlwdGlvbjsKKyAgICBjb25zdCBGb250RGVz Y3JpcHRpb24qIGZvbnREZXNjcmlwdGlvbkZvckxvb2t1cCA9ICZmb250RGVzY3JpcHRpb247Cisg ICAgYXV0byByZXNvbHZlR2VuZXJpY0ZhbWlseSA9IFsmXSgpIHsKKyAgICAgICAgaWYgKGF1dG8g Z2VuZXJpY0ZhbWlseU9wdGlvbmFsID0gV2ViQ29yZTo6cmVzb2x2ZUdlbmVyaWNGYW1pbHkobV9k b2N1bWVudC5nZXQoKSwgZm9udERlc2NyaXB0aW9uLCBmYW1pbHlOYW1lKSkgeworICAgICAgICAg ICAgaWYgKG1fZG9jdW1lbnQgJiYgbV9kb2N1bWVudC0+cXVpcmtzKCkuc2hvdWxkTGlnaHRlbkph cGFuZXNlQm9sZFNhbnNTZXJpZigpICYmIGZhbWlseUZvckxvb2t1cCA9PSBzYW5zU2VyaWZGYW1p bHkgJiYgZm9udERlc2NyaXB0aW9uLndlaWdodCgpID09IGJvbGRXZWlnaHRWYWx1ZSgpICYmIGZv bnREZXNjcmlwdGlvbi5zY3JpcHQoKSA9PSBVU0NSSVBUX0tBVEFLQU5BX09SX0hJUkFHQU5BKSB7 CisgICAgICAgICAgICAgICAgb3ZlcnJpZGVGb250RGVzY3JpcHRpb24gPSBmb250RGVzY3JpcHRp b247CisgICAgICAgICAgICAgICAgb3ZlcnJpZGVGb250RGVzY3JpcHRpb24tPnNldFdlaWdodChG b250U2VsZWN0aW9uVmFsdWUoNjAwKSk7CisgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0aW9u Rm9yTG9va3VwID0gJipvdmVycmlkZUZvbnREZXNjcmlwdGlvbjsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGZhbWlseUZvckxvb2t1cCA9ICpnZW5lcmljRmFtaWx5T3B0aW9uYWw7CisgICAg ICAgIH0KKyAgICB9OworCisgICAgaWYgKHJlc29sdmVHZW5lcmljRmFtaWx5Rmlyc3QpCisgICAg ICAgIHJlc29sdmVHZW5lcmljRmFtaWx5KCk7CisgICAgYXV0byogZmFjZSA9IG1fY3NzRm9udEZh Y2VTZXQtPmZvbnRGYWNlKGZvbnREZXNjcmlwdGlvbkZvckxvb2t1cC0+Zm9udFNlbGVjdGlvblJl cXVlc3QoKSwgZmFtaWx5Rm9yTG9va3VwKTsKICAgICBpZiAoZmFjZSkgewogICAgICAgICBpZiAo UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS53ZWJBUElTdGF0aXN0aWNz RW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBpZiAobV9kb2N1bWVudCkKICAgICAgICAgICAgICAg ICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkKCkubG9nRm9udExvYWQoKm1fZG9jdW1lbnQs IGZhbWlseUZvckxvb2t1cC5zdHJpbmcoKSwgdHJ1ZSk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIGZhY2UtPmZvbnRSYW5nZXMoZm9udERlc2NyaXB0aW9uKTsKKyAgICAgICAgcmV0dXJuIGZh Y2UtPmZvbnRSYW5nZXMoKmZvbnREZXNjcmlwdGlvbkZvckxvb2t1cCk7CiAgICAgfQorCiAgICAg aWYgKCFyZXNvbHZlR2VuZXJpY0ZhbWlseUZpcnN0KQotICAgICAgICBmYW1pbHlGb3JMb29rdXAg PSByZXNvbHZlR2VuZXJpY0ZhbWlseShtX2RvY3VtZW50LmdldCgpLCBmb250RGVzY3JpcHRpb24s IGZhbWlseU5hbWUpOwotICAgIGF1dG8gZm9udCA9IEZvbnRDYWNoZTo6c2luZ2xldG9uKCkuZm9u dEZvckZhbWlseShmb250RGVzY3JpcHRpb24sIGZhbWlseUZvckxvb2t1cCk7CisgICAgICAgIHJl c29sdmVHZW5lcmljRmFtaWx5KCk7CisgICAgYXV0byBmb250ID0gRm9udENhY2hlOjpzaW5nbGV0 b24oKS5mb250Rm9yRmFtaWx5KCpmb250RGVzY3JpcHRpb25Gb3JMb29rdXAsIGZhbWlseUZvckxv b2t1cCk7CiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCku d2ViQVBJU3RhdGlzdGljc0VuYWJsZWQoKSkgewogICAgICAgICBpZiAobV9kb2N1bWVudCkKICAg ICAgICAgICAgIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWQoKS5sb2dGb250TG9hZCgqbV9k b2N1bWVudCwgZmFtaWx5Rm9yTG9va3VwLnN0cmluZygpLCAhIWZvbnQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWly a3MuY3BwCmluZGV4IDNkNDM3NGY1OGM5NWQ3Yjg0MDJhMDhiY2RjMDQyOTJhYzljMmFiNTcuLjli OTdhN2Q0ZDUzYWUzNWI5NWE3NmFiYjcxOWVkMzdmNjE4MDEyMTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJr cy5jcHAKQEAgLTM4Miw2ICszODIsMjIgQEAgYm9vbCBRdWlya3M6Om5lZWRzRGVmZXJLZXlEb3du QW5kS2V5UHJlc3NUaW1lcnNVbnRpbE5leHRFZGl0aW5nQ29tbWFuZCgpIGNvbnN0CiAjZW5kaWYK IH0KIAorYm9vbCBRdWlya3M6OnNob3VsZExpZ2h0ZW5KYXBhbmVzZUJvbGRTYW5zU2VyaWYoKSBj b25zdAoreworI2lmIFVTRShISVJBR0lOT19TQU5TX1dPUktBUk9VTkQpCisgICAgaWYgKCFuZWVk c1F1aXJrcygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBsYW5nPSJqYSIgc3R5 bGU9ImZvbnQ6IGJvbGQgc2Fucy1zZXJpZjsiIGNvbnRlbnQgd291bGQgbmF0dXJhbGx5IGdldCBI aXJhZ2lub1NhbnMtVzggaGVyZSwgYnV0IHRoYXQncyB2aXN1YWxseQorICAgIC8vIHRvbyBib2xk LiBJbnN0ZWFkLCB3ZSBzaG91bGQgcGljayBIaXJhZ2lub1NhbnMtVzYgaW5zdGVhZC4KKyAgICAv LyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDA0NyBS ZW1vdmUgdGhpcyBxdWlyay4KKyAgICBhdXRvIGhvc3QgPSBtX2RvY3VtZW50LT50b3BEb2N1bWVu dCgpLnVybCgpLmhvc3QoKTsKKyAgICByZXR1cm4gZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNh c2UoaG9zdCwgInlhaG9vLmNvLmpwIik7CisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRp ZgorfQorCiAvLyBGSVhNRSg8cmRhcjovL3Byb2JsZW0vNTAzOTQ5Njk+KTogUmVtb3ZlIGFmdGVy IGRlc21vcy5jb20gYWRvcHRzIGlucHV0bW9kZT0ibm9uZSIuCiBib29sIFF1aXJrczo6bmVlZHNJ bnB1dE1vZGVOb25lSW1wbGljaXRseShjb25zdCBIVE1MRWxlbWVudCYgZWxlbWVudCkgY29uc3QK IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1F1aXJrcy5oCmluZGV4IDAwNmE0MmVkZDIxNGRmZWUyMmE3OGU2YzNjMTZhOWFh ZjYzZWM3MTMuLmY0YmJhMjk3NmY5YTgyOTM4YjA5M2NkZmFkM2I4ZWJiNDMwMmJjYjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9RdWlya3MuaApAQCAtNTcsNiArNTcsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzaG91bGRE aXNhYmxlUG9pbnRlckV2ZW50c1F1aXJrKCkgY29uc3Q7CiAgICAgYm9vbCBuZWVkc0lucHV0TW9k ZU5vbmVJbXBsaWNpdGx5KGNvbnN0IEhUTUxFbGVtZW50JikgY29uc3Q7CiAgICAgYm9vbCBuZWVk c0RlZmVyS2V5RG93bkFuZEtleVByZXNzVGltZXJzVW50aWxOZXh0RWRpdGluZ0NvbW1hbmQoKSBj b25zdDsKKyAgICBib29sIHNob3VsZExpZ2h0ZW5KYXBhbmVzZUJvbGRTYW5zU2VyaWYoKSBjb25z dDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hvdWxkRGlzcGF0Y2hTeW50aGV0aWNNb3Vz ZUV2ZW50c1doZW5Nb2RpZnlpbmdTZWxlY3Rpb24oKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9S VCBib29sIHNob3VsZFN1cHByZXNzQXV0b2NvcnJlY3Rpb25BbmRBdXRvY2FwdGlhbGl6YXRpb25J bkhpZGRlbkVkaXRhYmxlQXJlYXMoKSBjb25zdDsK 375144 2019-07-29 20:58:06 -0700 2019-07-30 11:20:59 -0700 Patch bug-200065-20190729205805.patch text/plain 9293 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3OTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDdiY2ZjNzVjNDk5YWNiZjQxMDU5ZGM3 ZWEwYmM0Mzk4NjE0MDcwM2YuLjY2MzU5MjA0ZWI1ZGZhN2ZjMjkxNzMwZmM4YjBjZWVlMzUwNzZk YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDctMjkgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDEyODgpOiBUZXh0 IG9uIFlhaG9vIEphcGFuIG1vYmlsZSBsb29rcyB0b28gYm9sZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMDY1CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81MDkxMjc1Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDE5LTA3LTI1ICBEZWFuIEphY2tzb24gIDxk aW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgaGVscGVyIGZvciBpZ25vcmluZyBkZXByZWNh dGVkIGltcGxlbWVudGF0aW9uIHdhcm5pbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc4MjAwZjZjNDBkZGE2 YmE4Yzk1MWJjMWIzODI5YjU3Y2RhZTdhMC4uOThlODA3MzFjYzU5OTRlNDcwZDk4MzIxYjYyMzVj MGU2YWQ2MWMzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTA3LTI5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP TihyMjQxMjg4KTogVGV4dCBvbiBZYWhvbyBKYXBhbiBtb2JpbGUgbG9va3MgdG9vIGJvbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDA2NQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTA5MTI3NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQmVmb3JlIHIyNDEyODgsIHdlIHdlcmUgbWFwcGluZyBK YXBhbmVzZSBzYW5zLXNlcmlmIHRvIEhpcmFnaW5vIEtha3UgR290aGljIFByb04sIHdoaWNoCisg ICAgICAgIGhhcyBhIDMwMCB3ZWlnaHQgYW5kIGEgNjAwIHdlaWdodC4gSG93ZXZlciwgd2UgY2Fu J3QgdXNlIHRoYXQgZm9udCBiZWNhdXNlIGl0J3MgdXNlci1pbnN0YWxsZWQsCisgICAgICAgIHNv IGluIHIyNDEyODggd2Ugc3dpdGNoZWQgdG8gdXNpbmcgSGlyYWdpbm8gU2Fucywgd2hpY2ggaGFz IGEgMzAwIHdlaWdodCwgYSA2MDAgd2VpZ2h0LCBhbmQgYW4KKyAgICAgICAgODAwIHdlaWdodC4g QWNjb3JkaW5nIHRvIHRoZSBDU1MgZm9udCBzZWxlY3Rpb24gYWxnb3JpdGhtLCBzaXRlcyB0aGF0 IHJlcXVlc3QgYSB3ZWlnaHQgb2YgNzAwCisgICAgICAgIHdvdWxkIGdldCB0aGUgODAwIHdlaWdo dCBpbnN0ZWFkIG9mIHRoZSA2MDAgd2VpZ2h0LCB3aGljaCBjYXVzZWQgdGhlIHRleHQgdG8gbG9v ayB0b28gaGVhdnkuCisgICAgICAgIFRoZXJlZm9yZSwgdGhlIGFwcGFyZW50IHZpc3VhbCBjaGFu Z2UgaXMgZnJvbSBhIHdlaWdodCBjaGFuZ2UgZnJvbSA2MDAgdG8gODAwLgorCisgICAgICAgIElu IGdlbmVyYWwsIHRoaXMgaXMgd29ya2luZyBhcyBpbnRlbmRlZC4gSG93ZXZlciwgdGV4dCBvbiBZ YWhvbyBKYXBhbiBsb29rcyB0b28gaGVhdnkgaW4gd2VpZ2h0CisgICAgICAgIDgwMC4gSW5zdGVh ZCwgdGhpcyBwYXRjaCBhZGRzIGEgcXVpcmsgc3BlY2lmaWMgdG8gWWFob28gSmFwYW4gdGhhdCBv dmVyd3JpdGVzIGFueSBmb250IHJlcXVlc3RzCisgICAgICAgIHRvIGdpdmUgdGhlbSBhIHdlaWdo dCBvZiA2MDAgaW5zdGVhZCBvZiA3MDAuIFRoaXMgd2F5LCB0aGUgbGlnaHRlciBmb250IHdpbGwg YmUgdXNlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBxdWlya3MgY2Fubm90IGJl IHRlc3RlZC4KKworICAgICAgICAqIGNzcy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6cmVzb2x2ZUdlbmVyaWNGYW1pbHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9u dFNlbGVjdG9yOjpmb250UmFuZ2VzRm9yRmFtaWx5KToKKyAgICAgICAgKiBwYWdlL1F1aXJrcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpRdWlya3M6OnNob3VsZExpZ2h0ZW5KYXBhbmVzZUJvbGRT YW5zU2VyaWYgY29uc3QpOgorICAgICAgICAqIHBhZ2UvUXVpcmtzLmg6CisKIDIwMTktMDctMjkg IEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTWVkaWFT b3VyY2UuaXNUeXBlU3VwcG9ydGVkIGNsYWltcyBGTEFDLWluLU1QNCBzdXBwb3J0IG9uIGlPUyBh bmQgbWFjT1MsIGJ1dCBwbGF5cyBzaWxlbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Q bGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCBmMTNmMzBhMmZmOGQ4 NWI1OWUxMDU3NzQ0YzliNTM1OWM3OTViMmZmLi5kNTZhMTk4ZTI2NzU1OGM0ZjdkMDcxY2Y5ZDFh OWRlZDljYjc0OWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCisrKyBi L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKQEAgLTE2MTYsMyArMTYxNiw3IEBACiAjaWYgKFBM QVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDE1MDAp IHx8IChQTEFURk9STShJT1MpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEzMDAwMCkgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9NSU5f UkVRVUlSRUQgPj0gNjAwMDApIHx8IChQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkKICNkZWZpbmUgSEFWRV9ERVNJR05fU1lTVEVNX1VJ X0ZPTlRTIDEKICNlbmRpZgorCisjaWYgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05F X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkgfHwgKFBMQVRGT1JNKFdBVENIT1Mp ICYmIF9fV0FUQ0hfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gNjAwMDApIHx8IChQTEFURk9S TShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkKKyNk ZWZpbmUgVVNFX0hJUkFHSU5PX1NBTlNfV09SS0FST1VORCAxCisjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggZGIyZTc5OTg1MTVlY2Y5M2Q2NTRlNmU5MGJh MzJlZDIxN2NmNTljNC4uN2EzYzI4NWYxY2FhNGIxMzE5NWUxYjZiZGRmOGRiZjFiZDY2YjU5NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKQEAgLTQ2LDYgKzQ2LDcgQEAK ICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgiCiAjaW5jbHVkZSAi TG9nZ2luZy5oIgorI2luY2x1ZGUgIlF1aXJrcy5oIgogI2luY2x1ZGUgIlJlc291cmNlTG9hZE9i c2VydmVyLmgiCiAjaW5jbHVkZSAiUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUg IlNldHRpbmdzLmgiCkBAIC0yNzQsMTQgKzI3NSwxNCBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6 Zm9udENhY2hlSW52YWxpZGF0ZWQoKQogICAgIGRpc3BhdGNoSW52YWxpZGF0aW9uQ2FsbGJhY2tz KCk7CiB9CiAKLXN0YXRpYyBBdG9tU3RyaW5nIHJlc29sdmVHZW5lcmljRmFtaWx5KERvY3VtZW50 KiBkb2N1bWVudCwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0 IEF0b21TdHJpbmcmIGZhbWlseU5hbWUpCitzdGF0aWMgT3B0aW9uYWw8QXRvbVN0cmluZz4gcmVz b2x2ZUdlbmVyaWNGYW1pbHkoRG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBGb250RGVzY3JpcHRp b24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbVN0cmluZyYgZmFtaWx5TmFtZSkKIHsKICAg ICBhdXRvIHBsYXRmb3JtUmVzdWx0ID0gRm9udERlc2NyaXB0aW9uOjpwbGF0Zm9ybVJlc29sdmVH ZW5lcmljRmFtaWx5KGZvbnREZXNjcmlwdGlvbi5zY3JpcHQoKSwgZm9udERlc2NyaXB0aW9uLmxv Y2FsZSgpLCBmYW1pbHlOYW1lKTsKICAgICBpZiAoIXBsYXRmb3JtUmVzdWx0LmlzTnVsbCgpKQog ICAgICAgICByZXR1cm4gcGxhdGZvcm1SZXN1bHQ7CiAKICAgICBpZiAoIWRvY3VtZW50KQotICAg ICAgICByZXR1cm4gZmFtaWx5TmFtZTsKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAog ICAgIGNvbnN0IFNldHRpbmdzJiBzZXR0aW5ncyA9IGRvY3VtZW50LT5zZXR0aW5ncygpOwogCkBA IC0zMDEsNyArMzAyLDcgQEAgc3RhdGljIEF0b21TdHJpbmcgcmVzb2x2ZUdlbmVyaWNGYW1pbHko RG9jdW1lbnQqIGRvY3VtZW50LCBjb25zdCBGb250RGVzY3JpcHRpb24KICAgICBpZiAoZmFtaWx5 TmFtZSA9PSBzdGFuZGFyZEZhbWlseSkKICAgICAgICAgcmV0dXJuIHNldHRpbmdzLnN0YW5kYXJk Rm9udEZhbWlseShzY3JpcHQpOwogCi0gICAgcmV0dXJuIGZhbWlseU5hbWU7CisgICAgcmV0dXJu IFdURjo6bnVsbG9wdDsKIH0KIAogRm9udFJhbmdlcyBDU1NGb250U2VsZWN0b3I6OmZvbnRSYW5n ZXNGb3JGYW1pbHkoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0 IEF0b21TdHJpbmcmIGZhbWlseU5hbWUpCkBAIC0zMTIsMTggKzMxMywzNCBAQCBGb250UmFuZ2Vz IENTU0ZvbnRTZWxlY3Rvcjo6Zm9udFJhbmdlc0ZvckZhbWlseShjb25zdCBGb250RGVzY3JpcHRp b24mIGZvbnREZXNjcgogICAgIC8vIEZJWE1FOiBUaGUgc3BlYyAoYW5kIEZpcmVmb3gpIHNheXMg dXNlciBzcGVjaWZpZWQgZ2VuZXJpYyBmYW1pbGllcyAoc2Fucy1zZXJpZiBldGMuKSBzaG91bGQg YmUgcmVzb2x2ZWQgYmVmb3JlIHRoZSBAZm9udC1mYWNlIGxvb2t1cCB0b28uCiAgICAgYm9vbCBy ZXNvbHZlR2VuZXJpY0ZhbWlseUZpcnN0ID0gZmFtaWx5TmFtZSA9PSBzdGFuZGFyZEZhbWlseTsK IAotICAgIEF0b21TdHJpbmcgZmFtaWx5Rm9yTG9va3VwID0gcmVzb2x2ZUdlbmVyaWNGYW1pbHlG aXJzdCA/IHJlc29sdmVHZW5lcmljRmFtaWx5KG1fZG9jdW1lbnQuZ2V0KCksIGZvbnREZXNjcmlw dGlvbiwgZmFtaWx5TmFtZSkgOiBmYW1pbHlOYW1lOwotICAgIGF1dG8qIGZhY2UgPSBtX2Nzc0Zv bnRGYWNlU2V0LT5mb250RmFjZShmb250RGVzY3JpcHRpb24uZm9udFNlbGVjdGlvblJlcXVlc3Qo KSwgZmFtaWx5Rm9yTG9va3VwKTsKKyAgICBBdG9tU3RyaW5nIGZhbWlseUZvckxvb2t1cCA9IGZh bWlseU5hbWU7CisgICAgT3B0aW9uYWw8Rm9udERlc2NyaXB0aW9uPiBvdmVycmlkZUZvbnREZXNj cmlwdGlvbjsKKyAgICBjb25zdCBGb250RGVzY3JpcHRpb24qIGZvbnREZXNjcmlwdGlvbkZvckxv b2t1cCA9ICZmb250RGVzY3JpcHRpb247CisgICAgYXV0byByZXNvbHZlR2VuZXJpY0ZhbWlseSA9 IFsmXSgpIHsKKyAgICAgICAgaWYgKGF1dG8gZ2VuZXJpY0ZhbWlseU9wdGlvbmFsID0gV2ViQ29y ZTo6cmVzb2x2ZUdlbmVyaWNGYW1pbHkobV9kb2N1bWVudC5nZXQoKSwgZm9udERlc2NyaXB0aW9u LCBmYW1pbHlOYW1lKSkgeworICAgICAgICAgICAgaWYgKG1fZG9jdW1lbnQgJiYgbV9kb2N1bWVu dC0+cXVpcmtzKCkuc2hvdWxkTGlnaHRlbkphcGFuZXNlQm9sZFNhbnNTZXJpZigpICYmIGZhbWls eUZvckxvb2t1cCA9PSBzYW5zU2VyaWZGYW1pbHkgJiYgZm9udERlc2NyaXB0aW9uLndlaWdodCgp ID09IGJvbGRXZWlnaHRWYWx1ZSgpICYmIGZvbnREZXNjcmlwdGlvbi5zY3JpcHQoKSA9PSBVU0NS SVBUX0tBVEFLQU5BX09SX0hJUkFHQU5BKSB7CisgICAgICAgICAgICAgICAgb3ZlcnJpZGVGb250 RGVzY3JpcHRpb24gPSBmb250RGVzY3JpcHRpb247CisgICAgICAgICAgICAgICAgb3ZlcnJpZGVG b250RGVzY3JpcHRpb24tPnNldFdlaWdodChGb250U2VsZWN0aW9uVmFsdWUoNjAwKSk7CisgICAg ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uRm9yTG9va3VwID0gJipvdmVycmlkZUZvbnREZXNj cmlwdGlvbjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGZhbWlseUZvckxvb2t1cCA9ICpn ZW5lcmljRmFtaWx5T3B0aW9uYWw7CisgICAgICAgIH0KKyAgICB9OworCisgICAgaWYgKHJlc29s dmVHZW5lcmljRmFtaWx5Rmlyc3QpCisgICAgICAgIHJlc29sdmVHZW5lcmljRmFtaWx5KCk7Cisg ICAgYXV0byogZmFjZSA9IG1fY3NzRm9udEZhY2VTZXQtPmZvbnRGYWNlKGZvbnREZXNjcmlwdGlv bkZvckxvb2t1cC0+Zm9udFNlbGVjdGlvblJlcXVlc3QoKSwgZmFtaWx5Rm9yTG9va3VwKTsKICAg ICBpZiAoZmFjZSkgewogICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVk RmVhdHVyZXMoKS53ZWJBUElTdGF0aXN0aWNzRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBpZiAo bV9kb2N1bWVudCkKICAgICAgICAgICAgICAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVk KCkubG9nRm9udExvYWQoKm1fZG9jdW1lbnQsIGZhbWlseUZvckxvb2t1cC5zdHJpbmcoKSwgdHJ1 ZSk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIGZhY2UtPmZvbnRSYW5nZXMoZm9udERlc2Ny aXB0aW9uKTsKKyAgICAgICAgcmV0dXJuIGZhY2UtPmZvbnRSYW5nZXMoKmZvbnREZXNjcmlwdGlv bkZvckxvb2t1cCk7CiAgICAgfQorCiAgICAgaWYgKCFyZXNvbHZlR2VuZXJpY0ZhbWlseUZpcnN0 KQotICAgICAgICBmYW1pbHlGb3JMb29rdXAgPSByZXNvbHZlR2VuZXJpY0ZhbWlseShtX2RvY3Vt ZW50LmdldCgpLCBmb250RGVzY3JpcHRpb24sIGZhbWlseU5hbWUpOwotICAgIGF1dG8gZm9udCA9 IEZvbnRDYWNoZTo6c2luZ2xldG9uKCkuZm9udEZvckZhbWlseShmb250RGVzY3JpcHRpb24sIGZh bWlseUZvckxvb2t1cCk7CisgICAgICAgIHJlc29sdmVHZW5lcmljRmFtaWx5KCk7CisgICAgYXV0 byBmb250ID0gRm9udENhY2hlOjpzaW5nbGV0b24oKS5mb250Rm9yRmFtaWx5KCpmb250RGVzY3Jp cHRpb25Gb3JMb29rdXAsIGZhbWlseUZvckxvb2t1cCk7CiAgICAgaWYgKFJ1bnRpbWVFbmFibGVk RmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkud2ViQVBJU3RhdGlzdGljc0VuYWJsZWQoKSkgewog ICAgICAgICBpZiAobV9kb2N1bWVudCkKICAgICAgICAgICAgIFJlc291cmNlTG9hZE9ic2VydmVy OjpzaGFyZWQoKS5sb2dGb250TG9hZCgqbV9kb2N1bWVudCwgZmFtaWx5Rm9yTG9va3VwLnN0cmlu ZygpLCAhIWZvbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9RdWlya3MuY3BwCmluZGV4IGYwYzg5OWI2YWI3MWU2MjAz MGY1ZDRiZmNkODMxN2E1OTRmY2Y1NTguLmUwNWI5ZjkzZmRmZWQ1YzYxYWI4MjlmYWJhMThiNWNi NmU4M2UyODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5jcHAKQEAgLTM4NSw2ICszODUsMjIgQEAgYm9v bCBRdWlya3M6Om5lZWRzRGVmZXJLZXlEb3duQW5kS2V5UHJlc3NUaW1lcnNVbnRpbE5leHRFZGl0 aW5nQ29tbWFuZCgpIGNvbnN0CiAjZW5kaWYKIH0KIAorYm9vbCBRdWlya3M6OnNob3VsZExpZ2h0 ZW5KYXBhbmVzZUJvbGRTYW5zU2VyaWYoKSBjb25zdAoreworI2lmIFVTRShISVJBR0lOT19TQU5T X1dPUktBUk9VTkQpCisgICAgaWYgKCFuZWVkc1F1aXJrcygpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICAvLyBsYW5nPSJqYSIgc3R5bGU9ImZvbnQ6IGJvbGQgc2Fucy1zZXJpZjsiIGNv bnRlbnQgd291bGQgbmF0dXJhbGx5IGdldCBIaXJhZ2lub1NhbnMtVzggaGVyZSwgYnV0IHRoYXQn cyB2aXN1YWxseQorICAgIC8vIHRvbyBib2xkLiBJbnN0ZWFkLCB3ZSBzaG91bGQgcGljayBIaXJh Z2lub1NhbnMtVzYgaW5zdGVhZC4KKyAgICAvLyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwMDA0NyBSZW1vdmUgdGhpcyBxdWlyay4KKyAgICBhdXRvIGhv c3QgPSBtX2RvY3VtZW50LT50b3BEb2N1bWVudCgpLnVybCgpLmhvc3QoKTsKKyAgICByZXR1cm4g ZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoaG9zdCwgIm0ueWFob28uY28uanAiKTsKKyNl bHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKIC8vIEZJWE1FKDxyZGFyOi8vcHJv YmxlbS81MDM5NDk2OT4pOiBSZW1vdmUgYWZ0ZXIgZGVzbW9zLmNvbSBhZG9wdHMgaW5wdXRtb2Rl PSJub25lIi4KIGJvb2wgUXVpcmtzOjpuZWVkc0lucHV0TW9kZU5vbmVJbXBsaWNpdGx5KGNvbnN0 IEhUTUxFbGVtZW50JiBlbGVtZW50KSBjb25zdAogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9RdWlya3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUXVpcmtzLmgKaW5kZXggYTRi ZWQyZjMyZWZkN2Q2NWMyN2I2ZjU3NzNhYjgxYmM5MWE4ZjViYi4uMDNkNmI1OGQ3Yjk5ZDA1NGIz OWRlYTgxZjRhMmM2Y2U5ZmM4NzU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9R dWlya3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1F1aXJrcy5oCkBAIC01Nyw2ICs1Nyw3 IEBAIHB1YmxpYzoKICAgICBib29sIHNob3VsZERpc2FibGVQb2ludGVyRXZlbnRzUXVpcmsoKSBj b25zdDsKICAgICBib29sIG5lZWRzSW5wdXRNb2RlTm9uZUltcGxpY2l0bHkoY29uc3QgSFRNTEVs ZW1lbnQmKSBjb25zdDsKICAgICBib29sIG5lZWRzRGVmZXJLZXlEb3duQW5kS2V5UHJlc3NUaW1l cnNVbnRpbE5leHRFZGl0aW5nQ29tbWFuZCgpIGNvbnN0OworICAgIGJvb2wgc2hvdWxkTGlnaHRl bkphcGFuZXNlQm9sZFNhbnNTZXJpZigpIGNvbnN0OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgYm9v bCBzaG91bGREaXNwYXRjaFN5bnRoZXRpY01vdXNlRXZlbnRzV2hlbk1vZGlmeWluZ1NlbGVjdGlv bigpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2hvdWxkU3VwcHJlc3NBdXRvY29y cmVjdGlvbkFuZEF1dG9jYXB0aWFsaXphdGlvbkluSGlkZGVuRWRpdGFibGVBcmVhcygpIGNvbnN0 Owo=