166672 2017-01-03 17:20:11 -0800 [Cocoa] Variation fonts without variations specified are not rendered as if the default variations were specified 2017-01-18 13:41:40 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield commit-queue keith_miller mark.lam msaboff ryanhaddad saam webkit-bug-importer oldest_to_newest 1263624 0 mmaxfield 2017-01-03 17:20:11 -0800 [Cocoa] Variation fonts without variations specified are not rendered as if the default variations were specified 1263626 1 297974 mmaxfield 2017-01-03 17:22:14 -0800 Created attachment 297974 Patch 1263654 2 297983 mmaxfield 2017-01-03 19:12:20 -0800 Created attachment 297983 Patch 1263661 3 297985 mmaxfield 2017-01-03 19:17:15 -0800 Created attachment 297985 Patch 1263663 4 mmaxfield 2017-01-03 19:17:28 -0800 *** Bug 166667 has been marked as a duplicate of this bug. *** 1263664 5 mmaxfield 2017-01-03 19:18:46 -0800 <rdar://problem/29779119> 1263919 6 297985 darin 2017-01-04 15:45:31 -0800 Comment on attachment 297985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=297985&action=review > Source/WebCore/ChangeLog:15 > + Test: fast/text/variations/advances.html This is a pre-existing test? I don’t see it failing. So how can it be that this test covers the bug we are fixing? 1263995 7 mmaxfield 2017-01-04 20:37:42 -0800 (In reply to comment #6) > Comment on attachment 297985 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=297985&action=review > > > Source/WebCore/ChangeLog:15 > > + Test: fast/text/variations/advances.html > > This is a pre-existing test? I don’t see it failing. So how can it be that > this test covers the bug we are fixing? It's failing on our internal bots. 1264194 8 297985 commit-queue 2017-01-05 12:32:26 -0800 Comment on attachment 297985 Patch Clearing flags on attachment: 297985 Committed r210370: <http://trac.webkit.org/changeset/210370> 1264195 9 commit-queue 2017-01-05 12:32:30 -0800 All reviewed patches have been landed. Closing bug. 1264224 10 ryanhaddad 2017-01-05 13:36:04 -0800 Reverted r210370 for reason: This change caused hundreds of LayoutTest failures on Sierra. Committed r210375: <http://trac.webkit.org/changeset/210375> 1264225 11 ryanhaddad 2017-01-05 13:37:00 -0800 (In reply to comment #10) > Reverted r210370 for reason: > > This change caused hundreds of LayoutTest failures on Sierra. > > Committed r210375: <http://trac.webkit.org/changeset/210375> Link to test run with failures: https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20%28Tests%29/builds/2531 1264750 12 mmaxfield 2017-01-07 13:54:56 -0800 (In reply to comment #11) > (In reply to comment #10) > > Reverted r210370 for reason: > > > > This change caused hundreds of LayoutTest failures on Sierra. > > > > Committed r210375: <http://trac.webkit.org/changeset/210375> > > Link to test run with failures: > > https://build.webkit.org/builders/ > Apple%20Sierra%20Release%20WK2%20%28Tests%29/builds/2531 Looks like this is because of the system font 1265202 13 298414 mmaxfield 2017-01-09 16:37:02 -0800 Created attachment 298414 Patch for committing 1265814 14 298414 commit-queue 2017-01-11 10:27:43 -0800 Comment on attachment 298414 Patch for committing Clearing flags on attachment: 298414 Committed r210591: <http://trac.webkit.org/changeset/210591> 1265815 15 commit-queue 2017-01-11 10:27:48 -0800 All reviewed patches have been landed. Closing bug. 1265857 16 mmaxfield 2017-01-11 12:07:42 -0800 Caused fast/text/trak-optimizeLegibility.html and fast/text/system-font-features.html to fail 1265897 17 mmaxfield 2017-01-11 13:41:38 -0800 Committed r210597: <http://trac.webkit.org/changeset/210597> 1265898 18 mmaxfield 2017-01-11 13:47:58 -0800 Committed r210598: <http://trac.webkit.org/changeset/210598> 1265991 19 mmaxfield 2017-01-11 17:25:28 -0800 https://trac.webkit.org/changeset/210598 https://trac.webkit.org/changeset/210597 1266009 20 ryanhaddad 2017-01-11 17:55:39 -0800 Reverted changes in https://trac.webkit.org/r210612 because the iOS simulator build is still broken: https://build.webkit.org/builders/Apple%20iOS%2010%20Simulator%20Debug%20%28Build%29/builds/3159 1266849 21 mmaxfield 2017-01-14 14:03:04 -0800 The build failure on the iOS simulator is quite confusing. A build works locally, and I can't figure out what went wrong from inspection. 1267620 22 299099 mmaxfield 2017-01-17 18:16:28 -0800 Created attachment 299099 Patch for committing 1267861 23 mmaxfield 2017-01-18 13:41:40 -0800 Committed r210883: <http://trac.webkit.org/changeset/210883> 297974 2017-01-03 17:22:14 -0800 2017-01-03 19:12:17 -0800 Patch bug-166672-20170103172049.patch text/plain 5242 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY3ZmVjYjA2MzdhMDE3 ZDAxYmFkYjI3MDAxNjBmOWMxYjM5NWYyMy4uOThlYTBkODRhMmI0ODFjMTlhZjk1YjI0YzI2ZTBk YzA3ODQxYTRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAxLTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBW YXJpYXRpb24gZm9udHMgd2l0aG91dCB2YXJpYXRpb25zIHNwZWNpZmllZCBhcmUgbm90IHJlbmRl cmVkIGFzIGlmIHRoZSBkZWZhdWx0IHZhcmlhdGlvbnMgd2VyZSBzcGVjaWZpZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NjY3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcmVUZXh0IGhhcyBhIGJ1 ZyB3aGVyZSB2YXJpYXRpb24gZm9udHMgd2l0aG91dCBhIHNwZWNpZmllZCB2YXJpYXRpb24gdmFs dWUKKyAgICAgICAgYXJlIHJlbmRlcmVkIGFzIGlmIHRoZSBtaW5pbXVtIHZhbHVlIGlzIHNwZWNp ZmllZCwgcmF0aGVyIHRoYW4gdGhlIGRlZmF1bHQKKyAgICAgICAgdmFsdWUuCisKKyAgICAgICAg VGVzdDogZmFzdC90ZXh0L3ZhcmlhdGlvbnMvYWR2YW5jZXMuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6cHJlcGFyZVBsYXRmb3JtRm9udCk6CisKIDIwMTctMDEtMDMgIEFuZHJlYXMgS2xpbmcg IDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFBsYWNlaG9sZGVyIHN0eWxlIG1lY2hhbmlz bSBsZWFrcyBDU1NGb250U2VsZWN0b3IgZm9yIGZpcnN0IERvY3VtZW50IHN0eWxlZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv cmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRD YWNoZUNvcmVUZXh0LmNwcAppbmRleCBiMGQ2NDA4MjYxNjAyMmNkNWU4ZTBhZTRkYTU1NmM0MDI4 ZmExMGI3Li4yMGNjNDgzMTY4ZGU1Yjk1ZWEzMDMxZmUwOGNhZTJkZDFhNjJhZDAwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl VGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u dENhY2hlQ29yZVRleHQuY3BwCkBAIC00MjUsNyArNDI1LDE2IEBAIHN0YXRpYyBWYXJpYXRpb25E ZWZhdWx0c01hcCBkZWZhdWx0VmFyaWF0aW9uVmFsdWVzKENURm9udFJlZiBmb250KQogCiBSZXRh aW5QdHI8Q1RGb250UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZv bnQsIFRleHRSZW5kZXJpbmdNb2RlIHRleHRSZW5kZXJpbmdNb2RlLCBjb25zdCBGb250RmVhdHVy ZVNldHRpbmdzKiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBm b250RmFjZVZhcmlhbnRTZXR0aW5ncywgY29uc3QgRm9udEZlYXR1cmVTZXR0aW5ncyYgZmVhdHVy ZXMsIGNvbnN0IEZvbnRWYXJpYW50U2V0dGluZ3MmIHZhcmlhbnRTZXR0aW5ncywgY29uc3QgRm9u dFZhcmlhdGlvblNldHRpbmdzJiB2YXJpYXRpb25zKQogewotICAgIGlmICghb3JpZ2luYWxGb250 IHx8ICghZmVhdHVyZXMuc2l6ZSgpICYmIHZhcmlhdGlvbnMuaXNFbXB0eSgpICYmICh0ZXh0UmVu ZGVyaW5nTW9kZSA9PSBBdXRvVGV4dFJlbmRlcmluZykgJiYgdmFyaWFudFNldHRpbmdzLmlzQWxs Tm9ybWFsKCkKKyAgICBib29sIGFsd2F5c0FkZFZhcmlhdGlvbnMgPSBmYWxzZTsKKyNkZWZpbmUg V09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJT05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRyAoUExB VEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwKSB8 fCAoUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEx MDAwMCkKKyNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQorICAgIGF1dG8gZGVmYXVsdFZhbHVl cyA9IGRlZmF1bHRWYXJpYXRpb25WYWx1ZXMob3JpZ2luYWxGb250KTsKKyNpZiBXT1JLQVJPVU5E X0NPUkVURVhUX1ZBUklBVElPTlNfVU5TUEVDSUZJRURfVkFMVUVfQlVHCisgICAgYWx3YXlzQWRk VmFyaWF0aW9ucyA9ICFkZWZhdWx0VmFsdWVzLmlzRW1wdHkoKTsKKyNlbmRpZgorI2VuZGlmCisK KyAgICBpZiAoIW9yaWdpbmFsRm9udCB8fCAoIWZlYXR1cmVzLnNpemUoKSAmJiAoIWFsd2F5c0Fk ZFZhcmlhdGlvbnMgJiYgdmFyaWF0aW9ucy5pc0VtcHR5KCkpICYmICh0ZXh0UmVuZGVyaW5nTW9k ZSA9PSBBdXRvVGV4dFJlbmRlcmluZykgJiYgdmFyaWFudFNldHRpbmdzLmlzQWxsTm9ybWFsKCkK ICAgICAgICAgJiYgKCFmb250RmFjZUZlYXR1cmVzIHx8ICFmb250RmFjZUZlYXR1cmVzLT5zaXpl KCkpICYmICghZm9udEZhY2VWYXJpYW50U2V0dGluZ3MgfHwgZm9udEZhY2VWYXJpYW50U2V0dGlu Z3MtPmlzQWxsTm9ybWFsKCkpKSkKICAgICAgICAgcmV0dXJuIG9yaWdpbmFsRm9udDsKIApAQCAt NDYyLDI2ICs0NzEsMzcgQEAgUmV0YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9u dChDVEZvbnRSZWYgb3JpZ2luYWxGb250LCBUZXh0UmVuZGVyaW5nTW8KICAgICAgICAgZmVhdHVy ZXNUb0JlQXBwbGllZC5zZXQobmV3RmVhdHVyZS50YWcoKSwgbmV3RmVhdHVyZS52YWx1ZSgpKTsK IAogI2lmIEVOQUJMRShWQVJJQVRJT05fRk9OVFMpCi0gICAgYXV0byBkZWZhdWx0VmFsdWVzID0g ZGVmYXVsdFZhcmlhdGlvblZhbHVlcyhvcmlnaW5hbEZvbnQpOwotCiAgICAgVmFyaWF0aW9uc01h cCB2YXJpYXRpb25zVG9CZUFwcGxpZWQ7Ci0gICAgZm9yIChhdXRvJiBuZXdWYXJpYXRpb24gOiB2 YXJpYXRpb25zKSB7Ci0gICAgICAgIGF1dG8gaXRlcmF0b3IgPSBkZWZhdWx0VmFsdWVzLmZpbmQo bmV3VmFyaWF0aW9uLnRhZygpKTsKLSAgICAgICAgaWYgKGl0ZXJhdG9yICE9IGRlZmF1bHRWYWx1 ZXMuZW5kKCkpIHsKLSAgICAgICAgICAgIGZsb2F0IHZhbHVlVG9BcHBseSA9IHN0ZDo6bWF4KHN0 ZDo6bWluKG5ld1ZhcmlhdGlvbi52YWx1ZSgpLCBpdGVyYXRvci0+dmFsdWUubWF4aW11bVZhbHVl KSwgaXRlcmF0b3ItPnZhbHVlLm1pbmltdW1WYWx1ZSk7CiAKLSAgICAgICAgICAgIC8vIEZJWE1F OiBSZW1vdmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vMjg3MDc4MjI+IGlzIGZpeGVkCisgICAgYXV0 byBhcHBseVZhcmlhdGlvblZhbHVlID0gWyZdKGNvbnN0IEZvbnRUYWcmIHRhZywgZmxvYXQgdmFs dWUsIGJvb2wgaXNEZWZhdWx0VmFsdWUpIHsKKyAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB3aGVu IDxyZGFyOi8vcHJvYmxlbS8yODcwNzgyMj4gaXMgZml4ZWQKICNkZWZpbmUgV09SS0FST1VORF9D T1JFVEVYVF9WQVJJQVRJT05TX0RFRkFVTFRfVkFMVUVfQlVHIChQTEFURk9STShNQUMpICYmIF9f TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEzMDApIHx8IChQTEFURk9STShJT1Mp ICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTEwMDAwKQogI2lmIFdPUktB Uk9VTkRfQ09SRVRFWFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRwotICAgICAgICAgICAg aWYgKHZhbHVlVG9BcHBseSA9PSBpdGVyYXRvci0+dmFsdWUuZGVmYXVsdFZhbHVlKQotICAgICAg ICAgICAgICAgIHZhbHVlVG9BcHBseSArPSAwLjAwMDE7CisgICAgICAgIGlmIChpc0RlZmF1bHRW YWx1ZSkKKyAgICAgICAgICAgIHZhbHVlICs9IDAuMDAwMTsKICNlbmRpZgogI3VuZGVmIFdPUktB Uk9VTkRfQ09SRVRFWFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRworICAgICAgICB2YXJp YXRpb25zVG9CZUFwcGxpZWQuc2V0KHRhZywgdmFsdWUpOworICAgIH07CiAKLSAgICAgICAgICAg IHZhcmlhdGlvbnNUb0JlQXBwbGllZC5zZXQobmV3VmFyaWF0aW9uLnRhZygpLCB2YWx1ZVRvQXBw bHkpOworICAgIGZvciAoYXV0byYgbmV3VmFyaWF0aW9uIDogdmFyaWF0aW9ucykgeworICAgICAg ICBhdXRvIGl0ZXJhdG9yID0gZGVmYXVsdFZhbHVlcy5maW5kKG5ld1ZhcmlhdGlvbi50YWcoKSk7 CisgICAgICAgIGlmIChpdGVyYXRvciAhPSBkZWZhdWx0VmFsdWVzLmVuZCgpKSB7CisgICAgICAg ICAgICBmbG9hdCB2YWx1ZVRvQXBwbHkgPSBzdGQ6Om1heChzdGQ6Om1pbihuZXdWYXJpYXRpb24u dmFsdWUoKSwgaXRlcmF0b3ItPnZhbHVlLm1heGltdW1WYWx1ZSksIGl0ZXJhdG9yLT52YWx1ZS5t aW5pbXVtVmFsdWUpOworICAgICAgICAgICAgYm9vbCBpc0RlZmF1bHRWYWx1ZSA9IHZhbHVlVG9B cHBseSA9PSBpdGVyYXRvci0+dmFsdWUuZGVmYXVsdFZhbHVlOworICAgICAgICAgICAgYXBwbHlW YXJpYXRpb25WYWx1ZShuZXdWYXJpYXRpb24udGFnKCksIHZhbHVlVG9BcHBseSwgaXNEZWZhdWx0 VmFsdWUpOwogICAgICAgICB9CiAgICAgfQorCisjaWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJ QVRJT05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworICAgIGZvciAoYXV0byYgZGVmYXVsdFZhbHVl IDogZGVmYXVsdFZhbHVlcykgeworICAgICAgICBpZiAoIXZhcmlhdGlvbnNUb0JlQXBwbGllZC5j b250YWlucyhkZWZhdWx0VmFsdWUua2V5KSkKKyAgICAgICAgICAgIGFwcGx5VmFyaWF0aW9uVmFs dWUoZGVmYXVsdFZhbHVlLmtleSwgZGVmYXVsdFZhbHVlLnZhbHVlLmRlZmF1bHRWYWx1ZSwgdHJ1 ZSk7CisgICAgfQogI2VuZGlmCisjdW5kZWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJT05T X1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworCisjZW5kaWYgLy8gRU5BQkxFKFZBUklBVElPTl9GT05U UykKIAogICAgIFJldGFpblB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVmPiBhdHRyaWJ1dGVzID0g YWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDIs ICZrQ0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVD YWxsQmFja3MpKTsKICAgICBpZiAoIWZlYXR1cmVzVG9CZUFwcGxpZWQuaXNFbXB0eSgpKSB7Cg== 297983 2017-01-03 19:12:20 -0800 2017-01-03 19:17:12 -0800 Patch bug-166672-20170103191054.patch text/plain 5407 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY3ZmVjYjA2MzdhMDE3 ZDAxYmFkYjI3MDAxNjBmOWMxYjM5NWYyMy4uODc3ZmJlNjNkMDJjOGYzZjg3MzgzOWQ4ODYzNmY2 NDU4YTA2ZmZiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTAxLTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBW YXJpYXRpb24gZm9udHMgd2l0aG91dCB2YXJpYXRpb25zIHNwZWNpZmllZCBhcmUgbm90IHJlbmRl cmVkIGFzIGlmIHRoZSBkZWZhdWx0IHZhcmlhdGlvbnMgd2VyZSBzcGVjaWZpZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NjY3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcmVUZXh0IGhhcyBhIGJ1 ZyAoPHJkYXI6Ly9wcm9ibGVtLzI5ODU5MjA3Pikgd2hlcmUgdmFyaWF0aW9uIGZvbnRzIHdpdGhv dXQKKyAgICAgICAgYSBzcGVjaWZpZWQgdmFyaWF0aW9uIHZhbHVlIGFyZSByZW5kZXJlZCBhcyBp ZiB0aGUgbWluaW11bSB2YWx1ZSBpcyBzcGVjaWZpZWQsCisgICAgICAgIHJhdGhlciB0aGFuIHRo ZSBkZWZhdWx0IHZhbHVlLiBUaGUgc29sdXRpb24gaXMgdG8gYXBwbHkgZGVmYXVsdCB2YWx1ZXMg d2hlcmUKKyAgICAgICAgdGhleSBhcmUgb21pdHRlZC4KKworICAgICAgICBUZXN0OiBmYXN0L3Rl eHQvdmFyaWF0aW9ucy9hZHZhbmNlcy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmVwYXJl UGxhdGZvcm1Gb250KToKKwogMjAxNy0wMS0wMyAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgUGxhY2Vob2xkZXIgc3R5bGUgbWVjaGFuaXNtIGxlYWtzIENTU0Zv bnRTZWxlY3RvciBmb3IgZmlyc3QgRG9jdW1lbnQgc3R5bGVkLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQu Y3BwCmluZGV4IGIwZDY0MDgyNjE2MDIyY2Q1ZThlMGFlNGRhNTU2YzQwMjhmYTEwYjcuLmQ0Yzgy ZDU4OWU0YTBlNDFjZmIzNTM3ZDk4OGUzYTZmNTBiOTQwZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4 dC5jcHAKQEAgLTQyNSw3ICs0MjUsMTggQEAgc3RhdGljIFZhcmlhdGlvbkRlZmF1bHRzTWFwIGRl ZmF1bHRWYXJpYXRpb25WYWx1ZXMoQ1RGb250UmVmIGZvbnQpCiAKIFJldGFpblB0cjxDVEZvbnRS ZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmIG9yaWdpbmFsRm9udCwgVGV4dFJlbmRl cmluZ01vZGUgdGV4dFJlbmRlcmluZ01vZGUsIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MqIGZv bnRGYWNlRmVhdHVyZXMsIGNvbnN0IEZvbnRWYXJpYW50U2V0dGluZ3MqIGZvbnRGYWNlVmFyaWFu dFNldHRpbmdzLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzJiBmZWF0dXJlcywgY29uc3QgRm9u dFZhcmlhbnRTZXR0aW5ncyYgdmFyaWFudFNldHRpbmdzLCBjb25zdCBGb250VmFyaWF0aW9uU2V0 dGluZ3MmIHZhcmlhdGlvbnMpCiB7Ci0gICAgaWYgKCFvcmlnaW5hbEZvbnQgfHwgKCFmZWF0dXJl cy5zaXplKCkgJiYgdmFyaWF0aW9ucy5pc0VtcHR5KCkgJiYgKHRleHRSZW5kZXJpbmdNb2RlID09 IEF1dG9UZXh0UmVuZGVyaW5nKSAmJiB2YXJpYW50U2V0dGluZ3MuaXNBbGxOb3JtYWwoKQorICAg IGJvb2wgYWx3YXlzQWRkVmFyaWF0aW9ucyA9IGZhbHNlOworCisgICAgLy8gRklYTUU6IFJlbW92 ZSB3aGVuIDxyZGFyOi8vcHJvYmxlbS8yOTg1OTIwNz4gaXMgZml4ZWQKKyNkZWZpbmUgV09SS0FS T1VORF9DT1JFVEVYVF9WQVJJQVRJT05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRyAoUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwKSB8fCAoUExB VEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkK KyNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQorICAgIGF1dG8gZGVmYXVsdFZhbHVlcyA9IGRl ZmF1bHRWYXJpYXRpb25WYWx1ZXMob3JpZ2luYWxGb250KTsKKyNpZiBXT1JLQVJPVU5EX0NPUkVU RVhUX1ZBUklBVElPTlNfVU5TUEVDSUZJRURfVkFMVUVfQlVHCisgICAgYWx3YXlzQWRkVmFyaWF0 aW9ucyA9ICFkZWZhdWx0VmFsdWVzLmlzRW1wdHkoKTsKKyNlbmRpZgorI2VuZGlmCisKKyAgICBp ZiAoIW9yaWdpbmFsRm9udCB8fCAoIWZlYXR1cmVzLnNpemUoKSAmJiAoIWFsd2F5c0FkZFZhcmlh dGlvbnMgJiYgdmFyaWF0aW9ucy5pc0VtcHR5KCkpICYmICh0ZXh0UmVuZGVyaW5nTW9kZSA9PSBB dXRvVGV4dFJlbmRlcmluZykgJiYgdmFyaWFudFNldHRpbmdzLmlzQWxsTm9ybWFsKCkKICAgICAg ICAgJiYgKCFmb250RmFjZUZlYXR1cmVzIHx8ICFmb250RmFjZUZlYXR1cmVzLT5zaXplKCkpICYm ICghZm9udEZhY2VWYXJpYW50U2V0dGluZ3MgfHwgZm9udEZhY2VWYXJpYW50U2V0dGluZ3MtPmlz QWxsTm9ybWFsKCkpKSkKICAgICAgICAgcmV0dXJuIG9yaWdpbmFsRm9udDsKIApAQCAtNDYyLDI2 ICs0NzMsMzcgQEAgUmV0YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZv bnRSZWYgb3JpZ2luYWxGb250LCBUZXh0UmVuZGVyaW5nTW8KICAgICAgICAgZmVhdHVyZXNUb0Jl QXBwbGllZC5zZXQobmV3RmVhdHVyZS50YWcoKSwgbmV3RmVhdHVyZS52YWx1ZSgpKTsKIAogI2lm IEVOQUJMRShWQVJJQVRJT05fRk9OVFMpCi0gICAgYXV0byBkZWZhdWx0VmFsdWVzID0gZGVmYXVs dFZhcmlhdGlvblZhbHVlcyhvcmlnaW5hbEZvbnQpOwotCiAgICAgVmFyaWF0aW9uc01hcCB2YXJp YXRpb25zVG9CZUFwcGxpZWQ7Ci0gICAgZm9yIChhdXRvJiBuZXdWYXJpYXRpb24gOiB2YXJpYXRp b25zKSB7Ci0gICAgICAgIGF1dG8gaXRlcmF0b3IgPSBkZWZhdWx0VmFsdWVzLmZpbmQobmV3VmFy aWF0aW9uLnRhZygpKTsKLSAgICAgICAgaWYgKGl0ZXJhdG9yICE9IGRlZmF1bHRWYWx1ZXMuZW5k KCkpIHsKLSAgICAgICAgICAgIGZsb2F0IHZhbHVlVG9BcHBseSA9IHN0ZDo6bWF4KHN0ZDo6bWlu KG5ld1ZhcmlhdGlvbi52YWx1ZSgpLCBpdGVyYXRvci0+dmFsdWUubWF4aW11bVZhbHVlKSwgaXRl cmF0b3ItPnZhbHVlLm1pbmltdW1WYWx1ZSk7CiAKLSAgICAgICAgICAgIC8vIEZJWE1FOiBSZW1v dmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vMjg3MDc4MjI+IGlzIGZpeGVkCisgICAgYXV0byBhcHBs eVZhcmlhdGlvblZhbHVlID0gWyZdKGNvbnN0IEZvbnRUYWcmIHRhZywgZmxvYXQgdmFsdWUsIGJv b2wgaXNEZWZhdWx0VmFsdWUpIHsKKyAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB3aGVuIDxyZGFy Oi8vcHJvYmxlbS8yODcwNzgyMj4gaXMgZml4ZWQKICNkZWZpbmUgV09SS0FST1VORF9DT1JFVEVY VF9WQVJJQVRJT05TX0RFRkFVTFRfVkFMVUVfQlVHIChQTEFURk9STShNQUMpICYmIF9fTUFDX09T X1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEzMDApIHx8IChQTEFURk9STShJT1MpICYmIF9f SVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTEwMDAwKQogI2lmIFdPUktBUk9VTkRf Q09SRVRFWFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRwotICAgICAgICAgICAgaWYgKHZh bHVlVG9BcHBseSA9PSBpdGVyYXRvci0+dmFsdWUuZGVmYXVsdFZhbHVlKQotICAgICAgICAgICAg ICAgIHZhbHVlVG9BcHBseSArPSAwLjAwMDE7CisgICAgICAgIGlmIChpc0RlZmF1bHRWYWx1ZSkK KyAgICAgICAgICAgIHZhbHVlICs9IDAuMDAwMTsKICNlbmRpZgogI3VuZGVmIFdPUktBUk9VTkRf Q09SRVRFWFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRworICAgICAgICB2YXJpYXRpb25z VG9CZUFwcGxpZWQuc2V0KHRhZywgdmFsdWUpOworICAgIH07CiAKLSAgICAgICAgICAgIHZhcmlh dGlvbnNUb0JlQXBwbGllZC5zZXQobmV3VmFyaWF0aW9uLnRhZygpLCB2YWx1ZVRvQXBwbHkpOwor ICAgIGZvciAoYXV0byYgbmV3VmFyaWF0aW9uIDogdmFyaWF0aW9ucykgeworICAgICAgICBhdXRv IGl0ZXJhdG9yID0gZGVmYXVsdFZhbHVlcy5maW5kKG5ld1ZhcmlhdGlvbi50YWcoKSk7CisgICAg ICAgIGlmIChpdGVyYXRvciAhPSBkZWZhdWx0VmFsdWVzLmVuZCgpKSB7CisgICAgICAgICAgICBm bG9hdCB2YWx1ZVRvQXBwbHkgPSBzdGQ6Om1heChzdGQ6Om1pbihuZXdWYXJpYXRpb24udmFsdWUo KSwgaXRlcmF0b3ItPnZhbHVlLm1heGltdW1WYWx1ZSksIGl0ZXJhdG9yLT52YWx1ZS5taW5pbXVt VmFsdWUpOworICAgICAgICAgICAgYm9vbCBpc0RlZmF1bHRWYWx1ZSA9IHZhbHVlVG9BcHBseSA9 PSBpdGVyYXRvci0+dmFsdWUuZGVmYXVsdFZhbHVlOworICAgICAgICAgICAgYXBwbHlWYXJpYXRp b25WYWx1ZShuZXdWYXJpYXRpb24udGFnKCksIHZhbHVlVG9BcHBseSwgaXNEZWZhdWx0VmFsdWUp OwogICAgICAgICB9CiAgICAgfQorCisjaWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJT05T X1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworICAgIGZvciAoYXV0byYgZGVmYXVsdFZhbHVlIDogZGVm YXVsdFZhbHVlcykgeworICAgICAgICBpZiAoIXZhcmlhdGlvbnNUb0JlQXBwbGllZC5jb250YWlu cyhkZWZhdWx0VmFsdWUua2V5KSkKKyAgICAgICAgICAgIGFwcGx5VmFyaWF0aW9uVmFsdWUoZGVm YXVsdFZhbHVlLmtleSwgZGVmYXVsdFZhbHVlLnZhbHVlLmRlZmF1bHRWYWx1ZSwgdHJ1ZSk7Cisg ICAgfQogI2VuZGlmCisjdW5kZWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJT05TX1VOU1BF Q0lGSUVEX1ZBTFVFX0JVRworCisjZW5kaWYgLy8gRU5BQkxFKFZBUklBVElPTl9GT05UUykKIAog ICAgIFJldGFpblB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVmPiBhdHRyaWJ1dGVzID0gYWRvcHRD RihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDIsICZrQ0ZU eXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFj a3MpKTsKICAgICBpZiAoIWZlYXR1cmVzVG9CZUFwcGxpZWQuaXNFbXB0eSgpKSB7Cg== 297985 2017-01-03 19:17:15 -0800 2017-01-05 12:32:26 -0800 Patch bug-166672-20170103191549.patch text/plain 6261 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWY3ZmVjYjA2MzdhMDE3 ZDAxYmFkYjI3MDAxNjBmOWMxYjM5NWYyMy4uZjkwZmI5MGNjZGJhNDdlNWU4NmQ5NjY1OTc2NWVj YTIzYWM1ZTBhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAxLTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBW YXJpYXRpb24gZm9udHMgd2l0aG91dCB2YXJpYXRpb25zIHNwZWNpZmllZCBhcmUgbm90IHJlbmRl cmVkIGFzIGlmIHRoZSBkZWZhdWx0IHZhcmlhdGlvbnMgd2VyZSBzcGVjaWZpZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NjY3MgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjk3NzkxMTk+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTg0ODg4 Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3Jl VGV4dCBoYXMgYSBidWcgKDxyZGFyOi8vcHJvYmxlbS8yOTg1OTIwNz4pIHdoZXJlIHZhcmlhdGlv biBmb250cyB3aXRob3V0CisgICAgICAgIGEgc3BlY2lmaWVkIHZhcmlhdGlvbiB2YWx1ZSBhcmUg cmVuZGVyZWQgYXMgaWYgdGhlIG1pbmltdW0gdmFsdWUgaXMgc3BlY2lmaWVkLAorICAgICAgICBy YXRoZXIgdGhhbiB0aGUgZGVmYXVsdCB2YWx1ZS4gVGhlIHNvbHV0aW9uIGlzIHRvIGFwcGx5IGRl ZmF1bHQgdmFsdWVzIHdoZXJlCisgICAgICAgIHRoZXkgYXJlIG9taXR0ZWQuCisKKyAgICAgICAg VGVzdDogZmFzdC90ZXh0L3ZhcmlhdGlvbnMvYWR2YW5jZXMuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6cHJlcGFyZVBsYXRmb3JtRm9udCk6CisKIDIwMTctMDEtMDMgIEFuZHJlYXMgS2xpbmcg IDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFBsYWNlaG9sZGVyIHN0eWxlIG1lY2hhbmlz bSBsZWFrcyBDU1NGb250U2VsZWN0b3IgZm9yIGZpcnN0IERvY3VtZW50IHN0eWxlZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv cmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRD YWNoZUNvcmVUZXh0LmNwcAppbmRleCBiMGQ2NDA4MjYxNjAyMmNkNWU4ZTBhZTRkYTU1NmM0MDI4 ZmExMGI3Li42MjZhY2Y1NDMxZjE1M2NkNmQxYmE2MDkxZDc0MDJmMTM4ZTFiN2UyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3Jl VGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u dENhY2hlQ29yZVRleHQuY3BwCkBAIC00MTEsMTAgKzQxMSw2IEBAIHN0YXRpYyBWYXJpYXRpb25E ZWZhdWx0c01hcCBkZWZhdWx0VmFyaWF0aW9uVmFsdWVzKENURm9udFJlZiBmb250KQogICAgICAg ICBhdXRvIGIyID0gKHJhd0F4aXNJZGVudGlmaWVyICYgMHhGRjAwMDApID4+IDE2OwogICAgICAg ICBhdXRvIGIzID0gKHJhd0F4aXNJZGVudGlmaWVyICYgMHhGRjAwKSA+PiA4OwogICAgICAgICBh dXRvIGI0ID0gcmF3QXhpc0lkZW50aWZpZXIgJiAweEZGOwotICAgICAgICBBU1NFUlQoYjEgPj0g MCAmJiBiMSA8PSBzdGQ6Om51bWVyaWNfbGltaXRzPGNoYXI+OjptYXgoKSk7Ci0gICAgICAgIEFT U0VSVChiMiA+PSAwICYmIGIyIDw9IHN0ZDo6bnVtZXJpY19saW1pdHM8Y2hhcj46Om1heCgpKTsK LSAgICAgICAgQVNTRVJUKGIzID49IDAgJiYgYjMgPD0gc3RkOjpudW1lcmljX2xpbWl0czxjaGFy Pjo6bWF4KCkpOwotICAgICAgICBBU1NFUlQoYjQgPj0gMCAmJiBiNCA8PSBzdGQ6Om51bWVyaWNf bGltaXRzPGNoYXI+OjptYXgoKSk7CiAgICAgICAgIEZvbnRUYWcgcmVzdWx0S2V5ID0ge3sgc3Rh dGljX2Nhc3Q8Y2hhcj4oYjEpLCBzdGF0aWNfY2FzdDxjaGFyPihiMiksIHN0YXRpY19jYXN0PGNo YXI+KGIzKSwgc3RhdGljX2Nhc3Q8Y2hhcj4oYjQpIH19OwogICAgICAgICBWYXJpYXRpb25EZWZh dWx0cyByZXN1bHRWYWx1ZXMgPSB7IHJhd0RlZmF1bHRWYWx1ZSwgcmF3TWluaW11bVZhbHVlLCBy YXdNYXhpbXVtVmFsdWUgfTsKICAgICAgICAgcmVzdWx0LnNldChyZXN1bHRLZXksIHJlc3VsdFZh bHVlcyk7CkBAIC00MjUsNyArNDIxLDE4IEBAIHN0YXRpYyBWYXJpYXRpb25EZWZhdWx0c01hcCBk ZWZhdWx0VmFyaWF0aW9uVmFsdWVzKENURm9udFJlZiBmb250KQogCiBSZXRhaW5QdHI8Q1RGb250 UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIFRleHRSZW5k ZXJpbmdNb2RlIHRleHRSZW5kZXJpbmdNb2RlLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBm b250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlh bnRTZXR0aW5ncywgY29uc3QgRm9udEZlYXR1cmVTZXR0aW5ncyYgZmVhdHVyZXMsIGNvbnN0IEZv bnRWYXJpYW50U2V0dGluZ3MmIHZhcmlhbnRTZXR0aW5ncywgY29uc3QgRm9udFZhcmlhdGlvblNl dHRpbmdzJiB2YXJpYXRpb25zKQogewotICAgIGlmICghb3JpZ2luYWxGb250IHx8ICghZmVhdHVy ZXMuc2l6ZSgpICYmIHZhcmlhdGlvbnMuaXNFbXB0eSgpICYmICh0ZXh0UmVuZGVyaW5nTW9kZSA9 PSBBdXRvVGV4dFJlbmRlcmluZykgJiYgdmFyaWFudFNldHRpbmdzLmlzQWxsTm9ybWFsKCkKKyAg ICBib29sIGFsd2F5c0FkZFZhcmlhdGlvbnMgPSBmYWxzZTsKKworICAgIC8vIEZJWE1FOiBSZW1v dmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vMjk4NTkyMDc+IGlzIGZpeGVkCisjZGVmaW5lIFdPUktB Uk9VTkRfQ09SRVRFWFRfVkFSSUFUSU9OU19VTlNQRUNJRklFRF9WQUxVRV9CVUcgKFBMQVRGT1JN KE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTMwMCkgfHwgKFBM QVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAwMDAp CisjaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykKKyAgICBhdXRvIGRlZmF1bHRWYWx1ZXMgPSBk ZWZhdWx0VmFyaWF0aW9uVmFsdWVzKG9yaWdpbmFsRm9udCk7CisjaWYgV09SS0FST1VORF9DT1JF VEVYVF9WQVJJQVRJT05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworICAgIGFsd2F5c0FkZFZhcmlh dGlvbnMgPSAhZGVmYXVsdFZhbHVlcy5pc0VtcHR5KCk7CisjZW5kaWYKKyNlbmRpZgorCisgICAg aWYgKCFvcmlnaW5hbEZvbnQgfHwgKCFmZWF0dXJlcy5zaXplKCkgJiYgKCFhbHdheXNBZGRWYXJp YXRpb25zICYmIHZhcmlhdGlvbnMuaXNFbXB0eSgpKSAmJiAodGV4dFJlbmRlcmluZ01vZGUgPT0g QXV0b1RleHRSZW5kZXJpbmcpICYmIHZhcmlhbnRTZXR0aW5ncy5pc0FsbE5vcm1hbCgpCiAgICAg ICAgICYmICghZm9udEZhY2VGZWF0dXJlcyB8fCAhZm9udEZhY2VGZWF0dXJlcy0+c2l6ZSgpKSAm JiAoIWZvbnRGYWNlVmFyaWFudFNldHRpbmdzIHx8IGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLT5p c0FsbE5vcm1hbCgpKSkpCiAgICAgICAgIHJldHVybiBvcmlnaW5hbEZvbnQ7CiAKQEAgLTQ2Miwy NiArNDY5LDM3IEBAIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RG b250UmVmIG9yaWdpbmFsRm9udCwgVGV4dFJlbmRlcmluZ01vCiAgICAgICAgIGZlYXR1cmVzVG9C ZUFwcGxpZWQuc2V0KG5ld0ZlYXR1cmUudGFnKCksIG5ld0ZlYXR1cmUudmFsdWUoKSk7CiAKICNp ZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQotICAgIGF1dG8gZGVmYXVsdFZhbHVlcyA9IGRlZmF1 bHRWYXJpYXRpb25WYWx1ZXMob3JpZ2luYWxGb250KTsKLQogICAgIFZhcmlhdGlvbnNNYXAgdmFy aWF0aW9uc1RvQmVBcHBsaWVkOwotICAgIGZvciAoYXV0byYgbmV3VmFyaWF0aW9uIDogdmFyaWF0 aW9ucykgewotICAgICAgICBhdXRvIGl0ZXJhdG9yID0gZGVmYXVsdFZhbHVlcy5maW5kKG5ld1Zh cmlhdGlvbi50YWcoKSk7Ci0gICAgICAgIGlmIChpdGVyYXRvciAhPSBkZWZhdWx0VmFsdWVzLmVu ZCgpKSB7Ci0gICAgICAgICAgICBmbG9hdCB2YWx1ZVRvQXBwbHkgPSBzdGQ6Om1heChzdGQ6Om1p bihuZXdWYXJpYXRpb24udmFsdWUoKSwgaXRlcmF0b3ItPnZhbHVlLm1heGltdW1WYWx1ZSksIGl0 ZXJhdG9yLT52YWx1ZS5taW5pbXVtVmFsdWUpOwogCi0gICAgICAgICAgICAvLyBGSVhNRTogUmVt b3ZlIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzI4NzA3ODIyPiBpcyBmaXhlZAorICAgIGF1dG8gYXBw bHlWYXJpYXRpb25WYWx1ZSA9IFsmXShjb25zdCBGb250VGFnJiB0YWcsIGZsb2F0IHZhbHVlLCBi b29sIGlzRGVmYXVsdFZhbHVlKSB7CisgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgd2hlbiA8cmRh cjovL3Byb2JsZW0vMjg3MDc4MjI+IGlzIGZpeGVkCiAjZGVmaW5lIFdPUktBUk9VTkRfQ09SRVRF WFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRyAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwKSB8fCAoUExBVEZPUk0oSU9TKSAmJiBf X0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkKICNpZiBXT1JLQVJPVU5E X0NPUkVURVhUX1ZBUklBVElPTlNfREVGQVVMVF9WQUxVRV9CVUcKLSAgICAgICAgICAgIGlmICh2 YWx1ZVRvQXBwbHkgPT0gaXRlcmF0b3ItPnZhbHVlLmRlZmF1bHRWYWx1ZSkKLSAgICAgICAgICAg ICAgICB2YWx1ZVRvQXBwbHkgKz0gMC4wMDAxOworICAgICAgICBpZiAoaXNEZWZhdWx0VmFsdWUp CisgICAgICAgICAgICB2YWx1ZSArPSAwLjAwMDE7CiAjZW5kaWYKICN1bmRlZiBXT1JLQVJPVU5E X0NPUkVURVhUX1ZBUklBVElPTlNfREVGQVVMVF9WQUxVRV9CVUcKKyAgICAgICAgdmFyaWF0aW9u c1RvQmVBcHBsaWVkLnNldCh0YWcsIHZhbHVlKTsKKyAgICB9OwogCi0gICAgICAgICAgICB2YXJp YXRpb25zVG9CZUFwcGxpZWQuc2V0KG5ld1ZhcmlhdGlvbi50YWcoKSwgdmFsdWVUb0FwcGx5KTsK LSAgICAgICAgfQorICAgIGZvciAoYXV0byYgbmV3VmFyaWF0aW9uIDogdmFyaWF0aW9ucykgewor ICAgICAgICBhdXRvIGl0ZXJhdG9yID0gZGVmYXVsdFZhbHVlcy5maW5kKG5ld1ZhcmlhdGlvbi50 YWcoKSk7CisgICAgICAgIGlmIChpdGVyYXRvciA9PSBkZWZhdWx0VmFsdWVzLmVuZCgpKQorICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIGZsb2F0IHZhbHVlVG9BcHBseSA9IGNsYW1wVG8o bmV3VmFyaWF0aW9uLnZhbHVlKCksIGl0ZXJhdG9yLT52YWx1ZS5taW5pbXVtVmFsdWUsIGl0ZXJh dG9yLT52YWx1ZS5tYXhpbXVtVmFsdWUpOworICAgICAgICBib29sIGlzRGVmYXVsdFZhbHVlID0g dmFsdWVUb0FwcGx5ID09IGl0ZXJhdG9yLT52YWx1ZS5kZWZhdWx0VmFsdWU7CisgICAgICAgIGFw cGx5VmFyaWF0aW9uVmFsdWUobmV3VmFyaWF0aW9uLnRhZygpLCB2YWx1ZVRvQXBwbHksIGlzRGVm YXVsdFZhbHVlKTsKKyAgICB9CisKKyNpZiBXT1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNf VU5TUEVDSUZJRURfVkFMVUVfQlVHCisgICAgZm9yIChhdXRvJiBkZWZhdWx0VmFsdWUgOiBkZWZh dWx0VmFsdWVzKSB7CisgICAgICAgIGlmICghdmFyaWF0aW9uc1RvQmVBcHBsaWVkLmNvbnRhaW5z KGRlZmF1bHRWYWx1ZS5rZXkpKQorICAgICAgICAgICAgYXBwbHlWYXJpYXRpb25WYWx1ZShkZWZh dWx0VmFsdWUua2V5LCBkZWZhdWx0VmFsdWUudmFsdWUuZGVmYXVsdFZhbHVlLCB0cnVlKTsKICAg ICB9CiAjZW5kaWYKKyN1bmRlZiBXT1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNfVU5TUEVD SUZJRURfVkFMVUVfQlVHCisKKyNlbmRpZiAvLyBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQogCiAg ICAgUmV0YWluUHRyPENGTXV0YWJsZURpY3Rpb25hcnlSZWY+IGF0dHJpYnV0ZXMgPSBhZG9wdENG KENGRGljdGlvbmFyeUNyZWF0ZU11dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMiwgJmtDRlR5 cGVEaWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNr cykpOwogICAgIGlmICghZmVhdHVyZXNUb0JlQXBwbGllZC5pc0VtcHR5KCkpIHsK 298414 2017-01-09 16:37:02 -0800 2017-01-17 18:13:37 -0800 Patch for committing bug-166672-20170109163527.patch text/plain 5638 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWVlNWZlN2RjOGM1NzZj MzdkZDQ5NGI5ZWZmNDgxZmExZmE3ZWMwZS4uNjAwZWUzYjkzMzlhY2QyMWI0MDIwZWFhOTUxZmJk M2U5NDU2N2M4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAxLTA1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBW YXJpYXRpb24gZm9udHMgd2l0aG91dCB2YXJpYXRpb25zIHNwZWNpZmllZCBhcmUgbm90IHJlbmRl cmVkIGFzIGlmIHRoZSBkZWZhdWx0IHZhcmlhdGlvbnMgd2VyZSBzcGVjaWZpZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NjY3MgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjk3NzkxMTk+CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTg0ODg4 Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgQ29yZVRl eHQgaGFzIGEgYnVnICg8cmRhcjovL3Byb2JsZW0vMjk4NTkyMDc+KSB3aGVyZSB2YXJpYXRpb24g Zm9udHMgd2l0aG91dAorICAgICAgICBhIHNwZWNpZmllZCB2YXJpYXRpb24gdmFsdWUgYXJlIHJl bmRlcmVkIGFzIGlmIHRoZSBtaW5pbXVtIHZhbHVlIGlzIHNwZWNpZmllZCwKKyAgICAgICAgcmF0 aGVyIHRoYW4gdGhlIGRlZmF1bHQgdmFsdWUuIFRoZSBzb2x1dGlvbiBpcyB0byBhcHBseSBkZWZh dWx0IHZhbHVlcyB3aGVyZQorICAgICAgICB0aGV5IGFyZSBvbWl0dGVkLgorCisgICAgICAgIFRl c3Q6IGZhc3QvdGV4dC92YXJpYXRpb25zL2FkdmFuY2VzLmh0bWwKKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnByZXBhcmVQbGF0Zm9ybUZvbnQpOgorCiAyMDE3LTAxLTA5ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uZkBnbWFpbC5jb20+CiAKICAgICAgICAgTWVyZ2luZyBUaHJlYWRhYmxlTG9hZGVyIHJl ZHVuZGFudCBvcHRpb25zIG9uIGZpbHRlcmluZyByZXNwb25zZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0 LmNwcAppbmRleCA0MzdjZDdiOWZmMTcwMWVlZjY1NTNlZWM0NDNkYjg2NTAyNGFjMjA3Li5mYTUz ODllMzY5NzFlODkzZTdlNzIwZWNiM2Y0NTI1MjMzZjdjZDM1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRl eHQuY3BwCkBAIC00MjEsNyArNDIxLDE5IEBAIHN0YXRpYyBWYXJpYXRpb25EZWZhdWx0c01hcCBk ZWZhdWx0VmFyaWF0aW9uVmFsdWVzKENURm9udFJlZiBmb250KQogCiBSZXRhaW5QdHI8Q1RGb250 UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIFRleHRSZW5k ZXJpbmdNb2RlIHRleHRSZW5kZXJpbmdNb2RlLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBm b250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlh bnRTZXR0aW5ncywgY29uc3QgRm9udEZlYXR1cmVTZXR0aW5ncyYgZmVhdHVyZXMsIGNvbnN0IEZv bnRWYXJpYW50U2V0dGluZ3MmIHZhcmlhbnRTZXR0aW5ncywgY29uc3QgRm9udFZhcmlhdGlvblNl dHRpbmdzJiB2YXJpYXRpb25zKQogewotICAgIGlmICghb3JpZ2luYWxGb250IHx8ICghZmVhdHVy ZXMuc2l6ZSgpICYmIHZhcmlhdGlvbnMuaXNFbXB0eSgpICYmICh0ZXh0UmVuZGVyaW5nTW9kZSA9 PSBBdXRvVGV4dFJlbmRlcmluZykgJiYgdmFyaWFudFNldHRpbmdzLmlzQWxsTm9ybWFsKCkKKyAg ICBib29sIGFsd2F5c0FkZFZhcmlhdGlvbnMgPSBmYWxzZTsKKworICAgIC8vIEZJWE1FOiBSZW1v dmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vMjk4NTkyMDc+IGlzIGZpeGVkCisjZGVmaW5lIFdPUktB Uk9VTkRfQ09SRVRFWFRfVkFSSUFUSU9OU19VTlNQRUNJRklFRF9WQUxVRV9CVUcgKFBMQVRGT1JN KE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTMwMCkgfHwgKFBM QVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAwMDAp CisjaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykKKyAgICBhdXRvIGRlZmF1bHRWYWx1ZXMgPSBk ZWZhdWx0VmFyaWF0aW9uVmFsdWVzKG9yaWdpbmFsRm9udCk7CisjaWYgV09SS0FST1VORF9DT1JF VEVYVF9WQVJJQVRJT05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworICAgIGJvb2wgaXNTeXN0ZW1G b250ID0gQ1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KGFkb3B0Q0YoQ1RGb250Q29weUZv bnREZXNjcmlwdG9yKG9yaWdpbmFsRm9udCkpLmdldCgpKTsKKyAgICBhbHdheXNBZGRWYXJpYXRp b25zID0gIWlzU3lzdGVtRm9udCAmJiAhZGVmYXVsdFZhbHVlcy5pc0VtcHR5KCk7CisjZW5kaWYK KyNlbmRpZgorCisgICAgaWYgKCFvcmlnaW5hbEZvbnQgfHwgKCFmZWF0dXJlcy5zaXplKCkgJiYg KCFhbHdheXNBZGRWYXJpYXRpb25zICYmIHZhcmlhdGlvbnMuaXNFbXB0eSgpKSAmJiAodGV4dFJl bmRlcmluZ01vZGUgPT0gQXV0b1RleHRSZW5kZXJpbmcpICYmIHZhcmlhbnRTZXR0aW5ncy5pc0Fs bE5vcm1hbCgpCiAgICAgICAgICYmICghZm9udEZhY2VGZWF0dXJlcyB8fCAhZm9udEZhY2VGZWF0 dXJlcy0+c2l6ZSgpKSAmJiAoIWZvbnRGYWNlVmFyaWFudFNldHRpbmdzIHx8IGZvbnRGYWNlVmFy aWFudFNldHRpbmdzLT5pc0FsbE5vcm1hbCgpKSkpCiAgICAgICAgIHJldHVybiBvcmlnaW5hbEZv bnQ7CiAKQEAgLTQ1OCwyNiArNDcwLDM5IEBAIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQ bGF0Zm9ybUZvbnQoQ1RGb250UmVmIG9yaWdpbmFsRm9udCwgVGV4dFJlbmRlcmluZ01vCiAgICAg ICAgIGZlYXR1cmVzVG9CZUFwcGxpZWQuc2V0KG5ld0ZlYXR1cmUudGFnKCksIG5ld0ZlYXR1cmUu dmFsdWUoKSk7CiAKICNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQotICAgIGF1dG8gZGVmYXVs dFZhbHVlcyA9IGRlZmF1bHRWYXJpYXRpb25WYWx1ZXMob3JpZ2luYWxGb250KTsKLQogICAgIFZh cmlhdGlvbnNNYXAgdmFyaWF0aW9uc1RvQmVBcHBsaWVkOwotICAgIGZvciAoYXV0byYgbmV3VmFy aWF0aW9uIDogdmFyaWF0aW9ucykgewotICAgICAgICBhdXRvIGl0ZXJhdG9yID0gZGVmYXVsdFZh bHVlcy5maW5kKG5ld1ZhcmlhdGlvbi50YWcoKSk7Ci0gICAgICAgIGlmIChpdGVyYXRvciAhPSBk ZWZhdWx0VmFsdWVzLmVuZCgpKSB7Ci0gICAgICAgICAgICBmbG9hdCB2YWx1ZVRvQXBwbHkgPSBz dGQ6Om1heChzdGQ6Om1pbihuZXdWYXJpYXRpb24udmFsdWUoKSwgaXRlcmF0b3ItPnZhbHVlLm1h eGltdW1WYWx1ZSksIGl0ZXJhdG9yLT52YWx1ZS5taW5pbXVtVmFsdWUpOwogCi0gICAgICAgICAg ICAvLyBGSVhNRTogUmVtb3ZlIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzI4NzA3ODIyPiBpcyBmaXhl ZAorICAgIGF1dG8gYXBwbHlWYXJpYXRpb25WYWx1ZSA9IFsmXShjb25zdCBGb250VGFnJiB0YWcs IGZsb2F0IHZhbHVlLCBib29sIGlzRGVmYXVsdFZhbHVlKSB7CisgICAgICAgIC8vIEZJWE1FOiBS ZW1vdmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vMjg3MDc4MjI+IGlzIGZpeGVkCiAjZGVmaW5lIFdP UktBUk9VTkRfQ09SRVRFWFRfVkFSSUFUSU9OU19ERUZBVUxUX1ZBTFVFX0JVRyAoUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwKSB8fCAoUExB VEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkK ICNpZiBXT1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNfREVGQVVMVF9WQUxVRV9CVUcKLSAg ICAgICAgICAgIGlmICh2YWx1ZVRvQXBwbHkgPT0gaXRlcmF0b3ItPnZhbHVlLmRlZmF1bHRWYWx1 ZSkKLSAgICAgICAgICAgICAgICB2YWx1ZVRvQXBwbHkgKz0gMC4wMDAxOworICAgICAgICBpZiAo aXNEZWZhdWx0VmFsdWUpCisgICAgICAgICAgICB2YWx1ZSArPSAwLjAwMDE7CisjZWxzZQorICAg ICAgICBVTlVTRURfUEFSQU0oaXNEZWZhdWx0VmFsdWUpOwogI2VuZGlmCiAjdW5kZWYgV09SS0FS T1VORF9DT1JFVEVYVF9WQVJJQVRJT05TX0RFRkFVTFRfVkFMVUVfQlVHCisgICAgICAgIHZhcmlh dGlvbnNUb0JlQXBwbGllZC5zZXQodGFnLCB2YWx1ZSk7CisgICAgfTsKIAotICAgICAgICAgICAg dmFyaWF0aW9uc1RvQmVBcHBsaWVkLnNldChuZXdWYXJpYXRpb24udGFnKCksIHZhbHVlVG9BcHBs eSk7Ci0gICAgICAgIH0KKyAgICBmb3IgKGF1dG8mIG5ld1ZhcmlhdGlvbiA6IHZhcmlhdGlvbnMp IHsKKyAgICAgICAgYXV0byBpdGVyYXRvciA9IGRlZmF1bHRWYWx1ZXMuZmluZChuZXdWYXJpYXRp b24udGFnKCkpOworICAgICAgICBpZiAoaXRlcmF0b3IgPT0gZGVmYXVsdFZhbHVlcy5lbmQoKSkK KyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBmbG9hdCB2YWx1ZVRvQXBwbHkgPSBjbGFt cFRvKG5ld1ZhcmlhdGlvbi52YWx1ZSgpLCBpdGVyYXRvci0+dmFsdWUubWluaW11bVZhbHVlLCBp dGVyYXRvci0+dmFsdWUubWF4aW11bVZhbHVlKTsKKyAgICAgICAgYm9vbCBpc0RlZmF1bHRWYWx1 ZSA9IHZhbHVlVG9BcHBseSA9PSBpdGVyYXRvci0+dmFsdWUuZGVmYXVsdFZhbHVlOworICAgICAg ICBhcHBseVZhcmlhdGlvblZhbHVlKG5ld1ZhcmlhdGlvbi50YWcoKSwgdmFsdWVUb0FwcGx5LCBp c0RlZmF1bHRWYWx1ZSk7CisgICAgfQorCisjaWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJ T05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworICAgIGZvciAoYXV0byYgZGVmYXVsdFZhbHVlIDog ZGVmYXVsdFZhbHVlcykgeworICAgICAgICBpZiAoIXZhcmlhdGlvbnNUb0JlQXBwbGllZC5jb250 YWlucyhkZWZhdWx0VmFsdWUua2V5KSkKKyAgICAgICAgICAgIGFwcGx5VmFyaWF0aW9uVmFsdWUo ZGVmYXVsdFZhbHVlLmtleSwgZGVmYXVsdFZhbHVlLnZhbHVlLmRlZmF1bHRWYWx1ZSwgdHJ1ZSk7 CiAgICAgfQogI2VuZGlmCisjdW5kZWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJT05TX1VO U1BFQ0lGSUVEX1ZBTFVFX0JVRworCisjZW5kaWYgLy8gRU5BQkxFKFZBUklBVElPTl9GT05UUykK IAogICAgIFJldGFpblB0cjxDRk11dGFibGVEaWN0aW9uYXJ5UmVmPiBhdHRyaWJ1dGVzID0gYWRv cHRDRihDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDIsICZr Q0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxs QmFja3MpKTsKICAgICBpZiAoIWZlYXR1cmVzVG9CZUFwcGxpZWQuaXNFbXB0eSgpKSB7Cg== 299099 2017-01-17 18:16:28 -0800 2017-01-17 18:16:28 -0800 Patch for committing bug-166672-20170117181440.patch text/plain 13923 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw MDYxODdiMTdiZmI1YTVjYWI0MDgwZGRjMDg5YWFlMWQ4NTgwMjQwLi5jZmQ0MTBiZDgwZWVjOTdm YzM3ZTQxYjZlZjgxZjYxNGJhNTRiZmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxNy0wMS0xNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBw bGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVmFyaWF0aW9uIGZvbnRzIHdpdGhvdXQgdmFyaWF0 aW9ucyBzcGVjaWZpZWQgYXJlIG5vdCByZW5kZXJlZCBhcyBpZiB0aGUgZGVmYXVsdCB2YXJpYXRp b25zIHdlcmUgc3BlY2lmaWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjY2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisK KyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2NvbmZpZzoKKwogMjAx Ny0wMS0xNyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGwgb3V0IGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIxMDgyMQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IGZiNzgxZTc2YTNhMmJiNzkwNWQyOGUyYjgzYzEyZjk4Yjc2MjE5ZTkuLjI0 MTQwZmFkYzAyMTJmOWRlOGUzNDNkNGQ3MjYwMmViNTM2OGE3ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0wMS0xNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBw bGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVmFyaWF0aW9uIGZvbnRzIHdpdGhvdXQgdmFyaWF0 aW9ucyBzcGVjaWZpZWQgYXJlIG5vdCByZW5kZXJlZCBhcyBpZiB0aGUgZGVmYXVsdCB2YXJpYXRp b25zIHdlcmUgc3BlY2lmaWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjY2NzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5Nzc5MTE5PgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMjk4NDg4ODM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lt b24gRnJhc2VyLgorCisgICAgICAgIENvcmVUZXh0IGhhcyBhIGJ1ZyAoPHJkYXI6Ly9wcm9ibGVt LzI5ODU5MjA3Pikgd2hlcmUgdmFyaWF0aW9uIGZvbnRzIHdpdGhvdXQKKyAgICAgICAgYSBzcGVj aWZpZWQgdmFyaWF0aW9uIHZhbHVlIGFyZSByZW5kZXJlZCBhcyBpZiB0aGUgbWluaW11bSB2YWx1 ZSBpcyBzcGVjaWZpZWQsCisgICAgICAgIHJhdGhlciB0aGFuIHRoZSBkZWZhdWx0IHZhbHVlLiBU aGUgc29sdXRpb24gaXMgdG8gYXBwbHkgZGVmYXVsdCB2YWx1ZXMgd2hlcmUKKyAgICAgICAgdGhl eSBhcmUgb21pdHRlZC4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvdmFyaWF0aW9ucy9hZHZh bmNlcy5odG1sCisKKyAgICAgICAgKiBDb25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2Nv bmZpZzoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkZWZhdWx0VmFyaWF0aW9uVmFsdWVzKToKKyAgICAg ICAgKFdlYkNvcmU6OmZvbnRJc1N5c3RlbUZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6cHJlcGFy ZVBsYXRmb3JtRm9udCk6CisKIDIwMTctMDEtMTcgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsIG91dCBodHRwOi8vdHJhYy53ZWJraXQu b3JnL2NoYW5nZXNldC8yMTA4MjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA2ZWQ4NDI0NmNkYjhkOWU2 OWFkNWZlOTI4NTRmYzlkNTk4NjFlNTY3Li4xMDkyNDRkMzFlZjhjNDg1MTUyMjQyNzNjMjIwNmY4 MTc4Yjg3MGNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTctMDEtMTcg IE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29j b2FdIFZhcmlhdGlvbiBmb250cyB3aXRob3V0IHZhcmlhdGlvbnMgc3BlY2lmaWVkIGFyZSBub3Qg cmVuZGVyZWQgYXMgaWYgdGhlIGRlZmF1bHQgdmFyaWF0aW9ucyB3ZXJlIHNwZWNpZmllZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY2NjcyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICogQ29uZmlndXJhdGlv bnMvRmVhdHVyZURlZmluZXMueGNjb25maWc6CisKIDIwMTctMDEtMTcgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB3aGVuIGNsb3NpbmcgdGFi IHdpdGggZGVidWdnZXIgcGF1c2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmJmNDVlMTU1Y2E4YmI3ODJmNmU3 MzIyMmRhNTQwMWE1YzdlMzViYy4uZWQ0MmUwOWVhYTkxNTA1NzIwMzNhNzE5NzNiZWI2MDc3YzA5 MjlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTAxLTE3ICBNeWxlcyBDLiBN YXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBWYXJpYXRp b24gZm9udHMgd2l0aG91dCB2YXJpYXRpb25zIHNwZWNpZmllZCBhcmUgbm90IHJlbmRlcmVkIGFz IGlmIHRoZSBkZWZhdWx0IHZhcmlhdGlvbnMgd2VyZSBzcGVjaWZpZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NjY3MgorCisgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICAqIENvbmZpZ3VyYXRpb25zL0ZlYXR1cmVE ZWZpbmVzLnhjY29uZmlnOgorCiAyMDE3LTAxLTE3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CiAKICAgICAgICAgSXQncyBub3QgcG9zc2libGUgdG8gcGVyZm9ybSBhIFBP U1QgcmVxdWVzdCB3aXRoIEhUVFBCb2R5IGNvbnRlbnQgaW4gYSBXS1dlYlZpZXcKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54 Y2NvbmZpZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Db25maWd1cmF0aW9ucy9GZWF0dXJlRGVm aW5lcy54Y2NvbmZpZwppbmRleCAzNWEzYjljYjk1OWUxZDAwNTEwNWU0MjY3YjJhNTEzNWU2MGU2 NjY1Li4wYjdjZjU0NWZkMDQ5MWUzYjdmMmZmZmVlMjNiMDI3ZGJlMTM3ZGI1IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ29uZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNj b25maWcKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVE ZWZpbmVzLnhjY29uZmlnCkBAIC0yMDQsNyArMjA0LDcgQEAgRU5BQkxFX1hTTFQgPSBFTkFCTEVf WFNMVDsKIEVOQUJMRV9GVExfSklUW3Nkaz1tYWNvc3gqXSA9IEVOQUJMRV9GVExfSklUOwogRU5B QkxFX0ZUTF9KSVRbc2RrPWlwaG9uZW9zKl0gPSBFTkFCTEVfRlRMX0pJVDsKIAotRU5BQkxFX1ZB UklBVElPTl9GT05UU1tzZGs9ZW1iZWRkZWQqXSA9ICQoRU5BQkxFX1ZBUklBVElPTl9GT05UU18k KFBMQVRGT1JNX05BTUUpKTsKK0VOQUJMRV9WQVJJQVRJT05fRk9OVFNbc2RrPWlwaG9uZSpdID0g JChFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTXyQoUExBVEZPUk1fTkFNRSkpOwogRU5BQkxFX1ZBUklB VElPTl9GT05UU19pcGhvbmVvcyA9IEVOQUJMRV9WQVJJQVRJT05fRk9OVFM7CiBFTkFCTEVfVkFS SUFUSU9OX0ZPTlRTX2lwaG9uZXNpbXVsYXRvciA9IEVOQUJMRV9WQVJJQVRJT05fRk9OVFM7CiBF TkFCTEVfVkFSSUFUSU9OX0ZPTlRTW3Nkaz1pcGhvbmVvczkqXSA9IDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29uZmlnIGIvU291 cmNlL1dlYkNvcmUvQ29uZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWcKaW5kZXgg MzVhM2I5Y2I5NTllMWQwMDUxMDVlNDI2N2IyYTUxMzVlNjBlNjY2NS4uMGI3Y2Y1NDVmZDA0OTFl M2I3ZjJmZmZlZTIzYjAyN2RiZTEzN2RiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ29u ZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWcKKysrIGIvU291cmNlL1dlYkNvcmUv Q29uZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWcKQEAgLTIwNCw3ICsyMDQsNyBA QCBFTkFCTEVfWFNMVCA9IEVOQUJMRV9YU0xUOwogRU5BQkxFX0ZUTF9KSVRbc2RrPW1hY29zeCpd ID0gRU5BQkxFX0ZUTF9KSVQ7CiBFTkFCTEVfRlRMX0pJVFtzZGs9aXBob25lb3MqXSA9IEVOQUJM RV9GVExfSklUOwogCi1FTkFCTEVfVkFSSUFUSU9OX0ZPTlRTW3Nkaz1lbWJlZGRlZCpdID0gJChF TkFCTEVfVkFSSUFUSU9OX0ZPTlRTXyQoUExBVEZPUk1fTkFNRSkpOworRU5BQkxFX1ZBUklBVElP Tl9GT05UU1tzZGs9aXBob25lKl0gPSAkKEVOQUJMRV9WQVJJQVRJT05fRk9OVFNfJChQTEFURk9S TV9OQU1FKSk7CiBFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTX2lwaG9uZW9zID0gRU5BQkxFX1ZBUklB VElPTl9GT05UUzsKIEVOQUJMRV9WQVJJQVRJT05fRk9OVFNfaXBob25lc2ltdWxhdG9yID0gRU5B QkxFX1ZBUklBVElPTl9GT05UUzsKIEVOQUJMRV9WQVJJQVRJT05fRk9OVFNbc2RrPWlwaG9uZW9z OSpdID0gOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j b2EvRm9udENhY2hlQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCmluZGV4IDEzOGVmYWYxMDY3MWQ5ODAwMmE3 OWJkOTlmZmFlYjc3YTUzNzcyYWQuLmY1MWYwYWIxY2I5ODBhNWY2NGIwMTQxNDQ5NjA4MjI1MjIy ZWZmOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKQEAgLTM5Niw3ICszOTYsNyBAQCBzdGF0 aWMgVmFyaWF0aW9uRGVmYXVsdHNNYXAgZGVmYXVsdFZhcmlhdGlvblZhbHVlcyhDVEZvbnRSZWYg Zm9udCkKICAgICAgICAgQ0ZOdW1iZXJHZXRWYWx1ZShtYXhpbXVtVmFsdWUsIGtDRk51bWJlckZs b2F0VHlwZSwgJnJhd01heGltdW1WYWx1ZSk7CiAKICAgICAgICAgLy8gRklYTUU6IFJlbW92ZSB3 aGVuIDxyZGFyOi8vcHJvYmxlbS8yODg5MzgzNj4gaXMgZml4ZWQKLSNkZWZpbmUgV09SS0FST1VO RF9DT1JFVEVYVF9WQVJJQVRJT05TX0VYVEVOVFNfQlVHIChQTEFURk9STShNQUMpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEzMDApIHx8IChQTEFURk9STShJT1MpICYm IF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTEwMDAwKQorI2RlZmluZSBXT1JL QVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNfRVhURU5UU19CVUcgKChQTEFURk9STShNQUMpICYm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEzMDApIHx8IChQTEFURk9STShJ T1MpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTEwMDAwKSkKICNpZiBX T1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNfRVhURU5UU19CVUcKICAgICAgICAgZmxvYXQg ZXBzaWxvbiA9IDAuMDAxOwogICAgICAgICByYXdNaW5pbXVtVmFsdWUgKz0gZXBzaWxvbjsKQEAg LTQxOSw5ICs0MTksMzAgQEAgc3RhdGljIFZhcmlhdGlvbkRlZmF1bHRzTWFwIGRlZmF1bHRWYXJp YXRpb25WYWx1ZXMoQ1RGb250UmVmIGZvbnQpCiB9CiAjZW5kaWYKIAorI2RlZmluZSBXT1JLQVJP VU5EX0NPUkVURVhUX1ZBUklBVElPTlNfVU5TUEVDSUZJRURfVkFMVUVfQlVHICgoUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMzAwKSB8fCAoUExB VEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDExMDAwMCkp CisjaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykgJiYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJ QVRJT05TX1VOU1BFQ0lGSUVEX1ZBTFVFX0JVRworc3RhdGljIGlubGluZSBib29sIGZvbnRJc1N5 c3RlbUZvbnQoQ1RGb250UmVmIGZvbnQpCit7CisgICAgaWYgKENURm9udERlc2NyaXB0b3JJc1N5 c3RlbVVJRm9udChhZG9wdENGKENURm9udENvcHlGb250RGVzY3JpcHRvcihmb250KSkuZ2V0KCkp KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBhdXRvIG5hbWUgPSBhZG9wdENGKENURm9udENv cHlQb3N0U2NyaXB0TmFtZShmb250KSk7CisgICAgcmV0dXJuIENGU3RyaW5nR2V0TGVuZ3RoKG5h bWUuZ2V0KCkpID4gMCAmJiBDRlN0cmluZ0dldENoYXJhY3RlckF0SW5kZXgobmFtZS5nZXQoKSwg MCkgPT0gJy4nOworfQorI2VuZGlmCisKIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0 Zm9ybUZvbnQoQ1RGb250UmVmIG9yaWdpbmFsRm9udCwgVGV4dFJlbmRlcmluZ01vZGUgdGV4dFJl bmRlcmluZ01vZGUsIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MqIGZvbnRGYWNlRmVhdHVyZXMs IGNvbnN0IEZvbnRWYXJpYW50U2V0dGluZ3MqIGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLCBjb25z dCBGb250RmVhdHVyZVNldHRpbmdzJiBmZWF0dXJlcywgY29uc3QgRm9udFZhcmlhbnRTZXR0aW5n cyYgdmFyaWFudFNldHRpbmdzLCBjb25zdCBGb250VmFyaWF0aW9uU2V0dGluZ3MmIHZhcmlhdGlv bnMpCiB7Ci0gICAgaWYgKCFvcmlnaW5hbEZvbnQgfHwgKCFmZWF0dXJlcy5zaXplKCkgJiYgdmFy aWF0aW9ucy5pc0VtcHR5KCkgJiYgKHRleHRSZW5kZXJpbmdNb2RlID09IEF1dG9UZXh0UmVuZGVy aW5nKSAmJiB2YXJpYW50U2V0dGluZ3MuaXNBbGxOb3JtYWwoKQorICAgIGJvb2wgYWx3YXlzQWRk VmFyaWF0aW9ucyA9IGZhbHNlOworCisgICAgLy8gRklYTUU6IFJlbW92ZSB3aGVuIDxyZGFyOi8v cHJvYmxlbS8yOTg1OTIwNz4gaXMgZml4ZWQKKyNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQor ICAgIGF1dG8gZGVmYXVsdFZhbHVlcyA9IGRlZmF1bHRWYXJpYXRpb25WYWx1ZXMob3JpZ2luYWxG b250KTsKKyNpZiBXT1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNfVU5TUEVDSUZJRURfVkFM VUVfQlVHCisgICAgYWx3YXlzQWRkVmFyaWF0aW9ucyA9ICFkZWZhdWx0VmFsdWVzLmlzRW1wdHko KTsKKyNlbmRpZgorI2VuZGlmCisKKyAgICBpZiAoIW9yaWdpbmFsRm9udCB8fCAoIWZlYXR1cmVz LnNpemUoKSAmJiAoIWFsd2F5c0FkZFZhcmlhdGlvbnMgJiYgdmFyaWF0aW9ucy5pc0VtcHR5KCkp ICYmICh0ZXh0UmVuZGVyaW5nTW9kZSA9PSBBdXRvVGV4dFJlbmRlcmluZykgJiYgdmFyaWFudFNl dHRpbmdzLmlzQWxsTm9ybWFsKCkKICAgICAgICAgJiYgKCFmb250RmFjZUZlYXR1cmVzIHx8ICFm b250RmFjZUZlYXR1cmVzLT5zaXplKCkpICYmICghZm9udEZhY2VWYXJpYW50U2V0dGluZ3MgfHwg Zm9udEZhY2VWYXJpYW50U2V0dGluZ3MtPmlzQWxsTm9ybWFsKCkpKSkKICAgICAgICAgcmV0dXJu IG9yaWdpbmFsRm9udDsKIApAQCAtNDU4LDI2ICs0NzksNDEgQEAgUmV0YWluUHRyPENURm9udFJl Zj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZvbnRSZWYgb3JpZ2luYWxGb250LCBUZXh0UmVuZGVy aW5nTW8KICAgICAgICAgZmVhdHVyZXNUb0JlQXBwbGllZC5zZXQobmV3RmVhdHVyZS50YWcoKSwg bmV3RmVhdHVyZS52YWx1ZSgpKTsKIAogI2lmIEVOQUJMRShWQVJJQVRJT05fRk9OVFMpCi0gICAg YXV0byBkZWZhdWx0VmFsdWVzID0gZGVmYXVsdFZhcmlhdGlvblZhbHVlcyhvcmlnaW5hbEZvbnQp OwotCiAgICAgVmFyaWF0aW9uc01hcCB2YXJpYXRpb25zVG9CZUFwcGxpZWQ7Ci0gICAgZm9yIChh dXRvJiBuZXdWYXJpYXRpb24gOiB2YXJpYXRpb25zKSB7Ci0gICAgICAgIGF1dG8gaXRlcmF0b3Ig PSBkZWZhdWx0VmFsdWVzLmZpbmQobmV3VmFyaWF0aW9uLnRhZygpKTsKLSAgICAgICAgaWYgKGl0 ZXJhdG9yICE9IGRlZmF1bHRWYWx1ZXMuZW5kKCkpIHsKLSAgICAgICAgICAgIGZsb2F0IHZhbHVl VG9BcHBseSA9IHN0ZDo6bWF4KHN0ZDo6bWluKG5ld1ZhcmlhdGlvbi52YWx1ZSgpLCBpdGVyYXRv ci0+dmFsdWUubWF4aW11bVZhbHVlKSwgaXRlcmF0b3ItPnZhbHVlLm1pbmltdW1WYWx1ZSk7CiAK LSAgICAgICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgd2hlbiA8cmRhcjovL3Byb2JsZW0vMjg3MDc4 MjI+IGlzIGZpeGVkCi0jZGVmaW5lIFdPUktBUk9VTkRfQ09SRVRFWFRfVkFSSUFUSU9OU19ERUZB VUxUX1ZBTFVFX0JVRyAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEIDwgMTAxMzAwKSB8fCAoUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9O X01JTl9SRVFVSVJFRCA8IDExMDAwMCkKKyAgICBhdXRvIGFwcGx5VmFyaWF0aW9uVmFsdWUgPSBb Jl0oY29uc3QgRm9udFRhZyYgdGFnLCBmbG9hdCB2YWx1ZSwgYm9vbCBpc0RlZmF1bHRWYWx1ZSkg eworICAgICAgICAvLyBGSVhNRTogUmVtb3ZlIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzI4NzA3ODIy PiBpcyBmaXhlZAorI2RlZmluZSBXT1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElPTlNfREVGQVVM VF9WQUxVRV9CVUcgKChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR VUlSRUQgPCAxMDEzMDApIHx8IChQTEFURk9STShJT1MpICYmIF9fSVBIT05FX09TX1ZFUlNJT05f TUlOX1JFUVVJUkVEIDwgMTEwMDAwKSkKICNpZiBXT1JLQVJPVU5EX0NPUkVURVhUX1ZBUklBVElP TlNfREVGQVVMVF9WQUxVRV9CVUcKLSAgICAgICAgICAgIGlmICh2YWx1ZVRvQXBwbHkgPT0gaXRl cmF0b3ItPnZhbHVlLmRlZmF1bHRWYWx1ZSkKLSAgICAgICAgICAgICAgICB2YWx1ZVRvQXBwbHkg Kz0gMC4wMDAxOworICAgICAgICBpZiAoaXNEZWZhdWx0VmFsdWUpCisgICAgICAgICAgICB2YWx1 ZSArPSAwLjAwMDE7CisjZWxzZQorICAgICAgICBVTlVTRURfUEFSQU0oaXNEZWZhdWx0VmFsdWUp OwogI2VuZGlmCiAjdW5kZWYgV09SS0FST1VORF9DT1JFVEVYVF9WQVJJQVRJT05TX0RFRkFVTFRf VkFMVUVfQlVHCisgICAgICAgIHZhcmlhdGlvbnNUb0JlQXBwbGllZC5zZXQodGFnLCB2YWx1ZSk7 CisgICAgfTsKIAotICAgICAgICAgICAgdmFyaWF0aW9uc1RvQmVBcHBsaWVkLnNldChuZXdWYXJp YXRpb24udGFnKCksIHZhbHVlVG9BcHBseSk7CisgICAgZm9yIChhdXRvJiBuZXdWYXJpYXRpb24g OiB2YXJpYXRpb25zKSB7CisgICAgICAgIGF1dG8gaXRlcmF0b3IgPSBkZWZhdWx0VmFsdWVzLmZp bmQobmV3VmFyaWF0aW9uLnRhZygpKTsKKyAgICAgICAgaWYgKGl0ZXJhdG9yID09IGRlZmF1bHRW YWx1ZXMuZW5kKCkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgZmxvYXQgdmFsdWVU b0FwcGx5ID0gY2xhbXBUbyhuZXdWYXJpYXRpb24udmFsdWUoKSwgaXRlcmF0b3ItPnZhbHVlLm1p bmltdW1WYWx1ZSwgaXRlcmF0b3ItPnZhbHVlLm1heGltdW1WYWx1ZSk7CisgICAgICAgIGJvb2wg aXNEZWZhdWx0VmFsdWUgPSB2YWx1ZVRvQXBwbHkgPT0gaXRlcmF0b3ItPnZhbHVlLmRlZmF1bHRW YWx1ZTsKKyAgICAgICAgYXBwbHlWYXJpYXRpb25WYWx1ZShuZXdWYXJpYXRpb24udGFnKCksIHZh bHVlVG9BcHBseSwgaXNEZWZhdWx0VmFsdWUpOworICAgIH0KKworI2lmIFdPUktBUk9VTkRfQ09S RVRFWFRfVkFSSUFUSU9OU19VTlNQRUNJRklFRF9WQUxVRV9CVUcKKyAgICBpZiAoIWZvbnRJc1N5 c3RlbUZvbnQob3JpZ2luYWxGb250KSkgeworICAgICAgICBmb3IgKGF1dG8mIGRlZmF1bHRWYWx1 ZSA6IGRlZmF1bHRWYWx1ZXMpIHsKKyAgICAgICAgICAgIGlmICghdmFyaWF0aW9uc1RvQmVBcHBs aWVkLmNvbnRhaW5zKGRlZmF1bHRWYWx1ZS5rZXkpKQorICAgICAgICAgICAgICAgIGFwcGx5VmFy aWF0aW9uVmFsdWUoZGVmYXVsdFZhbHVlLmtleSwgZGVmYXVsdFZhbHVlLnZhbHVlLmRlZmF1bHRW YWx1ZSwgdHJ1ZSk7CiAgICAgICAgIH0KICAgICB9CiAjZW5kaWYKKyN1bmRlZiBXT1JLQVJPVU5E X0NPUkVURVhUX1ZBUklBVElPTlNfVU5TUEVDSUZJRURfVkFMVUVfQlVHCisKKyNlbmRpZiAvLyBF TkFCTEUoVkFSSUFUSU9OX0ZPTlRTKQogCiAgICAgYXV0byBhdHRyaWJ1dGVzID0gYWRvcHRDRihD RkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRvckRlZmF1bHQsIDIsICZrQ0ZUeXBl RGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3Mp KTsKICAgICBpZiAoIWZlYXR1cmVzVG9CZUFwcGxpZWQuaXNFbXB0eSgpKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9Db25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2NvbmZp ZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29u ZmlnCmluZGV4IDM1YTNiOWNiOTU5ZTFkMDA1MTA1ZTQyNjdiMmE1MTM1ZTYwZTY2NjUuLjBiN2Nm NTQ1ZmQwNDkxZTNiN2YyZmZmZWUyM2IwMjdkYmUxMzdkYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvbWFjL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29uZmlnCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29uZmlnCkBA IC0yMDQsNyArMjA0LDcgQEAgRU5BQkxFX1hTTFQgPSBFTkFCTEVfWFNMVDsKIEVOQUJMRV9GVExf SklUW3Nkaz1tYWNvc3gqXSA9IEVOQUJMRV9GVExfSklUOwogRU5BQkxFX0ZUTF9KSVRbc2RrPWlw aG9uZW9zKl0gPSBFTkFCTEVfRlRMX0pJVDsKIAotRU5BQkxFX1ZBUklBVElPTl9GT05UU1tzZGs9 ZW1iZWRkZWQqXSA9ICQoRU5BQkxFX1ZBUklBVElPTl9GT05UU18kKFBMQVRGT1JNX05BTUUpKTsK K0VOQUJMRV9WQVJJQVRJT05fRk9OVFNbc2RrPWlwaG9uZSpdID0gJChFTkFCTEVfVkFSSUFUSU9O X0ZPTlRTXyQoUExBVEZPUk1fTkFNRSkpOwogRU5BQkxFX1ZBUklBVElPTl9GT05UU19pcGhvbmVv cyA9IEVOQUJMRV9WQVJJQVRJT05fRk9OVFM7CiBFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTX2lwaG9u ZXNpbXVsYXRvciA9IEVOQUJMRV9WQVJJQVRJT05fRk9OVFM7CiBFTkFCTEVfVkFSSUFUSU9OX0ZP TlRTW3Nkaz1pcGhvbmVvczkqXSA9IDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NvbmZp Z3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29uZmlnIGIvU291cmNlL1dlYktpdDIvQ29uZmln dXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWcKaW5kZXggMzVhM2I5Y2I5NTllMWQwMDUx MDVlNDI2N2IyYTUxMzVlNjBlNjY2NS4uMGI3Y2Y1NDVmZDA0OTFlM2I3ZjJmZmZlZTIzYjAyN2Ri ZTEzN2RiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlvbnMvRmVhdHVy ZURlZmluZXMueGNjb25maWcKKysrIGIvU291cmNlL1dlYktpdDIvQ29uZmlndXJhdGlvbnMvRmVh dHVyZURlZmluZXMueGNjb25maWcKQEAgLTIwNCw3ICsyMDQsNyBAQCBFTkFCTEVfWFNMVCA9IEVO QUJMRV9YU0xUOwogRU5BQkxFX0ZUTF9KSVRbc2RrPW1hY29zeCpdID0gRU5BQkxFX0ZUTF9KSVQ7 CiBFTkFCTEVfRlRMX0pJVFtzZGs9aXBob25lb3MqXSA9IEVOQUJMRV9GVExfSklUOwogCi1FTkFC TEVfVkFSSUFUSU9OX0ZPTlRTW3Nkaz1lbWJlZGRlZCpdID0gJChFTkFCTEVfVkFSSUFUSU9OX0ZP TlRTXyQoUExBVEZPUk1fTkFNRSkpOworRU5BQkxFX1ZBUklBVElPTl9GT05UU1tzZGs9aXBob25l Kl0gPSAkKEVOQUJMRV9WQVJJQVRJT05fRk9OVFNfJChQTEFURk9STV9OQU1FKSk7CiBFTkFCTEVf VkFSSUFUSU9OX0ZPTlRTX2lwaG9uZW9zID0gRU5BQkxFX1ZBUklBVElPTl9GT05UUzsKIEVOQUJM RV9WQVJJQVRJT05fRk9OVFNfaXBob25lc2ltdWxhdG9yID0gRU5BQkxFX1ZBUklBVElPTl9GT05U UzsKIEVOQUJMRV9WQVJJQVRJT05fRk9OVFNbc2RrPWlwaG9uZW9zOSpdID0gOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGMxZThjNWQxOTk4YmFj YjlmOTI4MTBhODc1MDQ3OTY3NjljMzVmZDQuLmJhNDRjY2ZjMjU3MDM1NmVmMTA0NjRmZTQ4ODY5 NjViMWUyMjkxY2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxNy0wMS0xNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt bWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVmFyaWF0aW9uIGZvbnRzIHdp dGhvdXQgdmFyaWF0aW9ucyBzcGVjaWZpZWQgYXJlIG5vdCByZW5kZXJlZCBhcyBpZiB0aGUgZGVm YXVsdCB2YXJpYXRpb25zIHdlcmUgc3BlY2lmaWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjY2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBGcmFzZXIuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL0ZlYXR1 cmVEZWZpbmVzLnhjY29uZmlnOgorCiAyMDE3LTAxLTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVk YXJkQGFwcGxlLmNvbT4KIAogICAgICAgICAnd2Via2l0LXBhdGNoIHBvc3QnIG5vIGxvbmdlciB3 b3JrcyB3aXRoIG1vdmVkL2NvcGllZCBmaWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9Db25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2NvbmZpZyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMvRmVhdHVyZURlZmluZXMueGNjb25maWcKaW5kZXggMzVh M2I5Y2I5NTllMWQwMDUxMDVlNDI2N2IyYTUxMzVlNjBlNjY2NS4uMGI3Y2Y1NDVmZDA0OTFlM2I3 ZjJmZmZlZTIzYjAyN2RiZTEzN2RiNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9D b25maWd1cmF0aW9ucy9GZWF0dXJlRGVmaW5lcy54Y2NvbmZpZworKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL0NvbmZpZ3VyYXRpb25zL0ZlYXR1cmVEZWZpbmVzLnhjY29uZmlnCkBAIC0yMDQsNyAr MjA0LDcgQEAgRU5BQkxFX1hTTFQgPSBFTkFCTEVfWFNMVDsKIEVOQUJMRV9GVExfSklUW3Nkaz1t YWNvc3gqXSA9IEVOQUJMRV9GVExfSklUOwogRU5BQkxFX0ZUTF9KSVRbc2RrPWlwaG9uZW9zKl0g PSBFTkFCTEVfRlRMX0pJVDsKIAotRU5BQkxFX1ZBUklBVElPTl9GT05UU1tzZGs9ZW1iZWRkZWQq XSA9ICQoRU5BQkxFX1ZBUklBVElPTl9GT05UU18kKFBMQVRGT1JNX05BTUUpKTsKK0VOQUJMRV9W QVJJQVRJT05fRk9OVFNbc2RrPWlwaG9uZSpdID0gJChFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTXyQo UExBVEZPUk1fTkFNRSkpOwogRU5BQkxFX1ZBUklBVElPTl9GT05UU19pcGhvbmVvcyA9IEVOQUJM RV9WQVJJQVRJT05fRk9OVFM7CiBFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTX2lwaG9uZXNpbXVsYXRv ciA9IEVOQUJMRV9WQVJJQVRJT05fRk9OVFM7CiBFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTW3Nkaz1p cGhvbmVvczkqXSA9IDsK