<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>174079</bug_id>
          
          <creation_ts>2017-07-02 13:13:38 -0700</creation_ts>
          <short_desc>REGRESSION(Variation Fonts): Specifying Skia by PostScript name does not yield the expected result</short_desc>
          <delta_ts>2017-07-03 15:47:32 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Myles C. Maxfield">mmaxfield</reporter>
          <assigned_to name="Myles C. Maxfield">mmaxfield</assigned_to>
          <cc>achristensen</cc>
    
    <cc>dino</cc>
    
    <cc>jonlee</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1324953</commentid>
    <comment_count>0</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-02 13:13:38 -0700</bug_when>
    <thetext>REGRESSION(Variation Fonts): Specifying Skia by PostScript name does not yield the expected result</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324957</commentid>
    <comment_count>1</comment_count>
      <attachid>314423</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-02 13:18:53 -0700</bug_when>
    <thetext>Created attachment 314423
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324958</commentid>
    <comment_count>2</comment_count>
      <attachid>314424</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-02 13:23:50 -0700</bug_when>
    <thetext>Created attachment 314424
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324963</commentid>
    <comment_count>3</comment_count>
      <attachid>314427</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-02 14:22:22 -0700</bug_when>
    <thetext>Created attachment 314427
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1324964</commentid>
    <comment_count>4</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-02 14:23:19 -0700</bug_when>
    <thetext>&lt;rdar://problem/33040854&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1325282</commentid>
    <comment_count>5</comment_count>
      <attachid>314427</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2017-07-03 15:06:09 -0700</bug_when>
    <thetext>Comment on attachment 314427
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=314427&amp;action=review

&gt; Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp:1165
&gt; +        return { adoptCF(CTFontCreateWithFontDescriptor(installedFont-&gt;fontDescriptor.get(), size, nullptr)), false };

This false is unnecessary.  Does it help with readability?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1325296</commentid>
    <comment_count>6</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-03 15:46:33 -0700</bug_when>
    <thetext>Committed r219102: &lt;http://trac.webkit.org/changeset/219102&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1325297</commentid>
    <comment_count>7</comment_count>
      <attachid>314427</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2017-07-03 15:47:32 -0700</bug_when>
    <thetext>Comment on attachment 314427
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=314427&amp;action=review

&gt;&gt; Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp:1165
&gt;&gt; +        return { adoptCF(CTFontCreateWithFontDescriptor(installedFont-&gt;fontDescriptor.get(), size, nullptr)), false };
&gt; 
&gt; This false is unnecessary.  Does it help with readability?

Yeah. In the other cases it doesn&apos;t matter, but in this case, it&apos;s explicitly necessary.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314423</attachid>
            <date>2017-07-02 13:18:53 -0700</date>
            <delta_ts>2017-07-02 13:23:48 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-174079-20170702131853.patch</filename>
            <type>text/plain</type>
            <size>10556</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzczZGVmYTVlODdiZGQx
ZTdhMjUyYTUwZWQ4M2U1OWQxMmZlZDhmMi4uNjU5YzdmOGVlNmQxNTg1NjA3YjBjYjUzOTQxZWY4
Y2MyNzk4OTJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA3LTAyICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP
TihWYXJpYXRpb24gRm9udHMpOiBTcGVjaWZ5aW5nIFNraWEgYnkgUG9zdFNjcmlwdCBuYW1lIGRv
ZXMgbm90IHlpZWxkIHRoZSBleHBlY3RlZCByZXN1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDA3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v
MzMwNDA4NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQmVjYXVzZSBTa2lhIGlzIGEgdmFyaWF0aW9uIGZvbnQsIGl0cyBQb3N0U2NyaXB0IG5hbWUg
Y29udGFpbnMgdmFsdWVzIHRvIGFwcGx5IHRvIGl0cyB2YXJpYXRpb24KKyAgICAgICAgYXhlcy4g
SG93ZXZlciwgV2ViS2l0J3MgdmFyaWF0aW9uIGNvZGUgd2FzIG92ZXJ3cml0aW5nIHRoZXNlIGlu
dHJpbnNpdmUgdmFsdWVzIHdpdGggb25lcyBzcGVjaWZpZWQKKyAgICAgICAgYnkgQ1NTLiBUaGVy
ZWZvcmUsIHRoZSBpbnRyaW5zaWMgb25lcyB3ZXJlIGJlaW5nIGlnbm9yZWQuIFRoZSBzb2x1dGlv
biBpcyBqdXN0IHRvIHBhc3MgYSBmbGFnIGZyb20KKyAgICAgICAgdGhlIGxvb2t1cCBjb2RlIHRv
IHRoZSB2YXJpYXRpb25zIGNvZGUgZGVzY3JpYmluZyBpZiB0aGUgZm9udCB3YXMgY3JlYXRlZCB2
aWEgYSBQb3N0U2NyaXB0IG5hbWUsCisgICAgICAgIGFuZCB0byBub3QgYXBwbHkgdGhlIENTUyBw
cm9wZXJ0aWVzIHRvIGl0IGlmIGl0IHdhcy4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvdmFy
aWF0aW9ucy9za2lhLXBvc3RzY3JpcHQtbmFtZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n
cmFwaGljcy9Gb250Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G
b250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmVwYXJlUGxhdGZvcm1G
b250KToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3JtRm9udExvb2t1cFdpdGhGYW1pbHkpOgor
ICAgICAgICAoV2ViQ29yZTo6Zm9udFdpdGhGYW1pbHkpOgorCiAyMDE3LTA2LTI5ICBTYWlkIEFi
b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgQXN5bmMgaW1h
Z2UgZGVjb2Rpbmcgc2hvdWxkIGJlIGRpc2FibGVkIGZvciBpQm9va3Mgb24gdHZPUwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRleCA3YjJmMTg2NDU1
NzEyZDBmNDNjNjFmMjMwNzA3MzhiYzYwNTU3YjM1Li44ZTcyNzQxYTQwYzA2MzMwYWE4YzVkN2Qw
YzEyODNlYmE2YWFkMjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9Gb250Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G
b250Q2FjaGUuaApAQCAtMjgxLDcgKzI4MSw3IEBAIHN0cnVjdCBTeW50aGVzaXNQYWlyIHsKICAg
ICBib29sIG5lZWRzU3ludGhldGljT2JsaXF1ZTsKIH07CiAKLVJldGFpblB0cjxDVEZvbnRSZWY+
IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmLCBjb25zdCBGb250RGVzY3JpcHRpb24mLCBj
b25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFy
aWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblNwZWNp
ZmllZENhcGFiaWxpdGllcyBmb250RmFjZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6ZSk7CitSZXRh
aW5QdHI8Q1RGb250UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiwgY29uc3QgRm9u
dERlc2NyaXB0aW9uJiwgY29uc3QgRm9udEZlYXR1cmVTZXR0aW5ncyogZm9udEZhY2VGZWF0dXJl
cywgY29uc3QgRm9udFZhcmlhbnRTZXR0aW5ncyogZm9udEZhY2VWYXJpYW50U2V0dGluZ3MsIEZv
bnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmlsaXRpZXMgZm9udEZhY2VDYXBhYmlsaXRpZXMsIGZs
b2F0IHNpemUsIGJvb2wgYXBwbHlXZWlnaHRXaWR0aFNsb3BlVmFyaWF0aW9ucyA9IHRydWUpOwog
U3ludGhlc2lzUGFpciBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKENURm9udFJlZiwgY29uc3Qg
Rm9udERlc2NyaXB0aW9uJiwgYm9vbCBpc1BsYXRmb3JtRm9udCA9IGZhbHNlKTsKIFJldGFpblB0
cjxDVEZvbnRSZWY+IHBsYXRmb3JtRm9udFdpdGhGYW1pbHlTcGVjaWFsQ2FzZShjb25zdCBBdG9t
aWNTdHJpbmcmIGZhbWlseSwgRm9udFNlbGVjdGlvblJlcXVlc3QsIGZsb2F0IHNpemUpOwogUmV0
YWluUHRyPENURm9udFJlZj4gcGxhdGZvcm1Gb250V2l0aEZhbWlseShjb25zdCBBdG9taWNTdHJp
bmcmIGZhbWlseSwgRm9udFNlbGVjdGlvblJlcXVlc3QsIFRleHRSZW5kZXJpbmdNb2RlLCBmbG9h
dCBzaXplKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv
Y29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAppbmRleCAyMjMxZmUyMzRhZmI1OGJmZjA4
MWQ3Y2U4MjRhOTc2MjU5MGRlNzE1Li42NzUwYTliOTFkMGQ0OGUzNjg3MzE2ZjQ0NjNhYjQwNjYz
ZDEyYzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv
YS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCkBAIC01MTMsNyArNTEzLDcgQEAgc3Ry
dWN0IEZvbnRUeXBlIHsKICAgICBib29sIGFhdFNoYXBpbmcgeyBmYWxzZSB9OwogfTsKIAotUmV0
YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZvbnRSZWYgb3JpZ2luYWxG
b250LCBjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgRm9udEZl
YXR1cmVTZXR0aW5ncyogZm9udEZhY2VGZWF0dXJlcywgY29uc3QgRm9udFZhcmlhbnRTZXR0aW5n
cyogZm9udEZhY2VWYXJpYW50U2V0dGluZ3MsIEZvbnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmls
aXRpZXMgZm9udEZhY2VDYXBhYmlsaXRpZXMsIGZsb2F0IHNpemUpCitSZXRhaW5QdHI8Q1RGb250
UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIGNvbnN0IEZv
bnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdz
KiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZh
cmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFiaWxpdGllcyBmb250RmFj
ZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6ZSwgYm9vbCBhcHBseVdlaWdodFdpZHRoU2xvcGVWYXJp
YXRpb25zKQogewogICAgIGJvb2wgYWx3YXlzQWRkVmFyaWF0aW9ucyA9IGZhbHNlOwogCkBAIC01
ODcsNyArNTg3LDcgQEAgUmV0YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChD
VEZvbnRSZWYgb3JpZ2luYWxGb250LCBjb25zdCBGb250RGVzY3IKICAgICB9OwogCiAgICAgLy8g
VGhlIHN5c3RlbSBmb250IGlzIHNvbWV3aGF0IG1hZ2ljYWwuIERvbid0IG1lc3Mgd2l0aCBpdHMg
dmFyaWF0aW9ucy4KLSAgICBpZiAoIWZvbnRJc1N5c3RlbUZvbnQob3JpZ2luYWxGb250KSkgewor
ICAgIGlmIChhcHBseVdlaWdodFdpZHRoU2xvcGVWYXJpYXRpb25zICYmICFmb250SXNTeXN0ZW1G
b250KG9yaWdpbmFsRm9udCkpIHsKICAgICAgICAgZmxvYXQgd2VpZ2h0ID0gZm9udFNlbGVjdGlv
blJlcXVlc3Qud2VpZ2h0OwogICAgICAgICBmbG9hdCB3aWR0aCA9IGZvbnRTZWxlY3Rpb25SZXF1
ZXN0LndpZHRoOwogICAgICAgICBmbG9hdCBzbG9wZSA9IGZvbnRTZWxlY3Rpb25SZXF1ZXN0LnNs
b3BlOwpAQCAtMTExNSwxNSArMTExNSwyMCBAQCBWZWN0b3I8Rm9udFNlbGVjdGlvbkNhcGFiaWxp
dGllcz4gRm9udENhY2hlOjpnZXRGb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzSW5GYW1pbAogICAg
IHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBSZXRhaW5QdHI8Q1RGb250UmVmPiBwbGF0Zm9y
bUZvbnRMb29rdXBXaXRoRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5LCBGb250U2Vs
ZWN0aW9uUmVxdWVzdCByZXF1ZXN0LCBmbG9hdCBzaXplKQorc3RydWN0IEZvbnRMb29rdXAgewor
ICAgIFJldGFpblB0cjxDVEZvbnRSZWY+IHJlc3VsdDsKKyAgICBib29sIGNyZWF0ZWRGcm9tUG9z
dFNjcmlwdE5hbWUgeyBmYWxzZSB9OworfTsKKworc3RhdGljIEZvbnRMb29rdXAgcGxhdGZvcm1G
b250TG9va3VwV2l0aEZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSwgRm9udFNlbGVj
dGlvblJlcXVlc3QgcmVxdWVzdCwgZmxvYXQgc2l6ZSkKIHsKICAgICBjb25zdCBhdXRvJiB3aGl0
ZWxpc3QgPSBmb250V2hpdGVsaXN0KCk7CiAgICAgaWYgKCFpc1N5c3RlbUZvbnQoZmFtaWx5KSAm
JiB3aGl0ZWxpc3Quc2l6ZSgpICYmICF3aGl0ZWxpc3QuY29udGFpbnMoZmFtaWx5KSkKLSAgICAg
ICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsKIAogI2lmIFNI
T1VMRF9VU0VfQ09SRV9URVhUX0ZPTlRfTE9PS1VQCiAgICAgQ1RGb250U3ltYm9saWNUcmFpdHMg
dHJhaXRzID0gKGlzRm9udFdlaWdodEJvbGQocmVxdWVzdC53ZWlnaHQpID8ga0NURm9udFRyYWl0
Qm9sZCA6IDApIHwgKGlzSXRhbGljKHJlcXVlc3Quc2xvcGUpID8ga0NURm9udFRyYWl0SXRhbGlj
IDogMCk7Ci0gICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlRm9yQ1NTKGZhbWlseS5zdHJp
bmcoKS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBzdGF0aWNfY2FzdDxmbG9hdD4ocmVxdWVzdC53
ZWlnaHQpLCB0cmFpdHMsIHNpemUpKTsKKyAgICByZXR1cm4geyBhZG9wdENGKENURm9udENyZWF0
ZUZvckNTUyhmYW1pbHkuc3RyaW5nKCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgc3RhdGljX2Nh
c3Q8ZmxvYXQ+KHJlcXVlc3Qud2VpZ2h0KSwgdHJhaXRzLCBzaXplKSkgfTsKICNlbHNlCiAgICAg
Y29uc3QgYXV0byYgZmFtaWx5Rm9udHMgPSBGb250RGF0YWJhc2U6OnNpbmdsZXRvbigpLmNvbGxl
Y3Rpb25Gb3JGYW1pbHkoZmFtaWx5LnN0cmluZygpKTsKICAgICBpZiAoZmFtaWx5Rm9udHMuaXNF
bXB0eSgpKSB7CkBAIC0xMTM2LDI5ICsxMTQxLDI5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q1RGb250
UmVmPiBwbGF0Zm9ybUZvbnRMb29rdXBXaXRoRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFt
CiAgICAgICAgIC8vIGJ1dCBpZiBhIDxiPiBhcHBlYXJzIGFzIGEgZGVzY2VuZGVudCBlbGVtZW50
LCBpdCB3aWxsIGJlIGhvbm9yZWQgdG9vLgogICAgICAgICBjb25zdCBhdXRvJiBwb3N0U2NyaXB0
Rm9udCA9IEZvbnREYXRhYmFzZTo6c2luZ2xldG9uKCkuZm9udEZvclBvc3RTY3JpcHROYW1lKGZh
bWlseSk7CiAgICAgICAgIGlmICghcG9zdFNjcmlwdEZvbnQuZm9udERlc2NyaXB0b3IpCi0gICAg
ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsK
ICAgICAgICAgaWYgKChpc0l0YWxpYyhyZXF1ZXN0LnNsb3BlKSAmJiAhaXNJdGFsaWMocG9zdFNj
cmlwdEZvbnQuY2FwYWJpbGl0aWVzLnNsb3BlLm1heGltdW0pKQogICAgICAgICAgICAgfHwgKGlz
Rm9udFdlaWdodEJvbGQocmVxdWVzdC53ZWlnaHQpICYmICFpc0ZvbnRXZWlnaHRCb2xkKHBvc3RT
Y3JpcHRGb250LmNhcGFiaWxpdGllcy53ZWlnaHQubWF4aW11bSkpKSB7CiAgICAgICAgICAgICBh
dXRvIHBvc3RTY3JpcHRGYW1pbHlOYW1lID0gYWRvcHRDRihzdGF0aWNfY2FzdDxDRlN0cmluZ1Jl
Zj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUocG9zdFNjcmlwdEZvbnQuZm9udERlc2Ny
aXB0b3IuZ2V0KCksIGtDVEZvbnRGYW1pbHlOYW1lQXR0cmlidXRlKSkpOwogICAgICAgICAgICAg
aWYgKCFwb3N0U2NyaXB0RmFtaWx5TmFtZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0
cjsKKyAgICAgICAgICAgICAgICByZXR1cm4geyBudWxscHRyIH07CiAgICAgICAgICAgICBjb25z
dCBhdXRvJiBmYW1pbHlGb250cyA9IEZvbnREYXRhYmFzZTo6c2luZ2xldG9uKCkuY29sbGVjdGlv
bkZvckZhbWlseShTdHJpbmcocG9zdFNjcmlwdEZhbWlseU5hbWUuZ2V0KCkpKTsKICAgICAgICAg
ICAgIGlmIChmYW1pbHlGb250cy5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG51
bGxwdHI7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgbnVsbHB0ciB9OwogICAgICAgICAgICAg
aWYgKGNvbnN0IGF1dG8qIGluc3RhbGxlZEZvbnQgPSBmaW5kQ2xvc2VzdEZvbnQoZmFtaWx5Rm9u
dHMsIHJlcXVlc3QpKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFpbnN0YWxsZWRGb250LT5mb250
RGVzY3JpcHRvcikKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAg
ICAgICAgICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGlu
c3RhbGxlZEZvbnQtPmZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSk7CisgICAg
ICAgICAgICAgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsKKyAgICAgICAgICAgICAgICByZXR1
cm4geyBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihpbnN0YWxsZWRGb250
LT5mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpLCB0cnVlIH07CiAgICAgICAg
ICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybiB7
IG51bGxwdHIgfTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVh
dGVXaXRoRm9udERlc2NyaXB0b3IocG9zdFNjcmlwdEZvbnQuZm9udERlc2NyaXB0b3IuZ2V0KCks
IHNpemUsIG51bGxwdHIpKTsKKyAgICAgICAgcmV0dXJuIHsgYWRvcHRDRihDVEZvbnRDcmVhdGVX
aXRoRm9udERlc2NyaXB0b3IocG9zdFNjcmlwdEZvbnQuZm9udERlc2NyaXB0b3IuZ2V0KCksIHNp
emUsIG51bGxwdHIpKSwgdHJ1ZSB9OwogICAgIH0KIAogICAgIGlmIChjb25zdCBhdXRvKiBpbnN0
YWxsZWRGb250ID0gZmluZENsb3Nlc3RGb250KGZhbWlseUZvbnRzLCByZXF1ZXN0KSkKLSAgICAg
ICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGluc3RhbGxl
ZEZvbnQtPmZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSk7CisgICAgICAgIHJl
dHVybiB7IGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGluc3RhbGxlZEZv
bnQtPmZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSksIGZhbHNlIH07CiAKLSAg
ICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4geyBudWxscHRyIH07CiAjZW5kaWYKIH0KIApA
QCAtMTE4NCwxMCArMTE4OSwxMSBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gZm9udFdp
dGhGYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIGNvbnN0IEZvbgogICAgICAgICBy
ZXR1cm4gbnVsbHB0cjsKIAogICAgIGNvbnN0IGF1dG8mIHJlcXVlc3QgPSBmb250RGVzY3JpcHRp
b24uZm9udFNlbGVjdGlvblJlcXVlc3QoKTsKLSAgICBhdXRvIGZvdW5kRm9udCA9IHBsYXRmb3Jt
Rm9udFdpdGhGYW1pbHlTcGVjaWFsQ2FzZShmYW1pbHksIHJlcXVlc3QsIHNpemUpOwotICAgIGlm
ICghZm91bmRGb250KQotICAgICAgICBmb3VuZEZvbnQgPSBwbGF0Zm9ybUZvbnRMb29rdXBXaXRo
RmFtaWx5KGZhbWlseSwgcmVxdWVzdCwgc2l6ZSk7Ci0gICAgcmV0dXJuIHByZXBhcmVQbGF0Zm9y
bUZvbnQoZm91bmRGb250LmdldCgpLCBmb250RGVzY3JpcHRpb24sIGZvbnRGYWNlRmVhdHVyZXMs
IGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLCBmb250RmFjZUNhcGFiaWxpdGllcywgc2l6ZSk7Cisg
ICAgRm9udExvb2t1cCBmb250TG9va3VwOworICAgIGZvbnRMb29rdXAucmVzdWx0ID0gcGxhdGZv
cm1Gb250V2l0aEZhbWlseVNwZWNpYWxDYXNlKGZhbWlseSwgcmVxdWVzdCwgc2l6ZSk7CisgICAg
aWYgKCFmb250TG9va3VwLnJlc3VsdCkKKyAgICAgICAgZm9udExvb2t1cCA9IHBsYXRmb3JtRm9u
dExvb2t1cFdpdGhGYW1pbHkoZmFtaWx5LCByZXF1ZXN0LCBzaXplKTsKKyAgICByZXR1cm4gcHJl
cGFyZVBsYXRmb3JtRm9udChmb250TG9va3VwLnJlc3VsdC5nZXQoKSwgZm9udERlc2NyaXB0aW9u
LCBmb250RmFjZUZlYXR1cmVzLCBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgZm9udEZhY2VDYXBh
YmlsaXRpZXMsIHNpemUsICFmb250TG9va3VwLmNyZWF0ZWRGcm9tUG9zdFNjcmlwdE5hbWUpOwog
fQogCiAjaWYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGViMWU4NDEwMzdhMWEyOWU1OGVlOWZlYzAw
YTNlMWM1NzI1ZTZiYzUuLjYxODhkZmFjNzkyMGQ2OThiYmJmYzUxZWVmMjVmYWU1MzcyN2QyYjIg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wNy0wMiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt
bWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04oVmFyaWF0aW9uIEZvbnRz
KTogU3BlY2lmeWluZyBTa2lhIGJ5IFBvc3RTY3JpcHQgbmFtZSBkb2VzIG5vdCB5aWVsZCB0aGUg
ZXhwZWN0ZWQgcmVzdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0xNzQwNzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMDQwODU0PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90ZXh0L3Zh
cmlhdGlvbnMvc2tpYS1wb3N0c2NyaXB0LW5hbWUtZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbDogQWRk
ZWQuCisgICAgICAgICogZmFzdC90ZXh0L3ZhcmlhdGlvbnMvc2tpYS1wb3N0c2NyaXB0LW5hbWUu
aHRtbDogQWRkZWQuCisKIDIwMTctMDYtMjkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K
IAogICAgICAgICBbV2ViSURMXSBBZGQgYSBuZXcgZXh0ZW5kZWQgYXR0cmlidXRlIHRvIG1vZGVs
IHRoZSBmb3JjZWQgcmV0dXJuIHZhbHVlIG9wdGltaXphdGlvbiB1c2VkIG9uIE5vZGUgYW5kIENy
eXB0bwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3ZhcmlhdGlvbnMvc2tpYS1w
b3N0c2NyaXB0LW5hbWUtZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv
dGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1lLWV4cGVjdGVkLW1pc21hdGNoLmh0
bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uYjk3NTFlMjVkN2ZlOTJjNjBhZGE4ZTM5MmQyMjY3OGFjNWY1OThiMQot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC92YXJpYXRpb25zL3NraWEt
cG9zdHNjcmlwdC1uYW1lLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwKQEAgLTAsMCArMSw5IEBACis8
IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgc3R5
bGU9ImZvbnQ6IDEwMHB4ICdTa2lhJzsiPmU8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KKwpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3ZhcmlhdGlvbnMvc2tpYS1wb3N0c2NyaXB0
LW5hbWUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNj
cmlwdC1uYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjA0ZWRkYjkwMGVlYWY5M2VlYjY4MDIyMGExMWY4
OTRlMzA0ZDc3ZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC92YXJp
YXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1lLmh0bWwKQEAgLTAsMCArMSw4IEBACis8IURPQ1RZ
UEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgc3R5bGU9ImZv
bnQ6IDEwMHB4ICdTa2lhLVJlZ3VsYXJfTGlnaHQtRXh0ZW5kZWQnOyI+ZTwvZGl2PgorPC9ib2R5
PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314424</attachid>
            <date>2017-07-02 13:23:50 -0700</date>
            <delta_ts>2017-07-02 14:22:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-174079-20170702132349.patch</filename>
            <type>text/plain</type>
            <size>11460</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzczZGVmYTVlODdiZGQx
ZTdhMjUyYTUwZWQ4M2U1OWQxMmZlZDhmMi4uNjU5YzdmOGVlNmQxNTg1NjA3YjBjYjUzOTQxZWY4
Y2MyNzk4OTJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA3LTAyICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP
TihWYXJpYXRpb24gRm9udHMpOiBTcGVjaWZ5aW5nIFNraWEgYnkgUG9zdFNjcmlwdCBuYW1lIGRv
ZXMgbm90IHlpZWxkIHRoZSBleHBlY3RlZCByZXN1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDA3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v
MzMwNDA4NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQmVjYXVzZSBTa2lhIGlzIGEgdmFyaWF0aW9uIGZvbnQsIGl0cyBQb3N0U2NyaXB0IG5hbWUg
Y29udGFpbnMgdmFsdWVzIHRvIGFwcGx5IHRvIGl0cyB2YXJpYXRpb24KKyAgICAgICAgYXhlcy4g
SG93ZXZlciwgV2ViS2l0J3MgdmFyaWF0aW9uIGNvZGUgd2FzIG92ZXJ3cml0aW5nIHRoZXNlIGlu
dHJpbnNpdmUgdmFsdWVzIHdpdGggb25lcyBzcGVjaWZpZWQKKyAgICAgICAgYnkgQ1NTLiBUaGVy
ZWZvcmUsIHRoZSBpbnRyaW5zaWMgb25lcyB3ZXJlIGJlaW5nIGlnbm9yZWQuIFRoZSBzb2x1dGlv
biBpcyBqdXN0IHRvIHBhc3MgYSBmbGFnIGZyb20KKyAgICAgICAgdGhlIGxvb2t1cCBjb2RlIHRv
IHRoZSB2YXJpYXRpb25zIGNvZGUgZGVzY3JpYmluZyBpZiB0aGUgZm9udCB3YXMgY3JlYXRlZCB2
aWEgYSBQb3N0U2NyaXB0IG5hbWUsCisgICAgICAgIGFuZCB0byBub3QgYXBwbHkgdGhlIENTUyBw
cm9wZXJ0aWVzIHRvIGl0IGlmIGl0IHdhcy4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvdmFy
aWF0aW9ucy9za2lhLXBvc3RzY3JpcHQtbmFtZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n
cmFwaGljcy9Gb250Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G
b250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmVwYXJlUGxhdGZvcm1G
b250KToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3JtRm9udExvb2t1cFdpdGhGYW1pbHkpOgor
ICAgICAgICAoV2ViQ29yZTo6Zm9udFdpdGhGYW1pbHkpOgorCiAyMDE3LTA2LTI5ICBTYWlkIEFi
b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgQXN5bmMgaW1h
Z2UgZGVjb2Rpbmcgc2hvdWxkIGJlIGRpc2FibGVkIGZvciBpQm9va3Mgb24gdHZPUwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRleCA3YjJmMTg2NDU1
NzEyZDBmNDNjNjFmMjMwNzA3MzhiYzYwNTU3YjM1Li44ZTcyNzQxYTQwYzA2MzMwYWE4YzVkN2Qw
YzEyODNlYmE2YWFkMjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9Gb250Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G
b250Q2FjaGUuaApAQCAtMjgxLDcgKzI4MSw3IEBAIHN0cnVjdCBTeW50aGVzaXNQYWlyIHsKICAg
ICBib29sIG5lZWRzU3ludGhldGljT2JsaXF1ZTsKIH07CiAKLVJldGFpblB0cjxDVEZvbnRSZWY+
IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmLCBjb25zdCBGb250RGVzY3JpcHRpb24mLCBj
b25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFy
aWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblNwZWNp
ZmllZENhcGFiaWxpdGllcyBmb250RmFjZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6ZSk7CitSZXRh
aW5QdHI8Q1RGb250UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiwgY29uc3QgRm9u
dERlc2NyaXB0aW9uJiwgY29uc3QgRm9udEZlYXR1cmVTZXR0aW5ncyogZm9udEZhY2VGZWF0dXJl
cywgY29uc3QgRm9udFZhcmlhbnRTZXR0aW5ncyogZm9udEZhY2VWYXJpYW50U2V0dGluZ3MsIEZv
bnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmlsaXRpZXMgZm9udEZhY2VDYXBhYmlsaXRpZXMsIGZs
b2F0IHNpemUsIGJvb2wgYXBwbHlXZWlnaHRXaWR0aFNsb3BlVmFyaWF0aW9ucyA9IHRydWUpOwog
U3ludGhlc2lzUGFpciBjb21wdXRlTmVjZXNzYXJ5U3ludGhlc2lzKENURm9udFJlZiwgY29uc3Qg
Rm9udERlc2NyaXB0aW9uJiwgYm9vbCBpc1BsYXRmb3JtRm9udCA9IGZhbHNlKTsKIFJldGFpblB0
cjxDVEZvbnRSZWY+IHBsYXRmb3JtRm9udFdpdGhGYW1pbHlTcGVjaWFsQ2FzZShjb25zdCBBdG9t
aWNTdHJpbmcmIGZhbWlseSwgRm9udFNlbGVjdGlvblJlcXVlc3QsIGZsb2F0IHNpemUpOwogUmV0
YWluUHRyPENURm9udFJlZj4gcGxhdGZvcm1Gb250V2l0aEZhbWlseShjb25zdCBBdG9taWNTdHJp
bmcmIGZhbWlseSwgRm9udFNlbGVjdGlvblJlcXVlc3QsIFRleHRSZW5kZXJpbmdNb2RlLCBmbG9h
dCBzaXplKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv
Y29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NvY29hL0ZvbnRDYWNoZUNvcmVUZXh0LmNwcAppbmRleCAyMjMxZmUyMzRhZmI1OGJmZjA4
MWQ3Y2U4MjRhOTc2MjU5MGRlNzE1Li42NzUwYTliOTFkMGQ0OGUzNjg3MzE2ZjQ0NjNhYjQwNjYz
ZDEyYzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv
YS9Gb250Q2FjaGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvRm9udENhY2hlQ29yZVRleHQuY3BwCkBAIC01MTMsNyArNTEzLDcgQEAgc3Ry
dWN0IEZvbnRUeXBlIHsKICAgICBib29sIGFhdFNoYXBpbmcgeyBmYWxzZSB9OwogfTsKIAotUmV0
YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChDVEZvbnRSZWYgb3JpZ2luYWxG
b250LCBjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgRm9udEZl
YXR1cmVTZXR0aW5ncyogZm9udEZhY2VGZWF0dXJlcywgY29uc3QgRm9udFZhcmlhbnRTZXR0aW5n
cyogZm9udEZhY2VWYXJpYW50U2V0dGluZ3MsIEZvbnRTZWxlY3Rpb25TcGVjaWZpZWRDYXBhYmls
aXRpZXMgZm9udEZhY2VDYXBhYmlsaXRpZXMsIGZsb2F0IHNpemUpCitSZXRhaW5QdHI8Q1RGb250
UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIGNvbnN0IEZv
bnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdz
KiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZh
cmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFiaWxpdGllcyBmb250RmFj
ZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6ZSwgYm9vbCBhcHBseVdlaWdodFdpZHRoU2xvcGVWYXJp
YXRpb25zKQogewogICAgIGJvb2wgYWx3YXlzQWRkVmFyaWF0aW9ucyA9IGZhbHNlOwogCkBAIC01
ODcsNyArNTg3LDcgQEAgUmV0YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRmb3JtRm9udChD
VEZvbnRSZWYgb3JpZ2luYWxGb250LCBjb25zdCBGb250RGVzY3IKICAgICB9OwogCiAgICAgLy8g
VGhlIHN5c3RlbSBmb250IGlzIHNvbWV3aGF0IG1hZ2ljYWwuIERvbid0IG1lc3Mgd2l0aCBpdHMg
dmFyaWF0aW9ucy4KLSAgICBpZiAoIWZvbnRJc1N5c3RlbUZvbnQob3JpZ2luYWxGb250KSkgewor
ICAgIGlmIChhcHBseVdlaWdodFdpZHRoU2xvcGVWYXJpYXRpb25zICYmICFmb250SXNTeXN0ZW1G
b250KG9yaWdpbmFsRm9udCkpIHsKICAgICAgICAgZmxvYXQgd2VpZ2h0ID0gZm9udFNlbGVjdGlv
blJlcXVlc3Qud2VpZ2h0OwogICAgICAgICBmbG9hdCB3aWR0aCA9IGZvbnRTZWxlY3Rpb25SZXF1
ZXN0LndpZHRoOwogICAgICAgICBmbG9hdCBzbG9wZSA9IGZvbnRTZWxlY3Rpb25SZXF1ZXN0LnNs
b3BlOwpAQCAtMTExNSwxNSArMTExNSwyMCBAQCBWZWN0b3I8Rm9udFNlbGVjdGlvbkNhcGFiaWxp
dGllcz4gRm9udENhY2hlOjpnZXRGb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzSW5GYW1pbAogICAg
IHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBSZXRhaW5QdHI8Q1RGb250UmVmPiBwbGF0Zm9y
bUZvbnRMb29rdXBXaXRoRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5LCBGb250U2Vs
ZWN0aW9uUmVxdWVzdCByZXF1ZXN0LCBmbG9hdCBzaXplKQorc3RydWN0IEZvbnRMb29rdXAgewor
ICAgIFJldGFpblB0cjxDVEZvbnRSZWY+IHJlc3VsdDsKKyAgICBib29sIGNyZWF0ZWRGcm9tUG9z
dFNjcmlwdE5hbWUgeyBmYWxzZSB9OworfTsKKworc3RhdGljIEZvbnRMb29rdXAgcGxhdGZvcm1G
b250TG9va3VwV2l0aEZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSwgRm9udFNlbGVj
dGlvblJlcXVlc3QgcmVxdWVzdCwgZmxvYXQgc2l6ZSkKIHsKICAgICBjb25zdCBhdXRvJiB3aGl0
ZWxpc3QgPSBmb250V2hpdGVsaXN0KCk7CiAgICAgaWYgKCFpc1N5c3RlbUZvbnQoZmFtaWx5KSAm
JiB3aGl0ZWxpc3Quc2l6ZSgpICYmICF3aGl0ZWxpc3QuY29udGFpbnMoZmFtaWx5KSkKLSAgICAg
ICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsKIAogI2lmIFNI
T1VMRF9VU0VfQ09SRV9URVhUX0ZPTlRfTE9PS1VQCiAgICAgQ1RGb250U3ltYm9saWNUcmFpdHMg
dHJhaXRzID0gKGlzRm9udFdlaWdodEJvbGQocmVxdWVzdC53ZWlnaHQpID8ga0NURm9udFRyYWl0
Qm9sZCA6IDApIHwgKGlzSXRhbGljKHJlcXVlc3Quc2xvcGUpID8ga0NURm9udFRyYWl0SXRhbGlj
IDogMCk7Ci0gICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlRm9yQ1NTKGZhbWlseS5zdHJp
bmcoKS5jcmVhdGVDRlN0cmluZygpLmdldCgpLCBzdGF0aWNfY2FzdDxmbG9hdD4ocmVxdWVzdC53
ZWlnaHQpLCB0cmFpdHMsIHNpemUpKTsKKyAgICByZXR1cm4geyBhZG9wdENGKENURm9udENyZWF0
ZUZvckNTUyhmYW1pbHkuc3RyaW5nKCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgc3RhdGljX2Nh
c3Q8ZmxvYXQ+KHJlcXVlc3Qud2VpZ2h0KSwgdHJhaXRzLCBzaXplKSkgfTsKICNlbHNlCiAgICAg
Y29uc3QgYXV0byYgZmFtaWx5Rm9udHMgPSBGb250RGF0YWJhc2U6OnNpbmdsZXRvbigpLmNvbGxl
Y3Rpb25Gb3JGYW1pbHkoZmFtaWx5LnN0cmluZygpKTsKICAgICBpZiAoZmFtaWx5Rm9udHMuaXNF
bXB0eSgpKSB7CkBAIC0xMTM2LDI5ICsxMTQxLDI5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q1RGb250
UmVmPiBwbGF0Zm9ybUZvbnRMb29rdXBXaXRoRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFt
CiAgICAgICAgIC8vIGJ1dCBpZiBhIDxiPiBhcHBlYXJzIGFzIGEgZGVzY2VuZGVudCBlbGVtZW50
LCBpdCB3aWxsIGJlIGhvbm9yZWQgdG9vLgogICAgICAgICBjb25zdCBhdXRvJiBwb3N0U2NyaXB0
Rm9udCA9IEZvbnREYXRhYmFzZTo6c2luZ2xldG9uKCkuZm9udEZvclBvc3RTY3JpcHROYW1lKGZh
bWlseSk7CiAgICAgICAgIGlmICghcG9zdFNjcmlwdEZvbnQuZm9udERlc2NyaXB0b3IpCi0gICAg
ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsK
ICAgICAgICAgaWYgKChpc0l0YWxpYyhyZXF1ZXN0LnNsb3BlKSAmJiAhaXNJdGFsaWMocG9zdFNj
cmlwdEZvbnQuY2FwYWJpbGl0aWVzLnNsb3BlLm1heGltdW0pKQogICAgICAgICAgICAgfHwgKGlz
Rm9udFdlaWdodEJvbGQocmVxdWVzdC53ZWlnaHQpICYmICFpc0ZvbnRXZWlnaHRCb2xkKHBvc3RT
Y3JpcHRGb250LmNhcGFiaWxpdGllcy53ZWlnaHQubWF4aW11bSkpKSB7CiAgICAgICAgICAgICBh
dXRvIHBvc3RTY3JpcHRGYW1pbHlOYW1lID0gYWRvcHRDRihzdGF0aWNfY2FzdDxDRlN0cmluZ1Jl
Zj4oQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGUocG9zdFNjcmlwdEZvbnQuZm9udERlc2Ny
aXB0b3IuZ2V0KCksIGtDVEZvbnRGYW1pbHlOYW1lQXR0cmlidXRlKSkpOwogICAgICAgICAgICAg
aWYgKCFwb3N0U2NyaXB0RmFtaWx5TmFtZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0
cjsKKyAgICAgICAgICAgICAgICByZXR1cm4geyBudWxscHRyIH07CiAgICAgICAgICAgICBjb25z
dCBhdXRvJiBmYW1pbHlGb250cyA9IEZvbnREYXRhYmFzZTo6c2luZ2xldG9uKCkuY29sbGVjdGlv
bkZvckZhbWlseShTdHJpbmcocG9zdFNjcmlwdEZhbWlseU5hbWUuZ2V0KCkpKTsKICAgICAgICAg
ICAgIGlmIChmYW1pbHlGb250cy5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG51
bGxwdHI7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgbnVsbHB0ciB9OwogICAgICAgICAgICAg
aWYgKGNvbnN0IGF1dG8qIGluc3RhbGxlZEZvbnQgPSBmaW5kQ2xvc2VzdEZvbnQoZmFtaWx5Rm9u
dHMsIHJlcXVlc3QpKSB7CiAgICAgICAgICAgICAgICAgaWYgKCFpbnN0YWxsZWRGb250LT5mb250
RGVzY3JpcHRvcikKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAg
ICAgICAgICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGlu
c3RhbGxlZEZvbnQtPmZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSk7CisgICAg
ICAgICAgICAgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsKKyAgICAgICAgICAgICAgICByZXR1
cm4geyBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihpbnN0YWxsZWRGb250
LT5mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpLCB0cnVlIH07CiAgICAgICAg
ICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybiB7
IG51bGxwdHIgfTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVh
dGVXaXRoRm9udERlc2NyaXB0b3IocG9zdFNjcmlwdEZvbnQuZm9udERlc2NyaXB0b3IuZ2V0KCks
IHNpemUsIG51bGxwdHIpKTsKKyAgICAgICAgcmV0dXJuIHsgYWRvcHRDRihDVEZvbnRDcmVhdGVX
aXRoRm9udERlc2NyaXB0b3IocG9zdFNjcmlwdEZvbnQuZm9udERlc2NyaXB0b3IuZ2V0KCksIHNp
emUsIG51bGxwdHIpKSwgdHJ1ZSB9OwogICAgIH0KIAogICAgIGlmIChjb25zdCBhdXRvKiBpbnN0
YWxsZWRGb250ID0gZmluZENsb3Nlc3RGb250KGZhbWlseUZvbnRzLCByZXF1ZXN0KSkKLSAgICAg
ICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGluc3RhbGxl
ZEZvbnQtPmZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSk7CisgICAgICAgIHJl
dHVybiB7IGFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGluc3RhbGxlZEZv
bnQtPmZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyKSksIGZhbHNlIH07CiAKLSAg
ICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4geyBudWxscHRyIH07CiAjZW5kaWYKIH0KIApA
QCAtMTE4NCwxMCArMTE4OSwxMSBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gZm9udFdp
dGhGYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIGNvbnN0IEZvbgogICAgICAgICBy
ZXR1cm4gbnVsbHB0cjsKIAogICAgIGNvbnN0IGF1dG8mIHJlcXVlc3QgPSBmb250RGVzY3JpcHRp
b24uZm9udFNlbGVjdGlvblJlcXVlc3QoKTsKLSAgICBhdXRvIGZvdW5kRm9udCA9IHBsYXRmb3Jt
Rm9udFdpdGhGYW1pbHlTcGVjaWFsQ2FzZShmYW1pbHksIHJlcXVlc3QsIHNpemUpOwotICAgIGlm
ICghZm91bmRGb250KQotICAgICAgICBmb3VuZEZvbnQgPSBwbGF0Zm9ybUZvbnRMb29rdXBXaXRo
RmFtaWx5KGZhbWlseSwgcmVxdWVzdCwgc2l6ZSk7Ci0gICAgcmV0dXJuIHByZXBhcmVQbGF0Zm9y
bUZvbnQoZm91bmRGb250LmdldCgpLCBmb250RGVzY3JpcHRpb24sIGZvbnRGYWNlRmVhdHVyZXMs
IGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLCBmb250RmFjZUNhcGFiaWxpdGllcywgc2l6ZSk7Cisg
ICAgRm9udExvb2t1cCBmb250TG9va3VwOworICAgIGZvbnRMb29rdXAucmVzdWx0ID0gcGxhdGZv
cm1Gb250V2l0aEZhbWlseVNwZWNpYWxDYXNlKGZhbWlseSwgcmVxdWVzdCwgc2l6ZSk7CisgICAg
aWYgKCFmb250TG9va3VwLnJlc3VsdCkKKyAgICAgICAgZm9udExvb2t1cCA9IHBsYXRmb3JtRm9u
dExvb2t1cFdpdGhGYW1pbHkoZmFtaWx5LCByZXF1ZXN0LCBzaXplKTsKKyAgICByZXR1cm4gcHJl
cGFyZVBsYXRmb3JtRm9udChmb250TG9va3VwLnJlc3VsdC5nZXQoKSwgZm9udERlc2NyaXB0aW9u
LCBmb250RmFjZUZlYXR1cmVzLCBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgZm9udEZhY2VDYXBh
YmlsaXRpZXMsIHNpemUsICFmb250TG9va3VwLmNyZWF0ZWRGcm9tUG9zdFNjcmlwdE5hbWUpOwog
fQogCiAjaWYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGViMWU4NDEwMzdhMWEyOWU1OGVlOWZlYzAw
YTNlMWM1NzI1ZTZiYzUuLmZjOTBjYThjYmRhNjZkOTI3ZjA5NWMzNjQwNjJmODk0YWY0M2IxODQg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNy0wNy0wMiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt
bWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04oVmFyaWF0aW9uIEZvbnRz
KTogU3BlY2lmeWluZyBTa2lhIGJ5IFBvc3RTY3JpcHQgbmFtZSBkb2VzIG5vdCB5aWVsZCB0aGUg
ZXhwZWN0ZWQgcmVzdWx0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0xNzQwNzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMDQwODU0PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90ZXh0L3Zh
cmlhdGlvbnMvc2tpYS1wb3N0c2NyaXB0LW5hbWUtZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbDogQWRk
ZWQuCisgICAgICAgICogZmFzdC90ZXh0L3ZhcmlhdGlvbnMvc2tpYS1wb3N0c2NyaXB0LW5hbWUu
aHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9UZXN0RXhwZWN0
YXRpb25zOgorCiAyMDE3LTA2LTI5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgW1dlYklETF0gQWRkIGEgbmV3IGV4dGVuZGVkIGF0dHJpYnV0ZSB0byBtb2RlbCB0aGUg
Zm9yY2VkIHJldHVybiB2YWx1ZSBvcHRpbWl6YXRpb24gdXNlZCBvbiBOb2RlIGFuZCBDcnlwdG8K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNj
cmlwdC1uYW1lLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQv
dmFyaWF0aW9ucy9za2lhLXBvc3RzY3JpcHQtbmFtZS1leHBlY3RlZC1taXNtYXRjaC5odG1sCm5l
dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAuLmI5NzUxZTI1ZDdmZTkyYzYwYWRhOGUzOTJkMjI2NzhhYzVmNTk4YjEKLS0tIC9k
ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdmFyaWF0aW9ucy9za2lhLXBvc3Rz
Y3JpcHQtbmFtZS1leHBlY3RlZC1taXNtYXRjaC5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NU
WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJm
b250OiAxMDBweCAnU2tpYSc7Ij5lPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1l
Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdmFyaWF0aW9ucy9za2lhLXBvc3RzY3JpcHQt
bmFtZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYwNGVkZGI5MDBlZWFmOTNlZWI2ODAyMjBhMTFmODk0ZTMw
NGQ3N2YKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdmFyaWF0aW9u
cy9za2lhLXBvc3RzY3JpcHQtbmFtZS5odG1sCkBAIC0wLDAgKzEsOCBAQAorPCFET0NUWVBFIGh0
bWw+Cis8aHRtbD4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJmb250OiAx
MDBweCAnU2tpYS1SZWd1bGFyX0xpZ2h0LUV4dGVuZGVkJzsiPmU8L2Rpdj4KKzwvYm9keT4KKzwv
aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVz
dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCBhZmMyMDMyYWE1NDEzYTg3Yzc4ZGIwNWFkMDIyZDc1ZTk0MDVkNzRh
Li5iZWJiOTU2ZjBmODNhOGZiZmFkMjg1OTlkMjc2YjM5ZDQ2OGZmZjE5IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRvci9UZXN0RXhwZWN0YXRpb25zCkBAIC0x
MzksMyArMTM5LDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kv
V2ViQXNzZW1ibHktYmxvY2tlZC1pbi1hYm91dC1ibGFuay1pZnIKIGh0dHAvdGVzdHMvc2VjdXJp
dHkvY29udGVudFNlY3VyaXR5UG9saWN5L1dlYkFzc2VtYmx5LWJsb2NrZWQtaW4tZXh0ZXJuYWwt
c2NyaXB0Lmh0bWwgWyBGYWlsdXJlIF0KIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3Vy
aXR5UG9saWN5L1dlYkFzc2VtYmx5LWJsb2NrZWQtaW4tc3ViZnJhbWUuaHRtbCBbIEZhaWx1cmUg
XQogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvV2ViQXNzZW1ibHkt
YmxvY2tlZC5odG1sIFsgRmFpbHVyZSBdCisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIFNraWEsIHdo
aWNoIGlzbid0IGF2YWlsYWJsZSBvbiBpT1MuCit3ZWJraXQub3JnL2IvMTc0MDc5IGZhc3QvdGV4
dC92YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1lLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>314427</attachid>
            <date>2017-07-02 14:22:22 -0700</date>
            <delta_ts>2017-07-03 15:06:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-174079-20170702142222.patch</filename>
            <type>text/plain</type>
            <size>11727</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDA1OWVhNTlkYzU4NWQ1
MWU4NWQ0MjgwNzc5OGU1NTEwZDMzN2JlZC4uYmU2OWIwYTE1NGZmYTcwZWZjZjAxNWMwODAyZDAy
MmRhM2NlMmM5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA3LTAyICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP
TihWYXJpYXRpb24gRm9udHMpOiBTcGVjaWZ5aW5nIFNraWEgYnkgUG9zdFNjcmlwdCBuYW1lIGRv
ZXMgbm90IHlpZWxkIHRoZSBleHBlY3RlZCByZXN1bHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NDA3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v
MzMwNDA4NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQmVjYXVzZSBTa2lhIGlzIGEgdmFyaWF0aW9uIGZvbnQsIGl0cyBQb3N0U2NyaXB0IG5hbWUg
Y29udGFpbnMgdmFsdWVzIHRvIGFwcGx5IHRvIGl0cyB2YXJpYXRpb24KKyAgICAgICAgYXhlcy4g
SG93ZXZlciwgV2ViS2l0J3MgdmFyaWF0aW9uIGNvZGUgd2FzIG92ZXJ3cml0aW5nIHRoZXNlIGlu
dHJpbnNpdmUgdmFsdWVzIHdpdGggb25lcyBzcGVjaWZpZWQKKyAgICAgICAgYnkgQ1NTLiBUaGVy
ZWZvcmUsIHRoZSBpbnRyaW5zaWMgb25lcyB3ZXJlIGJlaW5nIGlnbm9yZWQuIFRoZSBzb2x1dGlv
biBpcyBqdXN0IHRvIHBhc3MgYSBmbGFnIGZyb20KKyAgICAgICAgdGhlIGxvb2t1cCBjb2RlIHRv
IHRoZSB2YXJpYXRpb25zIGNvZGUgZGVzY3JpYmluZyBpZiB0aGUgZm9udCB3YXMgY3JlYXRlZCB2
aWEgYSBQb3N0U2NyaXB0IG5hbWUsCisgICAgICAgIGFuZCB0byBub3QgYXBwbHkgdGhlIENTUyBw
cm9wZXJ0aWVzIHRvIGl0IGlmIGl0IHdhcy4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvdmFy
aWF0aW9ucy9za2lhLXBvc3RzY3JpcHQtbmFtZS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n
cmFwaGljcy9Gb250Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G
b250Q2FjaGVDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmVwYXJlUGxhdGZvcm1G
b250KToKKyAgICAgICAgKFdlYkNvcmU6OnBsYXRmb3JtRm9udExvb2t1cFdpdGhGYW1pbHkpOgor
ICAgICAgICAoV2ViQ29yZTo6Zm9udFdpdGhGYW1pbHkpOgorCiAyMDE3LTA3LTAyICBZb3Vlbm4g
RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWFsdGltZU91dGdvaW5nVmlk
ZW9Tb3VyY2Ugc2hvdWxkIHBhc3MgZnJhbWUgdGltZXN0YW1wCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDdiMmYxODY0NTU3MTJkMGY0M2M2MWYy
MzA3MDczOGJjNjA1NTdiMzUuLjhlNzI3NDFhNDBjMDYzMzBhYThjNWQ3ZDBjMTI4M2ViYTZhYWQy
NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNo
ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCkBA
IC0yODEsNyArMjgxLDcgQEAgc3RydWN0IFN5bnRoZXNpc1BhaXIgewogICAgIGJvb2wgbmVlZHNT
eW50aGV0aWNPYmxpcXVlOwogfTsKIAotUmV0YWluUHRyPENURm9udFJlZj4gcHJlcGFyZVBsYXRm
b3JtRm9udChDVEZvbnRSZWYsIGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEZvbnRGZWF0
dXJlU2V0dGluZ3MqIGZvbnRGYWNlRmVhdHVyZXMsIGNvbnN0IEZvbnRWYXJpYW50U2V0dGluZ3Mq
IGZvbnRGYWNlVmFyaWFudFNldHRpbmdzLCBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0
aWVzIGZvbnRGYWNlQ2FwYWJpbGl0aWVzLCBmbG9hdCBzaXplKTsKK1JldGFpblB0cjxDVEZvbnRS
ZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQoQ1RGb250UmVmLCBjb25zdCBGb250RGVzY3JpcHRpb24m
LCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdzKiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250
VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblNw
ZWNpZmllZENhcGFiaWxpdGllcyBmb250RmFjZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6ZSwgYm9v
bCBhcHBseVdlaWdodFdpZHRoU2xvcGVWYXJpYXRpb25zID0gdHJ1ZSk7CiBTeW50aGVzaXNQYWly
IGNvbXB1dGVOZWNlc3NhcnlTeW50aGVzaXMoQ1RGb250UmVmLCBjb25zdCBGb250RGVzY3JpcHRp
b24mLCBib29sIGlzUGxhdGZvcm1Gb250ID0gZmFsc2UpOwogUmV0YWluUHRyPENURm9udFJlZj4g
cGxhdGZvcm1Gb250V2l0aEZhbWlseVNwZWNpYWxDYXNlKGNvbnN0IEF0b21pY1N0cmluZyYgZmFt
aWx5LCBGb250U2VsZWN0aW9uUmVxdWVzdCwgZmxvYXQgc2l6ZSk7CiBSZXRhaW5QdHI8Q1RGb250
UmVmPiBwbGF0Zm9ybUZvbnRXaXRoRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5LCBG
b250U2VsZWN0aW9uUmVxdWVzdCwgVGV4dFJlbmRlcmluZ01vZGUsIGZsb2F0IHNpemUpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhY2hl
Q29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u
dENhY2hlQ29yZVRleHQuY3BwCmluZGV4IGY3NDU1YjFiYzVlMzhmNzQ1Y2VlY2RmNjA5Y2EwY2Nj
YWYxYjliOTQuLjM2ZTNkMmIwNTIzYTZiNmYxYTVlZDc2YTUzNTU2MzMxYzA3NGRlYjggMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYWNoZUNv
cmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9G
b250Q2FjaGVDb3JlVGV4dC5jcHAKQEAgLTUxMyw3ICs1MTMsNyBAQCBzdHJ1Y3QgRm9udFR5cGUg
ewogICAgIGJvb2wgYWF0U2hhcGluZyB7IGZhbHNlIH07CiB9OwogCi1SZXRhaW5QdHI8Q1RGb250
UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmlnaW5hbEZvbnQsIGNvbnN0IEZv
bnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBGb250RmVhdHVyZVNldHRpbmdz
KiBmb250RmFjZUZlYXR1cmVzLCBjb25zdCBGb250VmFyaWFudFNldHRpbmdzKiBmb250RmFjZVZh
cmlhbnRTZXR0aW5ncywgRm9udFNlbGVjdGlvblNwZWNpZmllZENhcGFiaWxpdGllcyBmb250RmFj
ZUNhcGFiaWxpdGllcywgZmxvYXQgc2l6ZSkKK1JldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQ
bGF0Zm9ybUZvbnQoQ1RGb250UmVmIG9yaWdpbmFsRm9udCwgY29uc3QgRm9udERlc2NyaXB0aW9u
JiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEZvbnRGZWF0dXJlU2V0dGluZ3MqIGZvbnRGYWNlRmVh
dHVyZXMsIGNvbnN0IEZvbnRWYXJpYW50U2V0dGluZ3MqIGZvbnRGYWNlVmFyaWFudFNldHRpbmdz
LCBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVzIGZvbnRGYWNlQ2FwYWJpbGl0aWVz
LCBmbG9hdCBzaXplLCBib29sIGFwcGx5V2VpZ2h0V2lkdGhTbG9wZVZhcmlhdGlvbnMpCiB7CiAg
ICAgYm9vbCBhbHdheXNBZGRWYXJpYXRpb25zID0gZmFsc2U7CiAKQEAgLTUyOCw2ICs1MjgsNyBA
QCBSZXRhaW5QdHI8Q1RGb250UmVmPiBwcmVwYXJlUGxhdGZvcm1Gb250KENURm9udFJlZiBvcmln
aW5hbEZvbnQsIGNvbnN0IEZvbnREZXNjcgogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oZm9udEZh
Y2VDYXBhYmlsaXRpZXMpOwogICAgIFVOVVNFRF9QQVJBTShzaXplKTsKKyAgICBVTlVTRURfUEFS
QU0oYXBwbHlXZWlnaHRXaWR0aFNsb3BlVmFyaWF0aW9ucyk7CiAjZW5kaWYKIAogICAgIGNvbnN0
IGF1dG8mIGZlYXR1cmVzID0gZm9udERlc2NyaXB0aW9uLmZlYXR1cmVTZXR0aW5ncygpOwpAQCAt
NTg3LDcgKzU4OCw3IEBAIFJldGFpblB0cjxDVEZvbnRSZWY+IHByZXBhcmVQbGF0Zm9ybUZvbnQo
Q1RGb250UmVmIG9yaWdpbmFsRm9udCwgY29uc3QgRm9udERlc2NyCiAgICAgfTsKIAogICAgIC8v
IFRoZSBzeXN0ZW0gZm9udCBpcyBzb21ld2hhdCBtYWdpY2FsLiBEb24ndCBtZXNzIHdpdGggaXRz
IHZhcmlhdGlvbnMuCi0gICAgaWYgKCFmb250SXNTeXN0ZW1Gb250KG9yaWdpbmFsRm9udCkpIHsK
KyAgICBpZiAoYXBwbHlXZWlnaHRXaWR0aFNsb3BlVmFyaWF0aW9ucyAmJiAhZm9udElzU3lzdGVt
Rm9udChvcmlnaW5hbEZvbnQpKSB7CiAgICAgICAgIGZsb2F0IHdlaWdodCA9IGZvbnRTZWxlY3Rp
b25SZXF1ZXN0LndlaWdodDsKICAgICAgICAgZmxvYXQgd2lkdGggPSBmb250U2VsZWN0aW9uUmVx
dWVzdC53aWR0aDsKICAgICAgICAgZmxvYXQgc2xvcGUgPSBmb250U2VsZWN0aW9uUmVxdWVzdC5z
bG9wZTsKQEAgLTExMTUsMTUgKzExMTYsMjAgQEAgVmVjdG9yPEZvbnRTZWxlY3Rpb25DYXBhYmls
aXRpZXM+IEZvbnRDYWNoZTo6Z2V0Rm9udFNlbGVjdGlvbkNhcGFiaWxpdGllc0luRmFtaWwKICAg
ICByZXR1cm4gcmVzdWx0OwogfQogCi1zdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gcGxhdGZv
cm1Gb250TG9va3VwV2l0aEZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSwgRm9udFNl
bGVjdGlvblJlcXVlc3QgcmVxdWVzdCwgZmxvYXQgc2l6ZSkKK3N0cnVjdCBGb250TG9va3VwIHsK
KyAgICBSZXRhaW5QdHI8Q1RGb250UmVmPiByZXN1bHQ7CisgICAgYm9vbCBjcmVhdGVkRnJvbVBv
c3RTY3JpcHROYW1lIHsgZmFsc2UgfTsKK307CisKK3N0YXRpYyBGb250TG9va3VwIHBsYXRmb3Jt
Rm9udExvb2t1cFdpdGhGYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIEZvbnRTZWxl
Y3Rpb25SZXF1ZXN0IHJlcXVlc3QsIGZsb2F0IHNpemUpCiB7CiAgICAgY29uc3QgYXV0byYgd2hp
dGVsaXN0ID0gZm9udFdoaXRlbGlzdCgpOwogICAgIGlmICghaXNTeXN0ZW1Gb250KGZhbWlseSkg
JiYgd2hpdGVsaXN0LnNpemUoKSAmJiAhd2hpdGVsaXN0LmNvbnRhaW5zKGZhbWlseSkpCi0gICAg
ICAgIHJldHVybiBudWxscHRyOworICAgICAgICByZXR1cm4geyBudWxscHRyIH07CiAKICNpZiBT
SE9VTERfVVNFX0NPUkVfVEVYVF9GT05UX0xPT0tVUAogICAgIENURm9udFN5bWJvbGljVHJhaXRz
IHRyYWl0cyA9IChpc0ZvbnRXZWlnaHRCb2xkKHJlcXVlc3Qud2VpZ2h0KSA/IGtDVEZvbnRUcmFp
dEJvbGQgOiAwKSB8IChpc0l0YWxpYyhyZXF1ZXN0LnNsb3BlKSA/IGtDVEZvbnRUcmFpdEl0YWxp
YyA6IDApOwotICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZUZvckNTUyhmYW1pbHkuc3Ry
aW5nKCkuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KHJlcXVlc3Qu
d2VpZ2h0KSwgdHJhaXRzLCBzaXplKSk7CisgICAgcmV0dXJuIHsgYWRvcHRDRihDVEZvbnRDcmVh
dGVGb3JDU1MoZmFtaWx5LnN0cmluZygpLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIHN0YXRpY19j
YXN0PGZsb2F0PihyZXF1ZXN0LndlaWdodCksIHRyYWl0cywgc2l6ZSkpIH07CiAjZWxzZQogICAg
IGNvbnN0IGF1dG8mIGZhbWlseUZvbnRzID0gRm9udERhdGFiYXNlOjpzaW5nbGV0b24oKS5jb2xs
ZWN0aW9uRm9yRmFtaWx5KGZhbWlseS5zdHJpbmcoKSk7CiAgICAgaWYgKGZhbWlseUZvbnRzLmlz
RW1wdHkoKSkgewpAQCAtMTEzNiwyOSArMTE0MiwyOSBAQCBzdGF0aWMgUmV0YWluUHRyPENURm9u
dFJlZj4gcGxhdGZvcm1Gb250TG9va3VwV2l0aEZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZh
bQogICAgICAgICAvLyBidXQgaWYgYSA8Yj4gYXBwZWFycyBhcyBhIGRlc2NlbmRlbnQgZWxlbWVu
dCwgaXQgd2lsbCBiZSBob25vcmVkIHRvby4KICAgICAgICAgY29uc3QgYXV0byYgcG9zdFNjcmlw
dEZvbnQgPSBGb250RGF0YWJhc2U6OnNpbmdsZXRvbigpLmZvbnRGb3JQb3N0U2NyaXB0TmFtZShm
YW1pbHkpOwogICAgICAgICBpZiAoIXBvc3RTY3JpcHRGb250LmZvbnREZXNjcmlwdG9yKQotICAg
ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICByZXR1cm4geyBudWxscHRyIH07
CiAgICAgICAgIGlmICgoaXNJdGFsaWMocmVxdWVzdC5zbG9wZSkgJiYgIWlzSXRhbGljKHBvc3RT
Y3JpcHRGb250LmNhcGFiaWxpdGllcy5zbG9wZS5tYXhpbXVtKSkKICAgICAgICAgICAgIHx8IChp
c0ZvbnRXZWlnaHRCb2xkKHJlcXVlc3Qud2VpZ2h0KSAmJiAhaXNGb250V2VpZ2h0Qm9sZChwb3N0
U2NyaXB0Rm9udC5jYXBhYmlsaXRpZXMud2VpZ2h0Lm1heGltdW0pKSkgewogICAgICAgICAgICAg
YXV0byBwb3N0U2NyaXB0RmFtaWx5TmFtZSA9IGFkb3B0Q0Yoc3RhdGljX2Nhc3Q8Q0ZTdHJpbmdS
ZWY+KENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlKHBvc3RTY3JpcHRGb250LmZvbnREZXNj
cmlwdG9yLmdldCgpLCBrQ1RGb250RmFtaWx5TmFtZUF0dHJpYnV0ZSkpKTsKICAgICAgICAgICAg
IGlmICghcG9zdFNjcmlwdEZhbWlseU5hbWUpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG51bGxw
dHI7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsgbnVsbHB0ciB9OwogICAgICAgICAgICAgY29u
c3QgYXV0byYgZmFtaWx5Rm9udHMgPSBGb250RGF0YWJhc2U6OnNpbmdsZXRvbigpLmNvbGxlY3Rp
b25Gb3JGYW1pbHkoU3RyaW5nKHBvc3RTY3JpcHRGYW1pbHlOYW1lLmdldCgpKSk7CiAgICAgICAg
ICAgICBpZiAoZmFtaWx5Rm9udHMuaXNFbXB0eSgpKQotICAgICAgICAgICAgICAgIHJldHVybiBu
dWxscHRyOworICAgICAgICAgICAgICAgIHJldHVybiB7IG51bGxwdHIgfTsKICAgICAgICAgICAg
IGlmIChjb25zdCBhdXRvKiBpbnN0YWxsZWRGb250ID0gZmluZENsb3Nlc3RGb250KGZhbWlseUZv
bnRzLCByZXF1ZXN0KSkgewogICAgICAgICAgICAgICAgIGlmICghaW5zdGFsbGVkRm9udC0+Zm9u
dERlc2NyaXB0b3IpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAg
ICAgICAgICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihp
bnN0YWxsZWRGb250LT5mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpOworICAg
ICAgICAgICAgICAgICAgICByZXR1cm4geyBudWxscHRyIH07CisgICAgICAgICAgICAgICAgcmV0
dXJuIHsgYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3IoaW5zdGFsbGVkRm9u
dC0+Zm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIpKSwgdHJ1ZSB9OwogICAgICAg
ICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICByZXR1cm4g
eyBudWxscHRyIH07CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIGFkb3B0Q0YoQ1RGb250Q3Jl
YXRlV2l0aEZvbnREZXNjcmlwdG9yKHBvc3RTY3JpcHRGb250LmZvbnREZXNjcmlwdG9yLmdldCgp
LCBzaXplLCBudWxscHRyKSk7CisgICAgICAgIHJldHVybiB7IGFkb3B0Q0YoQ1RGb250Q3JlYXRl
V2l0aEZvbnREZXNjcmlwdG9yKHBvc3RTY3JpcHRGb250LmZvbnREZXNjcmlwdG9yLmdldCgpLCBz
aXplLCBudWxscHRyKSksIHRydWUgfTsKICAgICB9CiAKICAgICBpZiAoY29uc3QgYXV0byogaW5z
dGFsbGVkRm9udCA9IGZpbmRDbG9zZXN0Rm9udChmYW1pbHlGb250cywgcmVxdWVzdCkpCi0gICAg
ICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihpbnN0YWxs
ZWRGb250LT5mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpOworICAgICAgICBy
ZXR1cm4geyBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihpbnN0YWxsZWRG
b250LT5mb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpLCBmYWxzZSB9OwogCi0g
ICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIHsgbnVsbHB0ciB9OwogI2VuZGlmCiB9CiAK
QEAgLTExODQsMTAgKzExOTAsMTEgQEAgc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGZvbnRX
aXRoRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5LCBjb25zdCBGb24KICAgICAgICAg
cmV0dXJuIG51bGxwdHI7CiAKICAgICBjb25zdCBhdXRvJiByZXF1ZXN0ID0gZm9udERlc2NyaXB0
aW9uLmZvbnRTZWxlY3Rpb25SZXF1ZXN0KCk7Ci0gICAgYXV0byBmb3VuZEZvbnQgPSBwbGF0Zm9y
bUZvbnRXaXRoRmFtaWx5U3BlY2lhbENhc2UoZmFtaWx5LCByZXF1ZXN0LCBzaXplKTsKLSAgICBp
ZiAoIWZvdW5kRm9udCkKLSAgICAgICAgZm91bmRGb250ID0gcGxhdGZvcm1Gb250TG9va3VwV2l0
aEZhbWlseShmYW1pbHksIHJlcXVlc3QsIHNpemUpOwotICAgIHJldHVybiBwcmVwYXJlUGxhdGZv
cm1Gb250KGZvdW5kRm9udC5nZXQoKSwgZm9udERlc2NyaXB0aW9uLCBmb250RmFjZUZlYXR1cmVz
LCBmb250RmFjZVZhcmlhbnRTZXR0aW5ncywgZm9udEZhY2VDYXBhYmlsaXRpZXMsIHNpemUpOwor
ICAgIEZvbnRMb29rdXAgZm9udExvb2t1cDsKKyAgICBmb250TG9va3VwLnJlc3VsdCA9IHBsYXRm
b3JtRm9udFdpdGhGYW1pbHlTcGVjaWFsQ2FzZShmYW1pbHksIHJlcXVlc3QsIHNpemUpOworICAg
IGlmICghZm9udExvb2t1cC5yZXN1bHQpCisgICAgICAgIGZvbnRMb29rdXAgPSBwbGF0Zm9ybUZv
bnRMb29rdXBXaXRoRmFtaWx5KGZhbWlseSwgcmVxdWVzdCwgc2l6ZSk7CisgICAgcmV0dXJuIHBy
ZXBhcmVQbGF0Zm9ybUZvbnQoZm9udExvb2t1cC5yZXN1bHQuZ2V0KCksIGZvbnREZXNjcmlwdGlv
biwgZm9udEZhY2VGZWF0dXJlcywgZm9udEZhY2VWYXJpYW50U2V0dGluZ3MsIGZvbnRGYWNlQ2Fw
YWJpbGl0aWVzLCBzaXplLCAhZm9udExvb2t1cC5jcmVhdGVkRnJvbVBvc3RTY3JpcHROYW1lKTsK
IH0KIAogI2lmIFBMQVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1MDE2YWJhNTA3ODA0ODU2ODk2YjUwMTk2
YmJhZjRmNDBhNTRmNTcwLi4wNjgyM2JhOWRmNGMxNDExOGQ5MDQ3NTgxNTcyMmViMzU4YmFjZGNk
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDctMDIgIE15bGVzIEMuIE1heGZpZWxkICA8
bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKFZhcmlhdGlvbiBGb250
cyk6IFNwZWNpZnlpbmcgU2tpYSBieSBQb3N0U2NyaXB0IG5hbWUgZG9lcyBub3QgeWllbGQgdGhl
IGV4cGVjdGVkIHJlc3VsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MTc0MDc5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzA0MDg1ND4KKworICAg
ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvdGV4dC92
YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1lLWV4cGVjdGVkLW1pc21hdGNoLmh0bWw6IEFk
ZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1l
Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4cGVj
dGF0aW9uczoKKwogMjAxNy0wNy0wMSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBw
bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIxODM3MSk6IFJlZWRlcidzIGRlZmF1bHQg
Zm9udCBpcyBUaW1lcyBpbnN0ZWFkIG9mIFNhbiBGcmFuY2lzY28KZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL2Zhc3QvdGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1lLWV4cGVjdGVk
LW1pc21hdGNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdmFyaWF0aW9ucy9za2lhLXBv
c3RzY3JpcHQtbmFtZS1leHBlY3RlZC1taXNtYXRjaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0
CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI5NzUxZTI1
ZDdmZTkyYzYwYWRhOGUzOTJkMjI2NzhhYzVmNTk4YjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv
dXRUZXN0cy9mYXN0L3RleHQvdmFyaWF0aW9ucy9za2lhLXBvc3RzY3JpcHQtbmFtZS1leHBlY3Rl
ZC1taXNtYXRjaC5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K
KzxoZWFkPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJmb250OiAxMDBweCAnU2tpYSc7
Ij5lPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh
c3QvdGV4dC92YXJpYXRpb25zL3NraWEtcG9zdHNjcmlwdC1uYW1lLmh0bWwgYi9MYXlvdXRUZXN0
cy9mYXN0L3RleHQvdmFyaWF0aW9ucy9za2lhLXBvc3RzY3JpcHQtbmFtZS5odG1sCm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLmYwNGVkZGI5MDBlZWFmOTNlZWI2ODAyMjBhMTFmODk0ZTMwNGQ3N2YKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvdmFyaWF0aW9ucy9za2lhLXBvc3RzY3JpcHQt
bmFtZS5odG1sCkBAIC0wLDAgKzEsOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk
PgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJmb250OiAxMDBweCAnU2tpYS1SZWd1bGFy
X0xpZ2h0LUV4dGVuZGVkJzsiPmU8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9ucyBiL0xh
eW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0b3IvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBh
ZmMyMDMyYWE1NDEzYTg3Yzc4ZGIwNWFkMDIyZDc1ZTk0MDVkNzRhLi5iZWJiOTU2ZjBmODNhOGZi
ZmFkMjg1OTlkMjc2YjM5ZDQ2OGZmZjE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y
bS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv
cm0vaW9zLXNpbXVsYXRvci9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMzksMyArMTM5LDYgQEAgaHR0
cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvV2ViQXNzZW1ibHktYmxvY2tl
ZC1pbi1hYm91dC1ibGFuay1pZnIKIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5
UG9saWN5L1dlYkFzc2VtYmx5LWJsb2NrZWQtaW4tZXh0ZXJuYWwtc2NyaXB0Lmh0bWwgWyBGYWls
dXJlIF0KIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L1dlYkFzc2Vt
Ymx5LWJsb2NrZWQtaW4tc3ViZnJhbWUuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy9zZWN1
cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvV2ViQXNzZW1ibHktYmxvY2tlZC5odG1sIFsgRmFp
bHVyZSBdCisKKyMgVGhpcyB0ZXN0IHJlcXVpcmVzIFNraWEsIHdoaWNoIGlzbid0IGF2YWlsYWJs
ZSBvbiBpT1MuCit3ZWJraXQub3JnL2IvMTc0MDc5IGZhc3QvdGV4dC92YXJpYXRpb25zL3NraWEt
cG9zdHNjcmlwdC1uYW1lLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>
<flag name="review"
          id="335311"
          type_id="1"
          status="+"
          setter="achristensen"
    />
          </attachment>
      

    </bug>

</bugzilla>