<?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>227385</bug_id>
          
          <creation_ts>2021-06-24 23:04:38 -0700</creation_ts>
          <short_desc>[macOS] -[NSString _web_widthWithFont:] returns 0</short_desc>
          <delta_ts>2021-06-25 17:09:26 -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>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1772554</commentid>
    <comment_count>0</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-24 23:04:38 -0700</bug_when>
    <thetext>[macOS] -[NSString _web_widthWithFont:] returns 0 for Thai text</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772555</commentid>
    <comment_count>1</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-24 23:05:10 -0700</bug_when>
    <thetext>&lt;rdar://problem/79430938&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772557</commentid>
    <comment_count>2</comment_count>
      <attachid>432239</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-24 23:05:46 -0700</bug_when>
    <thetext>Created attachment 432239
Test</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772558</commentid>
    <comment_count>3</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-24 23:05:49 -0700</bug_when>
    <thetext>&lt;rdar://problem/79430938&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772562</commentid>
    <comment_count>4</comment_count>
      <attachid>432241</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-24 23:39:33 -0700</bug_when>
    <thetext>Created attachment 432241
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772563</commentid>
    <comment_count>5</comment_count>
      <attachid>432242</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-24 23:40:38 -0700</bug_when>
    <thetext>Created attachment 432242
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772739</commentid>
    <comment_count>6</comment_count>
      <attachid>432285</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-25 12:23:50 -0700</bug_when>
    <thetext>Created attachment 432285
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772790</commentid>
    <comment_count>7</comment_count>
      <attachid>432303</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-25 16:01:22 -0700</bug_when>
    <thetext>Created attachment 432303
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772802</commentid>
    <comment_count>8</comment_count>
      <attachid>432303</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-06-25 16:20:05 -0700</bug_when>
    <thetext>Comment on attachment 432303
Patch

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

&gt; Tools/TestWebKitAPI/Tests/mac/StringWidth.mm:38
&gt; +    EXPECT_GE(result, 3);

3 seems a little small?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772807</commentid>
    <comment_count>9</comment_count>
      <attachid>432308</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-25 16:25:17 -0700</bug_when>
    <thetext>Created attachment 432308
Patch for committing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772808</commentid>
    <comment_count>10</comment_count>
      <attachid>432309</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-06-25 16:26:49 -0700</bug_when>
    <thetext>Created attachment 432309
Patch for committing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772823</commentid>
    <comment_count>11</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-25 17:09:24 -0700</bug_when>
    <thetext>Committed r279301 (239177@main): &lt;https://commits.webkit.org/239177@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 432309.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432239</attachid>
            <date>2021-06-24 23:05:46 -0700</date>
            <delta_ts>2021-06-24 23:39:32 -0700</delta_ts>
            <desc>Test</desc>
            <filename>bug-227385-20210624230545.patch</filename>
            <type>text/plain</type>
            <size>6656</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2RjZGY5MTg3MDhkMjA3MWUyOWJiMTA5NzBmOGZjOGNl
NTMyNGQ2Yy4uNjNhMjE4MTY1MjgyNjdlYjZmMzQ5YjQyMmYxODZjOGMyN2E1NTNkNiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1
IEBACisyMDIxLTA2LTI0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+
CisKKyAgICAgICAgW21hY09TXSAtW05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVy
bnMgMCBmb3IgVGhhaSB0ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMjczODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc5NDMwOTM4PgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktp
dEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICog
VGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5nV2lkdGgubW06IEFkZGVkLgorICAgICAgICAo
VEVTVCk6CisKIDIwMjEtMDYtMjQgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBs
ZS5jb20+CiAKICAgICAgICAgV0tXZWJWaWV3IGxvYWRTaW11bGF0ZWRSZXF1ZXN0IGRvZXMgbm90
IHNldCBhdHRyaWJ1dGlvbiB2YWx1ZSBmb3IgdXJsIHJlcXVlc3RzIHdpdGhpbiBodG1sIGNvbnRl
bnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXBy
b2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhj
b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDllN2U0YTlkZmZhYmU2YzJiYmRmMGM5ZDYz
OGRjY2I2ODg2MWY2NS4uMWMxZjgwOGRiYTFmMTRiY2QzYzJhNDI0ODIxMzY3MjZjYzFiOWIwZSAx
MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9w
cm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhj
b2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTExNyw2ICsxMTcsNyBAQAogCQkxQzc5MjAxQzIz
NEJERDlCMDAxRUFGMjMgLyogQ29weVJURi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1
aWxkRmlsZTsgZmlsZVJlZiA9IDFDNzkyMDFCMjM0QkREOUIwMDFFQUYyMyAvKiBDb3B5UlRGLm1t
ICovOyB9OwogCQkxQzdGRUIyMDIwN0MwRjJFMDBEMjMyNzggLyogQmFja2dyb3VuZENvbG9yLm1t
IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM3RkVCMUYy
MDdDMEYyRDAwRDIzMjc4IC8qIEJhY2tncm91bmRDb2xvci5tbSAqLzsgfTsKIAkJMUM4MTgwMjcy
NUZCMDlFMjAwNjA4QjNFIC8qIEZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbSBpbiBTb3VyY2Vz
ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDODE4MDI2MjVGQjA5RTIwMDYw
OEIzRSAvKiBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0gKi87IH07CisJCTFDOEZBNTNBMjY4
NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdXaWR0aC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC
WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDOEZBNTM5MjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdX
aWR0aC5tbSAqLzsgfTsKIAkJMUM5MDQyMEMyMzI2RTAzQzAwQkVGOTFFIC8qIFNlbGVjdGlvbkJ5
V29yZC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFD
OTA0MjBCMjMyNkUwM0MwMEJFRjkxRSAvKiBTZWxlY3Rpb25CeVdvcmQubW0gKi87IH07CiAJCTFD
OUVCODQxMUUzODBEQTEwMDVDNjQ0MiAvKiBDb21wbGV4VGV4dENvbnRyb2xsZXIuY3BwIGluIFNv
dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM5RUI4NDAxRTM4MERB
MTAwNUM2NDQyIC8qIENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgKi87IH07CiAJCTFDQUNBREEx
MjMwNjIwQUUwMDA3RDU0QyAvKiBXS1dlYlZpZXdPcGFxdWUubW0gaW4gU291cmNlcyAqLyA9IHtp
c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQ0FDQURBMDIzMDYyMEFEMDAwN0Q1NEMgLyog
V0tXZWJWaWV3T3BhcXVlLm1tICovOyB9OwpAQCAtMTg3Myw2ICsxODc0LDcgQEAKIAkJMUM3OTIw
MUIyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy
ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw
cC5vYmpjcHA7IHBhdGggPSBDb3B5UlRGLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog
CQkxQzdGRUIxRjIwN0MwRjJEMDBEMjMyNzggLyogQmFja2dyb3VuZENvbG9yLm1tICovID0ge2lz
YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl
ID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQmFja2dyb3VuZENvbG9yLm1tOyBzb3Vy
Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzgxODAyNjI1RkIwOUUyMDA2MDhCM0UgLyogRm9u
dFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxh
c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gRm9udFJlZ2lz
dHJ5U2FuZGJveENoZWNrLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQzhGQTUz
OTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJl
ZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGgg
PSBTdHJpbmdXaWR0aC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUM5MDQyMEIy
MzI2RTAzQzAwQkVGOTFFIC8qIFNlbGVjdGlvbkJ5V29yZC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxl
UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv
ZGUuY3BwLm9iamNwcDsgcGF0aCA9IFNlbGVjdGlvbkJ5V29yZC5tbTsgc291cmNlVHJlZSA9ICI8
Z3JvdXA+IjsgfTsKIAkJMUM5RUI4NDAxRTM4MERBMTAwNUM2NDQyIC8qIENvbXBsZXhUZXh0Q29u
dHJvbGxlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDb21wbGV4
VGV4dENvbnRyb2xsZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQ0FDQURB
MDIzMDYyMEFEMDAwN0Q1NEMgLyogV0tXZWJWaWV3T3BhcXVlLm1tICovID0ge2lzYSA9IFBCWEZp
bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl
Y29kZS5jcHAub2JqY3BwOyBwYXRoID0gV0tXZWJWaWV3T3BhcXVlLm1tOyBzb3VyY2VUcmVlID0g
Ijxncm91cD4iOyB9OwpAQCAtNDc2Miw2ICs0NzY0LDcgQEAKIAkJCQlFMTk0RTFCQTE3N0U1MTQ1
MDA5QzRENEUgLyogU3RvcExvYWRpbmdGcm9tRGlkUmVjZWl2ZVJlc3BvbnNlLm1tICovLAogCQkJ
CTM3OTlBRDM5MTQxMjBBNDMwMDVFQjBDNiAvKiBTdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0
RnJvbVN0cmluZy5tbSAqLywKIAkJCQk5MzlCRkUzOTE4RTU1NDg5MDA4ODMyNzUgLyogU3RyaW5n
VHJ1bmNhdG9yLm1tICovLAorCQkJCTFDOEZBNTM5MjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdX
aWR0aC5tbSAqLywKIAkJCQkzN0E2ODk1RDE0OEE5QjUwMDA1MTAwRkEgLyogU3VicmVzb3VyY2VF
cnJvckNyYXNoLm1tICovLAogCQkJCUU0OTAyOTY3MTRFMkUzQTQwMDJCRUREMSAvKiBUeXBpbmdT
dHlsZUNyYXNoLm1tICovLAogCQkJCTUzNjc3MDMzMUNDODAyMjgwMEQ0MjVCMSAvKiBXZWJTY3Jp
cHRPYmplY3REZXNjcmlwdGlvbi5tbSAqLywKQEAgLTU3NjcsNiArNTc3MCw3IEBACiAJCQkJN0ND
RTdFRDAxQTQxMUE3RTAwNDQ3QzRDIC8qIFN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9t
U3RyaW5nLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJN0NDRTdFRDExQTQxMUE3RTAwNDQ3QzRDIC8q
IFN0cmluZ1RydW5jYXRvci5tbSBpbiBTb3VyY2VzICovLAogCQkJCUVDQTY4MENFMUU2OENDMDkw
MDczMUQyMCAvKiBTdHJpbmdVdGlsaXRpZXMubW0gaW4gU291cmNlcyAqLywKKwkJCQkxQzhGQTUz
QTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgubW0gaW4gU291cmNlcyAqLywKIAkJCQlD
RTRENURFNzFGNjc0M0JBMDA3MkNGQzYgLyogU3RyaW5nV2l0aERpcmVjdGlvbi5jcHAgaW4gU291
cmNlcyAqLywKIAkJCQk0MUU2N0E4NTI1RDE2RTgzMDA3QjBBNEMgLyogU1RVTk1lc3NhZ2VQYXJz
aW5nVGVzdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3Q0NFN0VEMjFBNDExQTdFMDA0NDdDNEMg
LyogU3VicmVzb3VyY2VFcnJvckNyYXNoLm1tIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9U
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdXaWR0aC5tbSBiL1Rvb2xzL1Rlc3RX
ZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmluZ1dpZHRoLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu
ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI3OGNiYzNiODIy
NzcwMzM2YjU3OTJlYjI4YTJiNzgyNTg0OGRmOTkKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9U
ZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdXaWR0aC5tbQpAQCAtMCwwICsxLDQxIEBACisv
KgorICogQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K
KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z
LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl
ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz
dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0
CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n
IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy
ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg
Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j
dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry
aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g
QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q
TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ
TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB
UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ
UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU
LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR
VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F
TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB
LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF
RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU
LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF
UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU
V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B
R0UuCisgKi8KKworI2ltcG9ydCAiY29uZmlnLmgiCisKKyNpZiBQTEFURk9STShNQUMpCisKKyNp
bXBvcnQgPEFwcEtpdC9BcHBLaXQuaD4KKyNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5o
PgorI2ltcG9ydCA8V2ViS2l0L1dlYktpdE5TU3RyaW5nRXh0cmFzLmg+CisKK1RFU1QoV2ViS2l0
TGVnYWN5U3RyaW5nV2lkdGgsIFRoYWlXaWR0aEZvcldlYikKK3sKKyAgICBOU1N0cmluZyAqdGVz
dFN0cmluZyA9IEAi4LiE4LmJ4LiZ4Lir4Liy4LmD4LiZIjsKKyAgICBmbG9hdCByZXN1bHQgPSBb
dGVzdFN0cmluZyBfd2ViX3dpZHRoV2l0aEZvbnQ6W05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOjE2
XV07CisgICAgRVhQRUNUX0dFKHJlc3VsdCwgMyk7Cit9CisKKyNlbmRpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432241</attachid>
            <date>2021-06-24 23:39:33 -0700</date>
            <delta_ts>2021-06-24 23:40:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227385-20210624233932.patch</filename>
            <type>text/plain</type>
            <size>8775</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNGYwZjg2NDFiZGU1
YzM4Y2YxNzFmZmVlYzVmZjY3ZTc2MzY1NS4uNDJlNDA4MWU5MWMwNTYyNWJmZDNhNjZjMTUyNTQ1
ZDBhNDAzZjBkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTI0ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSAt
W05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVybnMgMAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQzMDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBTaW1wbHkgdGFrZSB0aGUgaU9TIGNvZGVwYXRoIG9uIG1hY09TLgorCisgICAg
ICAgIFRlc3Q6IFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLlRoYWlXaWR0aEZvcldlYgorCisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6Rm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKToKKwogMjAyMS0wNi0yNCAgVmVua3kgRGFzcyAg
PHlhcmFuYW1hdmVua2F0YXJhbWFuYUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gSURC
VHJhbnNhY3Rpb246OmRpc3BhdGNoRXZlbnQgd2hlbiBtX29wZW5EQlJlcXVlc3QgaXMgbnVsbC4g
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk
ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAK
aW5kZXggMDMwYzU3NTAxNTE1NmUyNjY5ZDEwNTc2YWJmODBhYzg2NTkyYWIzMC4uYTFmOWY4OWZi
MjE0MDA3N2E2YWFiMzMxYTI1ZTAxYzYxMjBlMTg2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtODksMTkgKzg5LDE2IEBAIEZv
bnRDYXNjYWRlOjpGb250Q2FzY2FkZShGb250Q2FzY2FkZURlc2NyaXB0aW9uJiYgZmQsIGZsb2F0
IGxldHRlclNwYWNpbmcsIGZsb2F0CiB7CiB9CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgbWFrZSB0
aGlzIGNvbnN0cnVjdG9yIHBsYXRmb3JtLWluZGVwZW5kZW50LgogRm9udENhc2NhZGU6OkZvbnRD
YXNjYWRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnREYXRhLCBGb250U21vb3RoaW5nTW9k
ZSBmb250U21vb3RoaW5nTW9kZSkKICAgICA6IG1fZm9udHMoRm9udENhc2NhZGVGb250czo6Y3Jl
YXRlRm9yUGxhdGZvcm1Gb250KGZvbnREYXRhKSkKICAgICAsIG1fZW5hYmxlS2VybmluZyhjb21w
dXRlRW5hYmxlS2VybmluZygpKQogICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoY29tcHV0ZVJlcXVp
cmVzU2hhcGluZygpKQogewogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhpbmco
Zm9udFNtb290aGluZ01vZGUpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgbV9mb250
RGVzY3JpcHRpb24uc2V0U3BlY2lmaWVkU2l6ZShDVEZvbnRHZXRTaXplKGZvbnREYXRhLmZvbnQo
KSkpOwogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShDVEZvbnRHZXRTaXpl
KGZvbnREYXRhLmZvbnQoKSkpOwogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldElzSXRhbGljKENU
Rm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnREYXRhLmZvbnQoKSkgJiBrQ1RGb250VHJhaXRJdGFs
aWMpOwogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldFdlaWdodCgoQ1RGb250R2V0U3ltYm9saWNU
cmFpdHMoZm9udERhdGEuZm9udCgpKSAmIGtDVEZvbnRUcmFpdEJvbGQpID8gYm9sZFdlaWdodFZh
bHVlKCkgOiBub3JtYWxXZWlnaHRWYWx1ZSgpKTsKLSNlbmRpZgogfQogCiBGb250Q2FzY2FkZTo6
Rm9udENhc2NhZGUoY29uc3QgRm9udENhc2NhZGUmIG90aGVyKQpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNkY2RmOTE4NzA4ZDIwNzFlMjliYjEw
OTcwZjhmYzhjZTUzMjRkNmMuLjYzYTIxODE2NTI4MjY3ZWI2ZjM0OWI0MjJmMTg2YzhjMjdhNTUz
ZDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNSBAQAorMjAyMS0wNi0yNCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRA
YXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gLVtOU1N0cmluZyBfd2ViX3dpZHRoV2l0aEZv
bnQ6XSByZXR1cm5zIDAgZm9yIFRoYWkgdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83OTQz
MDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgor
ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmluZ1dpZHRoLm1tOiBBZGRlZC4K
KyAgICAgICAgKFRFU1QpOgorCiAyMDIxLTA2LTI0ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9j
aGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFdLV2ViVmlldyBsb2FkU2ltdWxhdGVkUmVxdWVz
dCBkb2VzIG5vdCBzZXQgYXR0cmlidXRpb24gdmFsdWUgZm9yIHVybCByZXF1ZXN0cyB3aXRoaW4g
aHRtbCBjb250ZW50CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRB
UEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl
YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDQ5ZTdlNGE5ZGZmYWJlNmMy
YmJkZjBjOWQ2MzhkY2NiNjg4NjFmNjUuLjFjMWY4MDhkYmExZjE0YmNkM2MyYTQyNDgyMTM2NzI2
Y2MxYjliMGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54
Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl
YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMTcsNiArMTE3LDcgQEAKIAkJ
MUM3OTIwMUMyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0gaW4gU291cmNlcyAqLyA9IHtp
c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzc5MjAxQjIzNEJERDlCMDAxRUFGMjMgLyog
Q29weVJURi5tbSAqLzsgfTsKIAkJMUM3RkVCMjAyMDdDMEYyRTAwRDIzMjc4IC8qIEJhY2tncm91
bmRDb2xvci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9
IDFDN0ZFQjFGMjA3QzBGMkQwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gKi87IH07CiAJ
CTFDODE4MDI3MjVGQjA5RTIwMDYwOEIzRSAvKiBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0g
aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzgxODAyNjI1
RkIwOUUyMDA2MDhCM0UgLyogRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tICovOyB9OworCQkx
QzhGQTUzQTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgubW0gaW4gU291cmNlcyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzhGQTUzOTI2ODVBNkQ1MDBCN0U0OUUg
LyogU3RyaW5nV2lkdGgubW0gKi87IH07CiAJCTFDOTA0MjBDMjMyNkUwM0MwMEJFRjkxRSAvKiBT
ZWxlY3Rpb25CeVdvcmQubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp
bGVSZWYgPSAxQzkwNDIwQjIzMjZFMDNDMDBCRUY5MUUgLyogU2VsZWN0aW9uQnlXb3JkLm1tICov
OyB9OwogCQkxQzlFQjg0MTFFMzgwREExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVy
LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDOUVC
ODQwMUUzODBEQTEwMDVDNjQ0MiAvKiBDb21wbGV4VGV4dENvbnRyb2xsZXIuY3BwICovOyB9Owog
CQkxQ0FDQURBMTIzMDYyMEFFMDAwN0Q1NEMgLyogV0tXZWJWaWV3T3BhcXVlLm1tIGluIFNvdXJj
ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUNBQ0FEQTAyMzA2MjBBRDAw
MDdENTRDIC8qIFdLV2ViVmlld09wYXF1ZS5tbSAqLzsgfTsKQEAgLTE4NzMsNiArMTg3NCw3IEBA
CiAJCTFDNzkyMDFCMjM0QkREOUIwMDFFQUYyMyAvKiBDb3B5UlRGLm1tICovID0ge2lzYSA9IFBC
WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291
cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ29weVJURi5tbTsgc291cmNlVHJlZSA9ICI8Z3Jv
dXA+IjsgfTsKIAkJMUM3RkVCMUYyMDdDMEYyRDAwRDIzMjc4IC8qIEJhY2tncm91bmRDb2xvci5t
bSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v
d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEJhY2tncm91bmRDb2xv
ci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUM4MTgwMjYyNUZCMDlFMjAwNjA4
QjNFIC8qIEZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm
ZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9
IEZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK
KwkJMUM4RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tICovID0ge2lzYSA9
IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2Jq
Y3BwOyBwYXRoID0gU3RyaW5nV2lkdGgubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ
CTFDOTA0MjBCMjMyNkUwM0MwMEJFRjkxRSAvKiBTZWxlY3Rpb25CeVdvcmQubW0gKi8gPSB7aXNh
ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg
PSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBTZWxlY3Rpb25CeVdvcmQubW07IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDOUVCODQwMUUzODBEQTEwMDVDNjQ0MiAvKiBDb21w
bGV4VGV4dENvbnRyb2xsZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF
bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRo
ID0gQ29tcGxleFRleHRDb250cm9sbGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK
IAkJMUNBQ0FEQTAyMzA2MjBBRDAwMDdENTRDIC8qIFdLV2ViVmlld09wYXF1ZS5tbSAqLyA9IHtp
c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw
ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLV2ViVmlld09wYXF1ZS5tbTsgc291
cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQ3NjIsNiArNDc2NCw3IEBACiAJCQkJRTE5NEUx
QkExNzdFNTE0NTAwOUM0RDRFIC8qIFN0b3BMb2FkaW5nRnJvbURpZFJlY2VpdmVSZXNwb25zZS5t
bSAqLywKIAkJCQkzNzk5QUQzOTE0MTIwQTQzMDA1RUIwQzYgLyogU3RyaW5nQnlFdmFsdWF0aW5n
SmF2YVNjcmlwdEZyb21TdHJpbmcubW0gKi8sCiAJCQkJOTM5QkZFMzkxOEU1NTQ4OTAwODgzMjc1
IC8qIFN0cmluZ1RydW5jYXRvci5tbSAqLywKKwkJCQkxQzhGQTUzOTI2ODVBNkQ1MDBCN0U0OUUg
LyogU3RyaW5nV2lkdGgubW0gKi8sCiAJCQkJMzdBNjg5NUQxNDhBOUI1MDAwNTEwMEZBIC8qIFN1
YnJlc291cmNlRXJyb3JDcmFzaC5tbSAqLywKIAkJCQlFNDkwMjk2NzE0RTJFM0E0MDAyQkVERDEg
LyogVHlwaW5nU3R5bGVDcmFzaC5tbSAqLywKIAkJCQk1MzY3NzAzMzFDQzgwMjI4MDBENDI1QjEg
LyogV2ViU2NyaXB0T2JqZWN0RGVzY3JpcHRpb24ubW0gKi8sCkBAIC01NzY3LDYgKzU3NzAsNyBA
QAogCQkJCTdDQ0U3RUQwMUE0MTFBN0UwMDQ0N0M0QyAvKiBTdHJpbmdCeUV2YWx1YXRpbmdKYXZh
U2NyaXB0RnJvbVN0cmluZy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDQ0U3RUQxMUE0MTFBN0Uw
MDQ0N0M0QyAvKiBTdHJpbmdUcnVuY2F0b3IubW0gaW4gU291cmNlcyAqLywKIAkJCQlFQ0E2ODBD
RTFFNjhDQzA5MDA3MzFEMjAgLyogU3RyaW5nVXRpbGl0aWVzLm1tIGluIFNvdXJjZXMgKi8sCisJ
CQkJMUM4RkE1M0EyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tIGluIFNvdXJjZXMg
Ki8sCiAJCQkJQ0U0RDVERTcxRjY3NDNCQTAwNzJDRkM2IC8qIFN0cmluZ1dpdGhEaXJlY3Rpb24u
Y3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNDFFNjdBODUyNUQxNkU4MzAwN0IwQTRDIC8qIFNUVU5N
ZXNzYWdlUGFyc2luZ1Rlc3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJN0NDRTdFRDIxQTQxMUE3
RTAwNDQ3QzRDIC8qIFN1YnJlc291cmNlRXJyb3JDcmFzaC5tbSBpbiBTb3VyY2VzICovLApkaWZm
IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5nV2lkdGgubW0gYi9U
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdXaWR0aC5tbQpuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4y
NzhjYmMzYjgyMjc3MDMzNmI1NzkyZWIyOGEyYjc4MjU4NDhkZjk5Ci0tLSAvZGV2L251bGwKKysr
IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5nV2lkdGgubW0KQEAgLTAsMCAr
MSw0MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMg
cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp
bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0
ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6Cisg
KiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl
IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl
IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm
b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp
cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUK
KyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo
IHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB
UFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBS
RVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s
CisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT
UyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO
VCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1Ig
QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IK
KyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s
IFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G
IFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9X
RVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisg
KiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VO
Q0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9G
IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9G
IFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorCisjaWYgUExBVEZPUk0o
TUFDKQorCisjaW1wb3J0IDxBcHBLaXQvQXBwS2l0Lmg+CisjaW1wb3J0IDxGb3VuZGF0aW9uL0Zv
dW5kYXRpb24uaD4KKyNpbXBvcnQgPFdlYktpdC9XZWJLaXROU1N0cmluZ0V4dHJhcy5oPgorCitU
RVNUKFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLCBUaGFpV2lkdGhGb3JXZWIpCit7CisgICAgTlNT
dHJpbmcgKnRlc3RTdHJpbmcgPSBAIuC4hOC5ieC4meC4q+C4suC5g+C4mSI7CisgICAgZmxvYXQg
cmVzdWx0ID0gW3Rlc3RTdHJpbmcgX3dlYl93aWR0aFdpdGhGb250OltOU0ZvbnQgc3lzdGVtRm9u
dE9mU2l6ZToxNl1dOworICAgIEVYUEVDVF9HRShyZXN1bHQsIDMpOworfQorCisjZW5kaWYK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432242</attachid>
            <date>2021-06-24 23:40:38 -0700</date>
            <delta_ts>2021-06-25 12:23:48 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227385-20210624234037.patch</filename>
            <type>text/plain</type>
            <size>8761</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNGYwZjg2NDFiZGU1
YzM4Y2YxNzFmZmVlYzVmZjY3ZTc2MzY1NS4uNDJlNDA4MWU5MWMwNTYyNWJmZDNhNjZjMTUyNTQ1
ZDBhNDAzZjBkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTI0ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSAt
W05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVybnMgMAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQzMDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBTaW1wbHkgdGFrZSB0aGUgaU9TIGNvZGVwYXRoIG9uIG1hY09TLgorCisgICAg
ICAgIFRlc3Q6IFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLlRoYWlXaWR0aEZvcldlYgorCisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29y
ZTo6Rm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKToKKwogMjAyMS0wNi0yNCAgVmVua3kgRGFzcyAg
PHlhcmFuYW1hdmVua2F0YXJhbWFuYUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gSURC
VHJhbnNhY3Rpb246OmRpc3BhdGNoRXZlbnQgd2hlbiBtX29wZW5EQlJlcXVlc3QgaXMgbnVsbC4g
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk
ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAK
aW5kZXggMDMwYzU3NTAxNTE1NmUyNjY5ZDEwNTc2YWJmODBhYzg2NTkyYWIzMC4uYTFmOWY4OWZi
MjE0MDA3N2E2YWFiMzMxYTI1ZTAxYzYxMjBlMTg2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtODksMTkgKzg5LDE2IEBAIEZv
bnRDYXNjYWRlOjpGb250Q2FzY2FkZShGb250Q2FzY2FkZURlc2NyaXB0aW9uJiYgZmQsIGZsb2F0
IGxldHRlclNwYWNpbmcsIGZsb2F0CiB7CiB9CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgbWFrZSB0
aGlzIGNvbnN0cnVjdG9yIHBsYXRmb3JtLWluZGVwZW5kZW50LgogRm9udENhc2NhZGU6OkZvbnRD
YXNjYWRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnREYXRhLCBGb250U21vb3RoaW5nTW9k
ZSBmb250U21vb3RoaW5nTW9kZSkKICAgICA6IG1fZm9udHMoRm9udENhc2NhZGVGb250czo6Y3Jl
YXRlRm9yUGxhdGZvcm1Gb250KGZvbnREYXRhKSkKICAgICAsIG1fZW5hYmxlS2VybmluZyhjb21w
dXRlRW5hYmxlS2VybmluZygpKQogICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoY29tcHV0ZVJlcXVp
cmVzU2hhcGluZygpKQogewogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhpbmco
Zm9udFNtb290aGluZ01vZGUpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgbV9mb250
RGVzY3JpcHRpb24uc2V0U3BlY2lmaWVkU2l6ZShDVEZvbnRHZXRTaXplKGZvbnREYXRhLmZvbnQo
KSkpOwogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShDVEZvbnRHZXRTaXpl
KGZvbnREYXRhLmZvbnQoKSkpOwogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldElzSXRhbGljKENU
Rm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnREYXRhLmZvbnQoKSkgJiBrQ1RGb250VHJhaXRJdGFs
aWMpOwogICAgIG1fZm9udERlc2NyaXB0aW9uLnNldFdlaWdodCgoQ1RGb250R2V0U3ltYm9saWNU
cmFpdHMoZm9udERhdGEuZm9udCgpKSAmIGtDVEZvbnRUcmFpdEJvbGQpID8gYm9sZFdlaWdodFZh
bHVlKCkgOiBub3JtYWxXZWlnaHRWYWx1ZSgpKTsKLSNlbmRpZgogfQogCiBGb250Q2FzY2FkZTo6
Rm9udENhc2NhZGUoY29uc3QgRm9udENhc2NhZGUmIG90aGVyKQpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGNkY2RmOTE4NzA4ZDIwNzFlMjliYjEw
OTcwZjhmYzhjZTUzMjRkNmMuLjFiYzhhZjMzNzA2MjI1ZmQwZjQ1ZGZkNmVjZDM1NTRjZWJkODBh
NWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNSBAQAorMjAyMS0wNi0yNCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRA
YXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gLVtOU1N0cmluZyBfd2ViX3dpZHRoV2l0aEZv
bnQ6XSByZXR1cm5zIDAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIyNzM4NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzk0MzA5Mzg+CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ
L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0
V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdXaWR0aC5tbTogQWRkZWQuCisgICAgICAgIChURVNU
KToKKwogMjAyMS0wNi0yNCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNv
bT4KIAogICAgICAgICBXS1dlYlZpZXcgbG9hZFNpbXVsYXRlZFJlcXVlc3QgZG9lcyBub3Qgc2V0
IGF0dHJpYnV0aW9uIHZhbHVlIGZvciB1cmwgcmVxdWVzdHMgd2l0aGluIGh0bWwgY29udGVudApk
aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9w
cm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA0OWU3ZTRhOWRmZmFiZTZjMmJiZGYwYzlkNjM4ZGNj
YjY4ODYxZjY1Li4xYzFmODA4ZGJhMWYxNGJjZDNjMmE0MjQ4MjEzNjcyNmNjMWI5YjBlIDEwMDY0
NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2pl
Y3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMTE3LDYgKzExNyw3IEBACiAJCTFDNzkyMDFDMjM0QkRE
OUIwMDFFQUYyMyAvKiBDb3B5UlRGLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG
aWxlOyBmaWxlUmVmID0gMUM3OTIwMUIyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0gKi87
IH07CiAJCTFDN0ZFQjIwMjA3QzBGMkUwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gaW4g
U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzdGRUIxRjIwN0Mw
RjJEMDBEMjMyNzggLyogQmFja2dyb3VuZENvbG9yLm1tICovOyB9OwogCQkxQzgxODAyNzI1RkIw
OUUyMDA2MDhCM0UgLyogRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tIGluIFNvdXJjZXMgKi8g
PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM4MTgwMjYyNUZCMDlFMjAwNjA4QjNF
IC8qIEZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbSAqLzsgfTsKKwkJMUM4RkE1M0EyNjg1QTZE
NTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp
bGRGaWxlOyBmaWxlUmVmID0gMUM4RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRo
Lm1tICovOyB9OwogCQkxQzkwNDIwQzIzMjZFMDNDMDBCRUY5MUUgLyogU2VsZWN0aW9uQnlXb3Jk
Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM5MDQy
MEIyMzI2RTAzQzAwQkVGOTFFIC8qIFNlbGVjdGlvbkJ5V29yZC5tbSAqLzsgfTsKIAkJMUM5RUI4
NDExRTM4MERBMTAwNUM2NDQyIC8qIENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgaW4gU291cmNl
cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzlFQjg0MDFFMzgwREExMDA1
QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVyLmNwcCAqLzsgfTsKIAkJMUNBQ0FEQTEyMzA2
MjBBRTAwMDdENTRDIC8qIFdLV2ViVmlld09wYXF1ZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9
IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDQUNBREEwMjMwNjIwQUQwMDA3RDU0QyAvKiBXS1dl
YlZpZXdPcGFxdWUubW0gKi87IH07CkBAIC0xODczLDYgKzE4NzQsNyBAQAogCQkxQzc5MjAxQjIz
NEJERDlCMDAxRUFGMjMgLyogQ29weVJURi5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl
OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9i
amNwcDsgcGF0aCA9IENvcHlSVEYubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFD
N0ZFQjFGMjA3QzBGMkQwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gKi8gPSB7aXNhID0g
UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz
b3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBCYWNrZ3JvdW5kQ29sb3IubW07IHNvdXJjZVRy
ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDODE4MDI2MjVGQjA5RTIwMDYwOEIzRSAvKiBGb250UmVn
aXN0cnlTYW5kYm94Q2hlY2subW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtu
b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBGb250UmVnaXN0cnlT
YW5kYm94Q2hlY2subW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFDOEZBNTM5MjY4
NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdXaWR0aC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl
bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFN0
cmluZ1dpZHRoLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzkwNDIwQjIzMjZF
MDNDMDBCRUY5MUUgLyogU2VsZWN0aW9uQnlXb3JkLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZl
cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j
cHAub2JqY3BwOyBwYXRoID0gU2VsZWN0aW9uQnlXb3JkLm1tOyBzb3VyY2VUcmVlID0gIjxncm91
cD4iOyB9OwogCQkxQzlFQjg0MDFFMzgwREExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9s
bGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs
YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENvbXBsZXhUZXh0
Q29udHJvbGxlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDQUNBREEwMjMw
NjIwQUQwMDA3RDU0QyAvKiBXS1dlYlZpZXdPcGFxdWUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJl
ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl
LmNwcC5vYmpjcHA7IHBhdGggPSBXS1dlYlZpZXdPcGFxdWUubW07IHNvdXJjZVRyZWUgPSAiPGdy
b3VwPiI7IH07CkBAIC00NzYyLDYgKzQ3NjQsNyBAQAogCQkJCUUxOTRFMUJBMTc3RTUxNDUwMDlD
NEQ0RSAvKiBTdG9wTG9hZGluZ0Zyb21EaWRSZWNlaXZlUmVzcG9uc2UubW0gKi8sCiAJCQkJMzc5
OUFEMzkxNDEyMEE0MzAwNUVCMEM2IC8qIFN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9t
U3RyaW5nLm1tICovLAogCQkJCTkzOUJGRTM5MThFNTU0ODkwMDg4MzI3NSAvKiBTdHJpbmdUcnVu
Y2F0b3IubW0gKi8sCisJCQkJMUM4RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRo
Lm1tICovLAogCQkJCTM3QTY4OTVEMTQ4QTlCNTAwMDUxMDBGQSAvKiBTdWJyZXNvdXJjZUVycm9y
Q3Jhc2gubW0gKi8sCiAJCQkJRTQ5MDI5NjcxNEUyRTNBNDAwMkJFREQxIC8qIFR5cGluZ1N0eWxl
Q3Jhc2gubW0gKi8sCiAJCQkJNTM2NzcwMzMxQ0M4MDIyODAwRDQyNUIxIC8qIFdlYlNjcmlwdE9i
amVjdERlc2NyaXB0aW9uLm1tICovLApAQCAtNTc2Nyw2ICs1NzcwLDcgQEAKIAkJCQk3Q0NFN0VE
MDFBNDExQTdFMDA0NDdDNEMgLyogU3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJp
bmcubW0gaW4gU291cmNlcyAqLywKIAkJCQk3Q0NFN0VEMTFBNDExQTdFMDA0NDdDNEMgLyogU3Ry
aW5nVHJ1bmNhdG9yLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJRUNBNjgwQ0UxRTY4Q0MwOTAwNzMx
RDIwIC8qIFN0cmluZ1V0aWxpdGllcy5tbSBpbiBTb3VyY2VzICovLAorCQkJCTFDOEZBNTNBMjY4
NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdXaWR0aC5tbSBpbiBTb3VyY2VzICovLAogCQkJCUNFNEQ1
REU3MUY2NzQzQkEwMDcyQ0ZDNiAvKiBTdHJpbmdXaXRoRGlyZWN0aW9uLmNwcCBpbiBTb3VyY2Vz
ICovLAogCQkJCTQxRTY3QTg1MjVEMTZFODMwMDdCMEE0QyAvKiBTVFVOTWVzc2FnZVBhcnNpbmdU
ZXN0LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTdDQ0U3RUQyMUE0MTFBN0UwMDQ0N0M0QyAvKiBT
dWJyZXNvdXJjZUVycm9yQ3Jhc2gubW0gaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmluZ1dpZHRoLm1tIGIvVG9vbHMvVGVzdFdlYktp
dEFQSS9UZXN0cy9tYWMvU3RyaW5nV2lkdGgubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjc4Y2JjM2I4MjI3NzAz
MzZiNTc5MmViMjhhMmI3ODI1ODQ4ZGY5OQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RX
ZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmluZ1dpZHRoLm1tCkBAIC0wLDAgKzEsNDEgQEAKKy8qCisg
KiBDb3B5cmlnaHQgKEMpIDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoK
KyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp
dGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo
YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmli
dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq
ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz
Y2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJv
ZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k
aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVu
dGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0
aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQg
SVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE
IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJ
RUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD
VUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg
SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElO
RElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5U
SUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP
RgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9S
IFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFO
RCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNU
UklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT
RSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF
LCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K
KyAqLworCisjaW1wb3J0ICJjb25maWcuaCIKKworI2lmIFBMQVRGT1JNKE1BQykKKworI2ltcG9y
dCA8QXBwS2l0L0FwcEtpdC5oPgorI2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+Cisj
aW1wb3J0IDxXZWJLaXQvV2ViS2l0TlNTdHJpbmdFeHRyYXMuaD4KKworVEVTVChXZWJLaXRMZWdh
Y3lTdHJpbmdXaWR0aCwgVGhhaVdpZHRoRm9yV2ViKQoreworICAgIE5TU3RyaW5nICp0ZXN0U3Ry
aW5nID0gQCLguITguYnguJnguKvguLLguYPguJkiOworICAgIGZsb2F0IHJlc3VsdCA9IFt0ZXN0
U3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpbTlNGb250IHN5c3RlbUZvbnRPZlNpemU6MTZdXTsK
KyAgICBFWFBFQ1RfR0UocmVzdWx0LCAzKTsKK30KKworI2VuZGlmCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432285</attachid>
            <date>2021-06-25 12:23:50 -0700</date>
            <delta_ts>2021-06-25 16:01:20 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227385-20210625122349.patch</filename>
            <type>text/plain</type>
            <size>10157</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNGYwZjg2NDFiZGU1
YzM4Y2YxNzFmZmVlYzVmZjY3ZTc2MzY1NS4uOTJlNzUwYTIyMWY1ZTliNzBmYjE1NWNkZmI5NjJj
Y2Y4ZDBmZDNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI1ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSAt
W05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVybnMgMAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQzMDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBTaW1wbHkgdGFrZSB0aGUgaU9TIGNvZGVwYXRoIG9uIG1hY09TLgorCisgICAg
ICAgIFRlc3Q6IFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLlRoYWlXaWR0aEZvcldlYgorCisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAqIHBsYXRm
b3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwOgorICAgICAgICAo
V2ViQ29yZTo6Rm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKToKKwogMjAyMS0wNi0yNCAgVmVua3kg
RGFzcyAgPHlhcmFuYW1hdmVua2F0YXJhbWFuYUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2gg
aW4gSURCVHJhbnNhY3Rpb246OmRpc3BhdGNoRXZlbnQgd2hlbiBtX29wZW5EQlJlcXVlc3QgaXMg
bnVsbC4gCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250
Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk
ZS5jcHAKaW5kZXggMDMwYzU3NTAxNTE1NmUyNjY5ZDEwNTc2YWJmODBhYzg2NTkyYWIzMC4uYWM1
NGU2ODEzOTkyODRlZDhiZjhhMTFjNzZhYjExZmRmY2ZkMTNmZSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtODksMjEgKzg5LDYg
QEAgRm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKEZvbnRDYXNjYWRlRGVzY3JpcHRpb24mJiBmZCwg
ZmxvYXQgbGV0dGVyU3BhY2luZywgZmxvYXQKIHsKIH0KIAotLy8gRklYTUU6IFdlIHNob3VsZCBt
YWtlIHRoaXMgY29uc3RydWN0b3IgcGxhdGZvcm0taW5kZXBlbmRlbnQuCi1Gb250Q2FzY2FkZTo6
Rm9udENhc2NhZGUoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZm9udERhdGEsIEZvbnRTbW9vdGhp
bmdNb2RlIGZvbnRTbW9vdGhpbmdNb2RlKQotICAgIDogbV9mb250cyhGb250Q2FzY2FkZUZvbnRz
OjpjcmVhdGVGb3JQbGF0Zm9ybUZvbnQoZm9udERhdGEpKQotICAgICwgbV9lbmFibGVLZXJuaW5n
KGNvbXB1dGVFbmFibGVLZXJuaW5nKCkpCi0gICAgLCBtX3JlcXVpcmVzU2hhcGluZyhjb21wdXRl
UmVxdWlyZXNTaGFwaW5nKCkpCi17Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0Rm9udFNtb290
aGluZyhmb250U21vb3RoaW5nTW9kZSk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBt
X2ZvbnREZXNjcmlwdGlvbi5zZXRTcGVjaWZpZWRTaXplKENURm9udEdldFNpemUoZm9udERhdGEu
Zm9udCgpKSk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKENURm9udEdl
dFNpemUoZm9udERhdGEuZm9udCgpKSk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0SXNJdGFs
aWMoQ1RGb250R2V0U3ltYm9saWNUcmFpdHMoZm9udERhdGEuZm9udCgpKSAmIGtDVEZvbnRUcmFp
dEl0YWxpYyk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KChDVEZvbnRHZXRTeW1i
b2xpY1RyYWl0cyhmb250RGF0YS5mb250KCkpICYga0NURm9udFRyYWl0Qm9sZCkgPyBib2xkV2Vp
Z2h0VmFsdWUoKSA6IG5vcm1hbFdlaWdodFZhbHVlKCkpOwotI2VuZGlmCi19Ci0KIEZvbnRDYXNj
YWRlOjpGb250Q2FzY2FkZShjb25zdCBGb250Q2FzY2FkZSYgb3RoZXIpCiAgICAgOiBtX2ZvbnRE
ZXNjcmlwdGlvbihvdGhlci5tX2ZvbnREZXNjcmlwdGlvbikKICAgICAsIG1fZm9udHMob3RoZXIu
bV9mb250cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv
cmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKaW5kZXggNzU1N2QwYWNl
NDRjYmUzYzNkYTk1NzFlNmVlZThmNmE0MDY5NjJmOC4uZWNiYWYzODYxMmY3ZTg0NGU1MzZkMmZh
ZGExOWMxNDBhYmVhNTc2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKQEAg
LTQyLDYgKzQyLDE4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorRm9udENhc2NhZGU6OkZv
bnRDYXNjYWRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnREYXRhLCBGb250U21vb3RoaW5n
TW9kZSBmb250U21vb3RoaW5nTW9kZSkKKyAgICA6IG1fZm9udHMoRm9udENhc2NhZGVGb250czo6
Y3JlYXRlRm9yUGxhdGZvcm1Gb250KGZvbnREYXRhKSkKKyAgICAsIG1fZW5hYmxlS2VybmluZyhj
b21wdXRlRW5hYmxlS2VybmluZygpKQorICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoY29tcHV0ZVJl
cXVpcmVzU2hhcGluZygpKQoreworICAgIG1fZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhp
bmcoZm9udFNtb290aGluZ01vZGUpOworICAgIG1fZm9udERlc2NyaXB0aW9uLnNldFNwZWNpZmll
ZFNpemUoQ1RGb250R2V0U2l6ZShmb250RGF0YS5mb250KCkpKTsKKyAgICBtX2ZvbnREZXNjcmlw
dGlvbi5zZXRDb21wdXRlZFNpemUoQ1RGb250R2V0U2l6ZShmb250RGF0YS5mb250KCkpKTsKKyAg
ICBtX2ZvbnREZXNjcmlwdGlvbi5zZXRJc0l0YWxpYyhDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhm
b250RGF0YS5mb250KCkpICYga0NURm9udFRyYWl0SXRhbGljKTsKKyAgICBtX2ZvbnREZXNjcmlw
dGlvbi5zZXRXZWlnaHQoKENURm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnREYXRhLmZvbnQoKSkg
JiBrQ1RGb250VHJhaXRCb2xkKSA/IGJvbGRXZWlnaHRWYWx1ZSgpIDogbm9ybWFsV2VpZ2h0VmFs
dWUoKSk7Cit9CisKIHN0YXRpYyBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHJvdGF0ZUxlZnRUcmFu
c2Zvcm0oKQogewogICAgIHN0YXRpYyBBZmZpbmVUcmFuc2Zvcm0gcmVzdWx0KDAsIC0xLCAxLCAw
LCAwLCAwKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp
bmRleCBjZGNkZjkxODcwOGQyMDcxZTI5YmIxMDk3MGY4ZmM4Y2U1MzI0ZDZjLi4yMTc5YmU3MWI0
ZmYxMDkzOTA3NDMyYzQzNDc5M2ZmODc4NDUxMWU1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM
b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDYtMjUgIE15
bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1Nd
IC1bTlNTdHJpbmcgX3dlYl93aWR0aFdpdGhGb250Ol0gcmV0dXJucyAwCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjczODUKKyAgICAgICAgPHJkYXI6
Ly9wcm9ibGVtLzc5NDMwOTM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9q
ZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5nV2lk
dGgubW06IEFkZGVkLgorICAgICAgICAoVEVTVCk6CisKIDIwMjEtMDYtMjQgIEthdGUgQ2hlbmV5
ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgV0tXZWJWaWV3IGxvYWRT
aW11bGF0ZWRSZXF1ZXN0IGRvZXMgbm90IHNldCBhdHRyaWJ1dGlvbiB2YWx1ZSBmb3IgdXJsIHJl
cXVlc3RzIHdpdGhpbiBodG1sIGNvbnRlbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB
UEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdl
YktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDll
N2U0YTlkZmZhYmU2YzJiYmRmMGM5ZDYzOGRjY2I2ODg2MWY2NS4uMWMxZjgwOGRiYTFmMTRiY2Qz
YzJhNDI0ODIxMzY3MjZjYzFiOWIwZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U
ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdl
YktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTExNyw2
ICsxMTcsNyBAQAogCQkxQzc5MjAxQzIzNEJERDlCMDAxRUFGMjMgLyogQ29weVJURi5tbSBpbiBT
b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDNzkyMDFCMjM0QkRE
OUIwMDFFQUYyMyAvKiBDb3B5UlRGLm1tICovOyB9OwogCQkxQzdGRUIyMDIwN0MwRjJFMDBEMjMy
NzggLyogQmFja2dyb3VuZENvbG9yLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG
aWxlOyBmaWxlUmVmID0gMUM3RkVCMUYyMDdDMEYyRDAwRDIzMjc4IC8qIEJhY2tncm91bmRDb2xv
ci5tbSAqLzsgfTsKIAkJMUM4MTgwMjcyNUZCMDlFMjAwNjA4QjNFIC8qIEZvbnRSZWdpc3RyeVNh
bmRib3hDaGVjay5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl
ZiA9IDFDODE4MDI2MjVGQjA5RTIwMDYwOEIzRSAvKiBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2su
bW0gKi87IH07CisJCTFDOEZBNTNBMjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdXaWR0aC5tbSBp
biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDOEZBNTM5MjY4
NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdXaWR0aC5tbSAqLzsgfTsKIAkJMUM5MDQyMEMyMzI2RTAz
QzAwQkVGOTFFIC8qIFNlbGVjdGlvbkJ5V29yZC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC
WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDOTA0MjBCMjMyNkUwM0MwMEJFRjkxRSAvKiBTZWxlY3Rp
b25CeVdvcmQubW0gKi87IH07CiAJCTFDOUVCODQxMUUzODBEQTEwMDVDNjQ0MiAvKiBDb21wbGV4
VGV4dENvbnRyb2xsZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm
aWxlUmVmID0gMUM5RUI4NDAxRTM4MERBMTAwNUM2NDQyIC8qIENvbXBsZXhUZXh0Q29udHJvbGxl
ci5jcHAgKi87IH07CiAJCTFDQUNBREExMjMwNjIwQUUwMDA3RDU0QyAvKiBXS1dlYlZpZXdPcGFx
dWUubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQ0FD
QURBMDIzMDYyMEFEMDAwN0Q1NEMgLyogV0tXZWJWaWV3T3BhcXVlLm1tICovOyB9OwpAQCAtMTg3
Myw2ICsxODc0LDcgQEAKIAkJMUM3OTIwMUIyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0g
Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du
RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBDb3B5UlRGLm1tOyBzb3Vy
Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzdGRUIxRjIwN0MwRjJEMDBEMjMyNzggLyogQmFj
a2dyb3VuZENvbG9yLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu
ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g
QmFja2dyb3VuZENvbG9yLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzgxODAy
NjI1RkIwOUUyMDA2MDhCM0UgLyogRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tICovID0ge2lz
YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu
b2JqY3BwOyBwYXRoID0gRm9udFJlZ2lzdHJ5U2FuZGJveENoZWNrLm1tOyBzb3VyY2VUcmVlID0g
Ijxncm91cD4iOyB9OworCQkxQzhGQTUzOTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgu
bW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy
Y2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBTdHJpbmdXaWR0aC5tbTsgc291cmNlVHJlZSA9ICI8
Z3JvdXA+IjsgfTsKIAkJMUM5MDQyMEIyMzI2RTAzQzAwQkVGOTFFIC8qIFNlbGVjdGlvbkJ5V29y
ZC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0
S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFNlbGVjdGlvbkJ5
V29yZC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUM5RUI4NDAxRTM4MERBMTAw
NUM2NDQyIC8qIENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl
ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl
LmNwcC5jcHA7IHBhdGggPSBDb21wbGV4VGV4dENvbnRyb2xsZXIuY3BwOyBzb3VyY2VUcmVlID0g
Ijxncm91cD4iOyB9OwogCQkxQ0FDQURBMDIzMDYyMEFEMDAwN0Q1NEMgLyogV0tXZWJWaWV3T3Bh
cXVlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh
c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV0tXZWJWaWV3
T3BhcXVlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDc2Miw2ICs0NzY0LDcg
QEAKIAkJCQlFMTk0RTFCQTE3N0U1MTQ1MDA5QzRENEUgLyogU3RvcExvYWRpbmdGcm9tRGlkUmVj
ZWl2ZVJlc3BvbnNlLm1tICovLAogCQkJCTM3OTlBRDM5MTQxMjBBNDMwMDVFQjBDNiAvKiBTdHJp
bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0RnJvbVN0cmluZy5tbSAqLywKIAkJCQk5MzlCRkUzOTE4
RTU1NDg5MDA4ODMyNzUgLyogU3RyaW5nVHJ1bmNhdG9yLm1tICovLAorCQkJCTFDOEZBNTM5MjY4
NUE2RDUwMEI3RTQ5RSAvKiBTdHJpbmdXaWR0aC5tbSAqLywKIAkJCQkzN0E2ODk1RDE0OEE5QjUw
MDA1MTAwRkEgLyogU3VicmVzb3VyY2VFcnJvckNyYXNoLm1tICovLAogCQkJCUU0OTAyOTY3MTRF
MkUzQTQwMDJCRUREMSAvKiBUeXBpbmdTdHlsZUNyYXNoLm1tICovLAogCQkJCTUzNjc3MDMzMUND
ODAyMjgwMEQ0MjVCMSAvKiBXZWJTY3JpcHRPYmplY3REZXNjcmlwdGlvbi5tbSAqLywKQEAgLTU3
NjcsNiArNTc3MCw3IEBACiAJCQkJN0NDRTdFRDAxQTQxMUE3RTAwNDQ3QzRDIC8qIFN0cmluZ0J5
RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9tU3RyaW5nLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJN0ND
RTdFRDExQTQxMUE3RTAwNDQ3QzRDIC8qIFN0cmluZ1RydW5jYXRvci5tbSBpbiBTb3VyY2VzICov
LAogCQkJCUVDQTY4MENFMUU2OENDMDkwMDczMUQyMCAvKiBTdHJpbmdVdGlsaXRpZXMubW0gaW4g
U291cmNlcyAqLywKKwkJCQkxQzhGQTUzQTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgu
bW0gaW4gU291cmNlcyAqLywKIAkJCQlDRTRENURFNzFGNjc0M0JBMDA3MkNGQzYgLyogU3RyaW5n
V2l0aERpcmVjdGlvbi5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk0MUU2N0E4NTI1RDE2RTgzMDA3
QjBBNEMgLyogU1RVTk1lc3NhZ2VQYXJzaW5nVGVzdC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3
Q0NFN0VEMjFBNDExQTdFMDA0NDdDNEMgLyogU3VicmVzb3VyY2VFcnJvckNyYXNoLm1tIGluIFNv
dXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJp
bmdXaWR0aC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmluZ1dpZHRoLm1t
Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAuLjI3OGNiYzNiODIyNzcwMzM2YjU3OTJlYjI4YTJiNzgyNTg0OGRmOTkKLS0t
IC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdXaWR0
aC5tbQpAQCAtMCwwICsxLDQxIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxlIElu
Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu
IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlv
biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwor
ICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl
dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k
aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlv
bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICog
ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj
bGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxz
IHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElT
IFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisg
KiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBO
T1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM
SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlN
RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICog
QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg
RVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO
T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS
VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5U
RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks
IFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNM
VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VU
IE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUg
UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCAiY29uZmlnLmgiCisK
KyNpZiBQTEFURk9STShNQUMpCisKKyNpbXBvcnQgPEFwcEtpdC9BcHBLaXQuaD4KKyNpbXBvcnQg
PEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgorI2ltcG9ydCA8V2ViS2l0L1dlYktpdE5TU3RyaW5n
RXh0cmFzLmg+CisKK1RFU1QoV2ViS2l0TGVnYWN5U3RyaW5nV2lkdGgsIFRoYWlXaWR0aEZvcldl
YikKK3sKKyAgICBOU1N0cmluZyAqdGVzdFN0cmluZyA9IEAi4LiE4LmJ4LiZ4Lir4Liy4LmD4LiZ
IjsKKyAgICBmbG9hdCByZXN1bHQgPSBbdGVzdFN0cmluZyBfd2ViX3dpZHRoV2l0aEZvbnQ6W05T
Rm9udCBzeXN0ZW1Gb250T2ZTaXplOjE2XV07CisgICAgRVhQRUNUX0dFKHJlc3VsdCwgMyk7Cit9
CisKKyNlbmRpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432303</attachid>
            <date>2021-06-25 16:01:22 -0700</date>
            <delta_ts>2021-06-25 16:20:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227385-20210625160121.patch</filename>
            <type>text/plain</type>
            <size>10165</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNGYwZjg2NDFiZGU1
YzM4Y2YxNzFmZmVlYzVmZjY3ZTc2MzY1NS4uOTJlNzUwYTIyMWY1ZTliNzBmYjE1NWNkZmI5NjJj
Y2Y4ZDBmZDNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI1ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSAt
W05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVybnMgMAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQzMDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBTaW1wbHkgdGFrZSB0aGUgaU9TIGNvZGVwYXRoIG9uIG1hY09TLgorCisgICAg
ICAgIFRlc3Q6IFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLlRoYWlXaWR0aEZvcldlYgorCisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAqIHBsYXRm
b3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwOgorICAgICAgICAo
V2ViQ29yZTo6Rm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKToKKwogMjAyMS0wNi0yNCAgVmVua3kg
RGFzcyAgPHlhcmFuYW1hdmVua2F0YXJhbWFuYUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2gg
aW4gSURCVHJhbnNhY3Rpb246OmRpc3BhdGNoRXZlbnQgd2hlbiBtX29wZW5EQlJlcXVlc3QgaXMg
bnVsbC4gCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250
Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk
ZS5jcHAKaW5kZXggMDMwYzU3NTAxNTE1NmUyNjY5ZDEwNTc2YWJmODBhYzg2NTkyYWIzMC4uYWM1
NGU2ODEzOTkyODRlZDhiZjhhMTFjNzZhYjExZmRmY2ZkMTNmZSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtODksMjEgKzg5LDYg
QEAgRm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKEZvbnRDYXNjYWRlRGVzY3JpcHRpb24mJiBmZCwg
ZmxvYXQgbGV0dGVyU3BhY2luZywgZmxvYXQKIHsKIH0KIAotLy8gRklYTUU6IFdlIHNob3VsZCBt
YWtlIHRoaXMgY29uc3RydWN0b3IgcGxhdGZvcm0taW5kZXBlbmRlbnQuCi1Gb250Q2FzY2FkZTo6
Rm9udENhc2NhZGUoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZm9udERhdGEsIEZvbnRTbW9vdGhp
bmdNb2RlIGZvbnRTbW9vdGhpbmdNb2RlKQotICAgIDogbV9mb250cyhGb250Q2FzY2FkZUZvbnRz
OjpjcmVhdGVGb3JQbGF0Zm9ybUZvbnQoZm9udERhdGEpKQotICAgICwgbV9lbmFibGVLZXJuaW5n
KGNvbXB1dGVFbmFibGVLZXJuaW5nKCkpCi0gICAgLCBtX3JlcXVpcmVzU2hhcGluZyhjb21wdXRl
UmVxdWlyZXNTaGFwaW5nKCkpCi17Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0Rm9udFNtb290
aGluZyhmb250U21vb3RoaW5nTW9kZSk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBt
X2ZvbnREZXNjcmlwdGlvbi5zZXRTcGVjaWZpZWRTaXplKENURm9udEdldFNpemUoZm9udERhdGEu
Zm9udCgpKSk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKENURm9udEdl
dFNpemUoZm9udERhdGEuZm9udCgpKSk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0SXNJdGFs
aWMoQ1RGb250R2V0U3ltYm9saWNUcmFpdHMoZm9udERhdGEuZm9udCgpKSAmIGtDVEZvbnRUcmFp
dEl0YWxpYyk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KChDVEZvbnRHZXRTeW1i
b2xpY1RyYWl0cyhmb250RGF0YS5mb250KCkpICYga0NURm9udFRyYWl0Qm9sZCkgPyBib2xkV2Vp
Z2h0VmFsdWUoKSA6IG5vcm1hbFdlaWdodFZhbHVlKCkpOwotI2VuZGlmCi19Ci0KIEZvbnRDYXNj
YWRlOjpGb250Q2FzY2FkZShjb25zdCBGb250Q2FzY2FkZSYgb3RoZXIpCiAgICAgOiBtX2ZvbnRE
ZXNjcmlwdGlvbihvdGhlci5tX2ZvbnREZXNjcmlwdGlvbikKICAgICAsIG1fZm9udHMob3RoZXIu
bV9mb250cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv
cmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKaW5kZXggNzU1N2QwYWNl
NDRjYmUzYzNkYTk1NzFlNmVlZThmNmE0MDY5NjJmOC4uOGI2OGUxMDE1YjM3OTdlYjdkYWExZTI1
MjYzYTc3ZjlmNzczZjc0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKQEAg
LTQyLDYgKzQyLDE4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorRm9udENhc2NhZGU6OkZv
bnRDYXNjYWRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnREYXRhLCBGb250U21vb3RoaW5n
TW9kZSBmb250U21vb3RoaW5nTW9kZSkKKyAgICA6IG1fZm9udHMoRm9udENhc2NhZGVGb250czo6
Y3JlYXRlRm9yUGxhdGZvcm1Gb250KGZvbnREYXRhKSkKKyAgICAsIG1fZW5hYmxlS2VybmluZyhj
b21wdXRlRW5hYmxlS2VybmluZygpKQorICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoY29tcHV0ZVJl
cXVpcmVzU2hhcGluZygpKQoreworICAgIG1fZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhp
bmcoZm9udFNtb290aGluZ01vZGUpOworICAgIG1fZm9udERlc2NyaXB0aW9uLnNldFNwZWNpZmll
ZFNpemUoQ1RGb250R2V0U2l6ZShmb250RGF0YS5jdEZvbnQoKSkpOworICAgIG1fZm9udERlc2Ny
aXB0aW9uLnNldENvbXB1dGVkU2l6ZShDVEZvbnRHZXRTaXplKGZvbnREYXRhLmN0Rm9udCgpKSk7
CisgICAgbV9mb250RGVzY3JpcHRpb24uc2V0SXNJdGFsaWMoQ1RGb250R2V0U3ltYm9saWNUcmFp
dHMoZm9udERhdGEuY3RGb250KCkpICYga0NURm9udFRyYWl0SXRhbGljKTsKKyAgICBtX2ZvbnRE
ZXNjcmlwdGlvbi5zZXRXZWlnaHQoKENURm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnREYXRhLmN0
Rm9udCgpKSAmIGtDVEZvbnRUcmFpdEJvbGQpID8gYm9sZFdlaWdodFZhbHVlKCkgOiBub3JtYWxX
ZWlnaHRWYWx1ZSgpKTsKK30KKwogc3RhdGljIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYgcm90YXRl
TGVmdFRyYW5zZm9ybSgpCiB7CiAgICAgc3RhdGljIEFmZmluZVRyYW5zZm9ybSByZXN1bHQoMCwg
LTEsIDEsIDAsIDAsIDApOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh
bmdlTG9nCmluZGV4IGNkY2RmOTE4NzA4ZDIwNzFlMjliYjEwOTcwZjhmYzhjZTUzMjRkNmMuLjIx
NzliZTcxYjRmZjEwOTM5MDc0MzJjNDM0NzkzZmY4Nzg0NTExZTUgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0w
Ni0yNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAg
IFttYWNPU10gLVtOU1N0cmluZyBfd2ViX3dpZHRoV2l0aEZvbnQ6XSByZXR1cm5zIDAKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzM4NQorICAgICAg
ICA8cmRhcjovL3Byb2JsZW0vNzk0MzA5Mzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9T
dHJpbmdXaWR0aC5tbTogQWRkZWQuCisgICAgICAgIChURVNUKToKKwogMjAyMS0wNi0yNCAgS2F0
ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBXS1dlYlZp
ZXcgbG9hZFNpbXVsYXRlZFJlcXVlc3QgZG9lcyBub3Qgc2V0IGF0dHJpYnV0aW9uIHZhbHVlIGZv
ciB1cmwgcmVxdWVzdHMgd2l0aGluIGh0bWwgY29udGVudApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz
dFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29s
cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp
bmRleCA0OWU3ZTRhOWRmZmFiZTZjMmJiZGYwYzlkNjM4ZGNjYjY4ODYxZjY1Li4xYzFmODA4ZGJh
MWYxNGJjZDNjMmE0MjQ4MjEzNjcyNmNjMWI5YjBlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi
S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29s
cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA
QCAtMTE3LDYgKzExNyw3IEBACiAJCTFDNzkyMDFDMjM0QkREOUIwMDFFQUYyMyAvKiBDb3B5UlRG
Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM3OTIw
MUIyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0gKi87IH07CiAJCTFDN0ZFQjIwMjA3QzBG
MkUwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ
QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzdGRUIxRjIwN0MwRjJEMDBEMjMyNzggLyogQmFja2dy
b3VuZENvbG9yLm1tICovOyB9OwogCQkxQzgxODAyNzI1RkIwOUUyMDA2MDhCM0UgLyogRm9udFJl
Z2lzdHJ5U2FuZGJveENoZWNrLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gMUM4MTgwMjYyNUZCMDlFMjAwNjA4QjNFIC8qIEZvbnRSZWdpc3RyeVNhbmRi
b3hDaGVjay5tbSAqLzsgfTsKKwkJMUM4RkE1M0EyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dp
ZHRoLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM4
RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tICovOyB9OwogCQkxQzkwNDIw
QzIzMjZFMDNDMDBCRUY5MUUgLyogU2VsZWN0aW9uQnlXb3JkLm1tIGluIFNvdXJjZXMgKi8gPSB7
aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM5MDQyMEIyMzI2RTAzQzAwQkVGOTFFIC8q
IFNlbGVjdGlvbkJ5V29yZC5tbSAqLzsgfTsKIAkJMUM5RUI4NDExRTM4MERBMTAwNUM2NDQyIC8q
IENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSAxQzlFQjg0MDFFMzgwREExMDA1QzY0NDIgLyogQ29tcGxleFRleHRD
b250cm9sbGVyLmNwcCAqLzsgfTsKIAkJMUNBQ0FEQTEyMzA2MjBBRTAwMDdENTRDIC8qIFdLV2Vi
Vmlld09wYXF1ZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl
ZiA9IDFDQUNBREEwMjMwNjIwQUQwMDA3RDU0QyAvKiBXS1dlYlZpZXdPcGFxdWUubW0gKi87IH07
CkBAIC0xODczLDYgKzE4NzQsNyBAQAogCQkxQzc5MjAxQjIzNEJERDlCMDAxRUFGMjMgLyogQ29w
eVJURi5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs
YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IENvcHlSVEYu
bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDN0ZFQjFGMjA3QzBGMkQwMEQyMzI3
OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7
IHBhdGggPSBCYWNrZ3JvdW5kQ29sb3IubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ
CTFDODE4MDI2MjVGQjA5RTIwMDYwOEIzRSAvKiBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0g
Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj
b2RlLmNwcC5vYmpjcHA7IHBhdGggPSBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW07IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFDOEZBNTM5MjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJp
bmdXaWR0aC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlw
ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFN0cmluZ1dpZHRoLm1tOyBzb3VyY2VU
cmVlID0gIjxncm91cD4iOyB9OwogCQkxQzkwNDIwQjIzMjZFMDNDMDBCRUY5MUUgLyogU2VsZWN0
aW9uQnlXb3JkLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9
IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gU2Vs
ZWN0aW9uQnlXb3JkLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzlFQjg0MDFF
MzgwREExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVyLmNwcCAqLyA9IHtpc2EgPSBQ
QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv
dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHA7IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDQUNBREEwMjMwNjIwQUQwMDA3RDU0QyAvKiBXS1dl
YlZpZXdPcGFxdWUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n
ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBX
S1dlYlZpZXdPcGFxdWUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NzYyLDYg
KzQ3NjQsNyBAQAogCQkJCUUxOTRFMUJBMTc3RTUxNDUwMDlDNEQ0RSAvKiBTdG9wTG9hZGluZ0Zy
b21EaWRSZWNlaXZlUmVzcG9uc2UubW0gKi8sCiAJCQkJMzc5OUFEMzkxNDEyMEE0MzAwNUVCMEM2
IC8qIFN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9tU3RyaW5nLm1tICovLAogCQkJCTkz
OUJGRTM5MThFNTU0ODkwMDg4MzI3NSAvKiBTdHJpbmdUcnVuY2F0b3IubW0gKi8sCisJCQkJMUM4
RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tICovLAogCQkJCTM3QTY4OTVE
MTQ4QTlCNTAwMDUxMDBGQSAvKiBTdWJyZXNvdXJjZUVycm9yQ3Jhc2gubW0gKi8sCiAJCQkJRTQ5
MDI5NjcxNEUyRTNBNDAwMkJFREQxIC8qIFR5cGluZ1N0eWxlQ3Jhc2gubW0gKi8sCiAJCQkJNTM2
NzcwMzMxQ0M4MDIyODAwRDQyNUIxIC8qIFdlYlNjcmlwdE9iamVjdERlc2NyaXB0aW9uLm1tICov
LApAQCAtNTc2Nyw2ICs1NzcwLDcgQEAKIAkJCQk3Q0NFN0VEMDFBNDExQTdFMDA0NDdDNEMgLyog
U3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJpbmcubW0gaW4gU291cmNlcyAqLywK
IAkJCQk3Q0NFN0VEMTFBNDExQTdFMDA0NDdDNEMgLyogU3RyaW5nVHJ1bmNhdG9yLm1tIGluIFNv
dXJjZXMgKi8sCiAJCQkJRUNBNjgwQ0UxRTY4Q0MwOTAwNzMxRDIwIC8qIFN0cmluZ1V0aWxpdGll
cy5tbSBpbiBTb3VyY2VzICovLAorCQkJCTFDOEZBNTNBMjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJp
bmdXaWR0aC5tbSBpbiBTb3VyY2VzICovLAogCQkJCUNFNEQ1REU3MUY2NzQzQkEwMDcyQ0ZDNiAv
KiBTdHJpbmdXaXRoRGlyZWN0aW9uLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTQxRTY3QTg1MjVE
MTZFODMwMDdCMEE0QyAvKiBTVFVOTWVzc2FnZVBhcnNpbmdUZXN0LmNwcCBpbiBTb3VyY2VzICov
LAogCQkJCTdDQ0U3RUQyMUE0MTFBN0UwMDQ0N0M0QyAvKiBTdWJyZXNvdXJjZUVycm9yQ3Jhc2gu
bW0gaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv
bWFjL1N0cmluZ1dpZHRoLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5n
V2lkdGgubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMC4uMjc4Y2JjM2I4MjI3NzAzMzZiNTc5MmViMjhhMmI3ODI1ODQ4
ZGY5OQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0
cmluZ1dpZHRoLm1tCkBAIC0wLDAgKzEsNDEgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjEg
QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFu
ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9k
aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k
aXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl
IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0
IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlz
dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp
Z2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93
aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt
YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09G
VFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFT
IElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElO
RywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD
SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUg
RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVU
T1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBT
UEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO
RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09E
UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT
CisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJ
QUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP
UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5Z
IFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YK
KyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0ICJjb25m
aWcuaCIKKworI2lmIFBMQVRGT1JNKE1BQykKKworI2ltcG9ydCA8QXBwS2l0L0FwcEtpdC5oPgor
I2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CisjaW1wb3J0IDxXZWJLaXQvV2ViS2l0
TlNTdHJpbmdFeHRyYXMuaD4KKworVEVTVChXZWJLaXRMZWdhY3lTdHJpbmdXaWR0aCwgVGhhaVdp
ZHRoRm9yV2ViKQoreworICAgIE5TU3RyaW5nICp0ZXN0U3RyaW5nID0gQCLguITguYnguJnguKvg
uLLguYPguJkiOworICAgIGZsb2F0IHJlc3VsdCA9IFt0ZXN0U3RyaW5nIF93ZWJfd2lkdGhXaXRo
Rm9udDpbTlNGb250IHN5c3RlbUZvbnRPZlNpemU6MTZdXTsKKyAgICBFWFBFQ1RfR0UocmVzdWx0
LCAzKTsKK30KKworI2VuZGlmCg==
</data>
<flag name="review"
          id="454300"
          type_id="1"
          status="+"
          setter="simon.fraser"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432308</attachid>
            <date>2021-06-25 16:25:17 -0700</date>
            <delta_ts>2021-06-25 16:26:22 -0700</delta_ts>
            <desc>Patch for committing</desc>
            <filename>bug-227385-20210625162516.patch</filename>
            <type>text/plain</type>
            <size>10166</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNGYwZjg2NDFiZGU1
YzM4Y2YxNzFmZmVlYzVmZjY3ZTc2MzY1NS4uOTJlNzUwYTIyMWY1ZTliNzBmYjE1NWNkZmI5NjJj
Y2Y4ZDBmZDNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI1ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSAt
W05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVybnMgMAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQzMDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBTaW1wbHkgdGFrZSB0aGUgaU9TIGNvZGVwYXRoIG9uIG1hY09TLgorCisgICAg
ICAgIFRlc3Q6IFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLlRoYWlXaWR0aEZvcldlYgorCisgICAg
ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAqIHBsYXRm
b3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwOgorICAgICAgICAo
V2ViQ29yZTo6Rm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKToKKwogMjAyMS0wNi0yNCAgVmVua3kg
RGFzcyAgPHlhcmFuYW1hdmVua2F0YXJhbWFuYUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2gg
aW4gSURCVHJhbnNhY3Rpb246OmRpc3BhdGNoRXZlbnQgd2hlbiBtX29wZW5EQlJlcXVlc3QgaXMg
bnVsbC4gCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250
Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk
ZS5jcHAKaW5kZXggMDMwYzU3NTAxNTE1NmUyNjY5ZDEwNTc2YWJmODBhYzg2NTkyYWIzMC4uYWM1
NGU2ODEzOTkyODRlZDhiZjhhMTFjNzZhYjExZmRmY2ZkMTNmZSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtODksMjEgKzg5LDYg
QEAgRm9udENhc2NhZGU6OkZvbnRDYXNjYWRlKEZvbnRDYXNjYWRlRGVzY3JpcHRpb24mJiBmZCwg
ZmxvYXQgbGV0dGVyU3BhY2luZywgZmxvYXQKIHsKIH0KIAotLy8gRklYTUU6IFdlIHNob3VsZCBt
YWtlIHRoaXMgY29uc3RydWN0b3IgcGxhdGZvcm0taW5kZXBlbmRlbnQuCi1Gb250Q2FzY2FkZTo6
Rm9udENhc2NhZGUoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgZm9udERhdGEsIEZvbnRTbW9vdGhp
bmdNb2RlIGZvbnRTbW9vdGhpbmdNb2RlKQotICAgIDogbV9mb250cyhGb250Q2FzY2FkZUZvbnRz
OjpjcmVhdGVGb3JQbGF0Zm9ybUZvbnQoZm9udERhdGEpKQotICAgICwgbV9lbmFibGVLZXJuaW5n
KGNvbXB1dGVFbmFibGVLZXJuaW5nKCkpCi0gICAgLCBtX3JlcXVpcmVzU2hhcGluZyhjb21wdXRl
UmVxdWlyZXNTaGFwaW5nKCkpCi17Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0Rm9udFNtb290
aGluZyhmb250U21vb3RoaW5nTW9kZSk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBt
X2ZvbnREZXNjcmlwdGlvbi5zZXRTcGVjaWZpZWRTaXplKENURm9udEdldFNpemUoZm9udERhdGEu
Zm9udCgpKSk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKENURm9udEdl
dFNpemUoZm9udERhdGEuZm9udCgpKSk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0SXNJdGFs
aWMoQ1RGb250R2V0U3ltYm9saWNUcmFpdHMoZm9udERhdGEuZm9udCgpKSAmIGtDVEZvbnRUcmFp
dEl0YWxpYyk7Ci0gICAgbV9mb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KChDVEZvbnRHZXRTeW1i
b2xpY1RyYWl0cyhmb250RGF0YS5mb250KCkpICYga0NURm9udFRyYWl0Qm9sZCkgPyBib2xkV2Vp
Z2h0VmFsdWUoKSA6IG5vcm1hbFdlaWdodFZhbHVlKCkpOwotI2VuZGlmCi19Ci0KIEZvbnRDYXNj
YWRlOjpGb250Q2FzY2FkZShjb25zdCBGb250Q2FzY2FkZSYgb3RoZXIpCiAgICAgOiBtX2ZvbnRE
ZXNjcmlwdGlvbihvdGhlci5tX2ZvbnREZXNjcmlwdGlvbikKICAgICAsIG1fZm9udHMob3RoZXIu
bV9mb250cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv
cmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKaW5kZXggNzU1N2QwYWNl
NDRjYmUzYzNkYTk1NzFlNmVlZThmNmE0MDY5NjJmOC4uOGI2OGUxMDE1YjM3OTdlYjdkYWExZTI1
MjYzYTc3ZjlmNzczZjc0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENhc2NhZGVDb3JlVGV4dC5jcHAKQEAg
LTQyLDYgKzQyLDE4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorRm9udENhc2NhZGU6OkZv
bnRDYXNjYWRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnREYXRhLCBGb250U21vb3RoaW5n
TW9kZSBmb250U21vb3RoaW5nTW9kZSkKKyAgICA6IG1fZm9udHMoRm9udENhc2NhZGVGb250czo6
Y3JlYXRlRm9yUGxhdGZvcm1Gb250KGZvbnREYXRhKSkKKyAgICAsIG1fZW5hYmxlS2VybmluZyhj
b21wdXRlRW5hYmxlS2VybmluZygpKQorICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoY29tcHV0ZVJl
cXVpcmVzU2hhcGluZygpKQoreworICAgIG1fZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhp
bmcoZm9udFNtb290aGluZ01vZGUpOworICAgIG1fZm9udERlc2NyaXB0aW9uLnNldFNwZWNpZmll
ZFNpemUoQ1RGb250R2V0U2l6ZShmb250RGF0YS5jdEZvbnQoKSkpOworICAgIG1fZm9udERlc2Ny
aXB0aW9uLnNldENvbXB1dGVkU2l6ZShDVEZvbnRHZXRTaXplKGZvbnREYXRhLmN0Rm9udCgpKSk7
CisgICAgbV9mb250RGVzY3JpcHRpb24uc2V0SXNJdGFsaWMoQ1RGb250R2V0U3ltYm9saWNUcmFp
dHMoZm9udERhdGEuY3RGb250KCkpICYga0NURm9udFRyYWl0SXRhbGljKTsKKyAgICBtX2ZvbnRE
ZXNjcmlwdGlvbi5zZXRXZWlnaHQoKENURm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnREYXRhLmN0
Rm9udCgpKSAmIGtDVEZvbnRUcmFpdEJvbGQpID8gYm9sZFdlaWdodFZhbHVlKCkgOiBub3JtYWxX
ZWlnaHRWYWx1ZSgpKTsKK30KKwogc3RhdGljIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYgcm90YXRl
TGVmdFRyYW5zZm9ybSgpCiB7CiAgICAgc3RhdGljIEFmZmluZVRyYW5zZm9ybSByZXN1bHQoMCwg
LTEsIDEsIDAsIDAsIDApOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh
bmdlTG9nCmluZGV4IGNkY2RmOTE4NzA4ZDIwNzFlMjliYjEwOTcwZjhmYzhjZTUzMjRkNmMuLjIx
NzliZTcxYjRmZjEwOTM5MDc0MzJjNDM0NzkzZmY4Nzg0NTExZTUgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0w
Ni0yNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAg
IFttYWNPU10gLVtOU1N0cmluZyBfd2ViX3dpZHRoV2l0aEZvbnQ6XSByZXR1cm5zIDAKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzM4NQorICAgICAg
ICA8cmRhcjovL3Byb2JsZW0vNzk0MzA5Mzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVw
cm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9T
dHJpbmdXaWR0aC5tbTogQWRkZWQuCisgICAgICAgIChURVNUKToKKwogMjAyMS0wNi0yNCAgS2F0
ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBXS1dlYlZp
ZXcgbG9hZFNpbXVsYXRlZFJlcXVlc3QgZG9lcyBub3Qgc2V0IGF0dHJpYnV0aW9uIHZhbHVlIGZv
ciB1cmwgcmVxdWVzdHMgd2l0aGluIGh0bWwgY29udGVudApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz
dFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29s
cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp
bmRleCA0OWU3ZTRhOWRmZmFiZTZjMmJiZGYwYzlkNjM4ZGNjYjY4ODYxZjY1Li4xYzFmODA4ZGJh
MWYxNGJjZDNjMmE0MjQ4MjEzNjcyNmNjMWI5YjBlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi
S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29s
cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpA
QCAtMTE3LDYgKzExNyw3IEBACiAJCTFDNzkyMDFDMjM0QkREOUIwMDFFQUYyMyAvKiBDb3B5UlRG
Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM3OTIw
MUIyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0gKi87IH07CiAJCTFDN0ZFQjIwMjA3QzBG
MkUwMEQyMzI3OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ
QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzdGRUIxRjIwN0MwRjJEMDBEMjMyNzggLyogQmFja2dy
b3VuZENvbG9yLm1tICovOyB9OwogCQkxQzgxODAyNzI1RkIwOUUyMDA2MDhCM0UgLyogRm9udFJl
Z2lzdHJ5U2FuZGJveENoZWNrLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gMUM4MTgwMjYyNUZCMDlFMjAwNjA4QjNFIC8qIEZvbnRSZWdpc3RyeVNhbmRi
b3hDaGVjay5tbSAqLzsgfTsKKwkJMUM4RkE1M0EyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dp
ZHRoLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM4
RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tICovOyB9OwogCQkxQzkwNDIw
QzIzMjZFMDNDMDBCRUY5MUUgLyogU2VsZWN0aW9uQnlXb3JkLm1tIGluIFNvdXJjZXMgKi8gPSB7
aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM5MDQyMEIyMzI2RTAzQzAwQkVGOTFFIC8q
IFNlbGVjdGlvbkJ5V29yZC5tbSAqLzsgfTsKIAkJMUM5RUI4NDExRTM4MERBMTAwNUM2NDQyIC8q
IENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSAxQzlFQjg0MDFFMzgwREExMDA1QzY0NDIgLyogQ29tcGxleFRleHRD
b250cm9sbGVyLmNwcCAqLzsgfTsKIAkJMUNBQ0FEQTEyMzA2MjBBRTAwMDdENTRDIC8qIFdLV2Vi
Vmlld09wYXF1ZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl
ZiA9IDFDQUNBREEwMjMwNjIwQUQwMDA3RDU0QyAvKiBXS1dlYlZpZXdPcGFxdWUubW0gKi87IH07
CkBAIC0xODczLDYgKzE4NzQsNyBAQAogCQkxQzc5MjAxQjIzNEJERDlCMDAxRUFGMjMgLyogQ29w
eVJURi5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs
YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IENvcHlSVEYu
bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDN0ZFQjFGMjA3QzBGMkQwMEQyMzI3
OCAvKiBCYWNrZ3JvdW5kQ29sb3IubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7
IHBhdGggPSBCYWNrZ3JvdW5kQ29sb3IubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ
CTFDODE4MDI2MjVGQjA5RTIwMDYwOEIzRSAvKiBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW0g
Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj
b2RlLmNwcC5vYmpjcHA7IHBhdGggPSBGb250UmVnaXN0cnlTYW5kYm94Q2hlY2subW07IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFDOEZBNTM5MjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJp
bmdXaWR0aC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlw
ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFN0cmluZ1dpZHRoLm1tOyBzb3VyY2VU
cmVlID0gIjxncm91cD4iOyB9OwogCQkxQzkwNDIwQjIzMjZFMDNDMDBCRUY5MUUgLyogU2VsZWN0
aW9uQnlXb3JkLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9
IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gU2Vs
ZWN0aW9uQnlXb3JkLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQzlFQjg0MDFF
MzgwREExMDA1QzY0NDIgLyogQ29tcGxleFRleHRDb250cm9sbGVyLmNwcCAqLyA9IHtpc2EgPSBQ
QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv
dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENvbXBsZXhUZXh0Q29udHJvbGxlci5jcHA7IHNvdXJj
ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDQUNBREEwMjMwNjIwQUQwMDA3RDU0QyAvKiBXS1dl
YlZpZXdPcGFxdWUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n
ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBX
S1dlYlZpZXdPcGFxdWUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NzYyLDYg
KzQ3NjQsNyBAQAogCQkJCUUxOTRFMUJBMTc3RTUxNDUwMDlDNEQ0RSAvKiBTdG9wTG9hZGluZ0Zy
b21EaWRSZWNlaXZlUmVzcG9uc2UubW0gKi8sCiAJCQkJMzc5OUFEMzkxNDEyMEE0MzAwNUVCMEM2
IC8qIFN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHRGcm9tU3RyaW5nLm1tICovLAogCQkJCTkz
OUJGRTM5MThFNTU0ODkwMDg4MzI3NSAvKiBTdHJpbmdUcnVuY2F0b3IubW0gKi8sCisJCQkJMUM4
RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dpZHRoLm1tICovLAogCQkJCTM3QTY4OTVE
MTQ4QTlCNTAwMDUxMDBGQSAvKiBTdWJyZXNvdXJjZUVycm9yQ3Jhc2gubW0gKi8sCiAJCQkJRTQ5
MDI5NjcxNEUyRTNBNDAwMkJFREQxIC8qIFR5cGluZ1N0eWxlQ3Jhc2gubW0gKi8sCiAJCQkJNTM2
NzcwMzMxQ0M4MDIyODAwRDQyNUIxIC8qIFdlYlNjcmlwdE9iamVjdERlc2NyaXB0aW9uLm1tICov
LApAQCAtNTc2Nyw2ICs1NzcwLDcgQEAKIAkJCQk3Q0NFN0VEMDFBNDExQTdFMDA0NDdDNEMgLyog
U3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJpbmcubW0gaW4gU291cmNlcyAqLywK
IAkJCQk3Q0NFN0VEMTFBNDExQTdFMDA0NDdDNEMgLyogU3RyaW5nVHJ1bmNhdG9yLm1tIGluIFNv
dXJjZXMgKi8sCiAJCQkJRUNBNjgwQ0UxRTY4Q0MwOTAwNzMxRDIwIC8qIFN0cmluZ1V0aWxpdGll
cy5tbSBpbiBTb3VyY2VzICovLAorCQkJCTFDOEZBNTNBMjY4NUE2RDUwMEI3RTQ5RSAvKiBTdHJp
bmdXaWR0aC5tbSBpbiBTb3VyY2VzICovLAogCQkJCUNFNEQ1REU3MUY2NzQzQkEwMDcyQ0ZDNiAv
KiBTdHJpbmdXaXRoRGlyZWN0aW9uLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTQxRTY3QTg1MjVE
MTZFODMwMDdCMEE0QyAvKiBTVFVOTWVzc2FnZVBhcnNpbmdUZXN0LmNwcCBpbiBTb3VyY2VzICov
LAogCQkJCTdDQ0U3RUQyMUE0MTFBN0UwMDQ0N0M0QyAvKiBTdWJyZXNvdXJjZUVycm9yQ3Jhc2gu
bW0gaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv
bWFjL1N0cmluZ1dpZHRoLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5n
V2lkdGgubW0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMC4uMjc5M2U3NWIxYjAzNDZlOTYzZDgzOTk3OTI4ZTA2MTNmZmI3
ZGNiZQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0
cmluZ1dpZHRoLm1tCkBAIC0wLDAgKzEsNDEgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjEg
QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFu
ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9k
aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k
aXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl
IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0
IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlz
dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp
Z2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93
aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt
YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09G
VFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFT
IElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElO
RywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJD
SEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUg
RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVU
T1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBT
UEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO
RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09E
UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNT
CisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJ
QUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP
UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5Z
IFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YK
KyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0ICJjb25m
aWcuaCIKKworI2lmIFBMQVRGT1JNKE1BQykKKworI2ltcG9ydCA8QXBwS2l0L0FwcEtpdC5oPgor
I2ltcG9ydCA8Rm91bmRhdGlvbi9Gb3VuZGF0aW9uLmg+CisjaW1wb3J0IDxXZWJLaXQvV2ViS2l0
TlNTdHJpbmdFeHRyYXMuaD4KKworVEVTVChXZWJLaXRMZWdhY3lTdHJpbmdXaWR0aCwgVGhhaVdp
ZHRoRm9yV2ViKQoreworICAgIE5TU3RyaW5nICp0ZXN0U3RyaW5nID0gQCLguITguYnguJnguKvg
uLLguYPguJkiOworICAgIGZsb2F0IHJlc3VsdCA9IFt0ZXN0U3RyaW5nIF93ZWJfd2lkdGhXaXRo
Rm9udDpbTlNGb250IHN5c3RlbUZvbnRPZlNpemU6MTZdXTsKKyAgICBFWFBFQ1RfR0UocmVzdWx0
LCAyMCk7Cit9CisKKyNlbmRpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>432309</attachid>
            <date>2021-06-25 16:26:49 -0700</date>
            <delta_ts>2021-06-25 17:09:25 -0700</delta_ts>
            <desc>Patch for committing</desc>
            <filename>bug-227385-20210625162648.patch</filename>
            <type>text/plain</type>
            <size>10162</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNGYwZjg2NDFiZGU1
YzM4Y2YxNzFmZmVlYzVmZjY3ZTc2MzY1NS4uN2UzNjZjNjYwYzg3NmQyYjdlNTNhZmRjMDZlZTNh
OTFkZGEyNDdiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA2LTI1ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSAt
W05TU3RyaW5nIF93ZWJfd2lkdGhXaXRoRm9udDpdIHJldHVybnMgMAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mzg1CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS83OTQzMDkzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisK
KyAgICAgICAgU2ltcGx5IHRha2UgdGhlIGlPUyBjb2RlcGF0aCBvbiBtYWNPUy4KKworICAgICAg
ICBUZXN0OiBXZWJLaXRMZWdhY3lTdHJpbmdXaWR0aC5UaGFpV2lkdGhGb3JXZWIKKworICAgICAg
ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9y
bS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q2FzY2FkZUNvcmVUZXh0LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OkZvbnRDYXNjYWRlOjpGb250Q2FzY2FkZSk6CisKIDIwMjEtMDYtMjQgIFZlbmt5IERh
c3MgIDx5YXJhbmFtYXZlbmthdGFyYW1hbmFAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoIGlu
IElEQlRyYW5zYWN0aW9uOjpkaXNwYXRjaEV2ZW50IHdoZW4gbV9vcGVuREJSZXF1ZXN0IGlzIG51
bGwuIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENh
c2NhZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUu
Y3BwCmluZGV4IDAzMGM1NzUwMTUxNTZlMjY2OWQxMDU3NmFiZjgwYWM4NjU5MmFiMzAuLmFjNTRl
NjgxMzk5Mjg0ZWQ4YmY4YTExYzc2YWIxMWZkZmNmZDEzZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKQEAgLTg5LDIxICs4OSw2IEBA
IEZvbnRDYXNjYWRlOjpGb250Q2FzY2FkZShGb250Q2FzY2FkZURlc2NyaXB0aW9uJiYgZmQsIGZs
b2F0IGxldHRlclNwYWNpbmcsIGZsb2F0CiB7CiB9CiAKLS8vIEZJWE1FOiBXZSBzaG91bGQgbWFr
ZSB0aGlzIGNvbnN0cnVjdG9yIHBsYXRmb3JtLWluZGVwZW5kZW50LgotRm9udENhc2NhZGU6OkZv
bnRDYXNjYWRlKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIGZvbnREYXRhLCBGb250U21vb3RoaW5n
TW9kZSBmb250U21vb3RoaW5nTW9kZSkKLSAgICA6IG1fZm9udHMoRm9udENhc2NhZGVGb250czo6
Y3JlYXRlRm9yUGxhdGZvcm1Gb250KGZvbnREYXRhKSkKLSAgICAsIG1fZW5hYmxlS2VybmluZyhj
b21wdXRlRW5hYmxlS2VybmluZygpKQotICAgICwgbV9yZXF1aXJlc1NoYXBpbmcoY29tcHV0ZVJl
cXVpcmVzU2hhcGluZygpKQotewotICAgIG1fZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhp
bmcoZm9udFNtb290aGluZ01vZGUpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgbV9m
b250RGVzY3JpcHRpb24uc2V0U3BlY2lmaWVkU2l6ZShDVEZvbnRHZXRTaXplKGZvbnREYXRhLmZv
bnQoKSkpOwotICAgIG1fZm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShDVEZvbnRHZXRT
aXplKGZvbnREYXRhLmZvbnQoKSkpOwotICAgIG1fZm9udERlc2NyaXB0aW9uLnNldElzSXRhbGlj
KENURm9udEdldFN5bWJvbGljVHJhaXRzKGZvbnREYXRhLmZvbnQoKSkgJiBrQ1RGb250VHJhaXRJ
dGFsaWMpOwotICAgIG1fZm9udERlc2NyaXB0aW9uLnNldFdlaWdodCgoQ1RGb250R2V0U3ltYm9s
aWNUcmFpdHMoZm9udERhdGEuZm9udCgpKSAmIGtDVEZvbnRUcmFpdEJvbGQpID8gYm9sZFdlaWdo
dFZhbHVlKCkgOiBub3JtYWxXZWlnaHRWYWx1ZSgpKTsKLSNlbmRpZgotfQotCiBGb250Q2FzY2Fk
ZTo6Rm9udENhc2NhZGUoY29uc3QgRm9udENhc2NhZGUmIG90aGVyKQogICAgIDogbV9mb250RGVz
Y3JpcHRpb24ob3RoZXIubV9mb250RGVzY3JpcHRpb24pCiAgICAgLCBtX2ZvbnRzKG90aGVyLm1f
Zm9udHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3Jl
dGV4dC9Gb250Q2FzY2FkZUNvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2NvcmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwCmluZGV4IDc1NTdkMGFjZTQ0
Y2JlM2MzZGE5NTcxZTZlZWU4ZjZhNDA2OTYyZjguLjhiNjhlMTAxNWIzNzk3ZWI3ZGFhMWUyNTI2
M2E3N2Y5Zjc3M2Y3NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NvcmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDYXNjYWRlQ29yZVRleHQuY3BwCkBAIC00
Miw2ICs0MiwxOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK0ZvbnRDYXNjYWRlOjpGb250
Q2FzY2FkZShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBmb250RGF0YSwgRm9udFNtb290aGluZ01v
ZGUgZm9udFNtb290aGluZ01vZGUpCisgICAgOiBtX2ZvbnRzKEZvbnRDYXNjYWRlRm9udHM6OmNy
ZWF0ZUZvclBsYXRmb3JtRm9udChmb250RGF0YSkpCisgICAgLCBtX2VuYWJsZUtlcm5pbmcoY29t
cHV0ZUVuYWJsZUtlcm5pbmcoKSkKKyAgICAsIG1fcmVxdWlyZXNTaGFwaW5nKGNvbXB1dGVSZXF1
aXJlc1NoYXBpbmcoKSkKK3sKKyAgICBtX2ZvbnREZXNjcmlwdGlvbi5zZXRGb250U21vb3RoaW5n
KGZvbnRTbW9vdGhpbmdNb2RlKTsKKyAgICBtX2ZvbnREZXNjcmlwdGlvbi5zZXRTcGVjaWZpZWRT
aXplKENURm9udEdldFNpemUoZm9udERhdGEuY3RGb250KCkpKTsKKyAgICBtX2ZvbnREZXNjcmlw
dGlvbi5zZXRDb21wdXRlZFNpemUoQ1RGb250R2V0U2l6ZShmb250RGF0YS5jdEZvbnQoKSkpOwor
ICAgIG1fZm9udERlc2NyaXB0aW9uLnNldElzSXRhbGljKENURm9udEdldFN5bWJvbGljVHJhaXRz
KGZvbnREYXRhLmN0Rm9udCgpKSAmIGtDVEZvbnRUcmFpdEl0YWxpYyk7CisgICAgbV9mb250RGVz
Y3JpcHRpb24uc2V0V2VpZ2h0KChDVEZvbnRHZXRTeW1ib2xpY1RyYWl0cyhmb250RGF0YS5jdEZv
bnQoKSkgJiBrQ1RGb250VHJhaXRCb2xkKSA/IGJvbGRXZWlnaHRWYWx1ZSgpIDogbm9ybWFsV2Vp
Z2h0VmFsdWUoKSk7Cit9CisKIHN0YXRpYyBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHJvdGF0ZUxl
ZnRUcmFuc2Zvcm0oKQogewogICAgIHN0YXRpYyBBZmZpbmVUcmFuc2Zvcm0gcmVzdWx0KDAsIC0x
LCAxLCAwLCAwLCAwKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n
ZUxvZwppbmRleCBjZGNkZjkxODcwOGQyMDcxZTI5YmIxMDk3MGY4ZmM4Y2U1MzI0ZDZjLi4yM2Mz
NmVmY2QwZGU1YzBiMDdkMTNlOTQ1MzkzM2RjYjlhOGYzYWRjIDEwMDY0NAotLS0gYS9Ub29scy9D
aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDYt
MjUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBb
bWFjT1NdIC1bTlNTdHJpbmcgX3dlYl93aWR0aFdpdGhGb250Ol0gcmV0dXJucyAwCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjczODUKKyAgICAgICAg
PHJkYXI6Ly9wcm9ibGVtLzc5NDMwOTM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZy
YXNlci4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ov
cHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmlu
Z1dpZHRoLm1tOiBBZGRlZC4KKyAgICAgICAgKFRFU1QpOgorCiAyMDIxLTA2LTI0ICBLYXRlIENo
ZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFdLV2ViVmlldyBs
b2FkU2ltdWxhdGVkUmVxdWVzdCBkb2VzIG5vdCBzZXQgYXR0cmlidXRpb24gdmFsdWUgZm9yIHVy
bCByZXF1ZXN0cyB3aXRoaW4gaHRtbCBjb250ZW50CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2Vi
S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4
IDQ5ZTdlNGE5ZGZmYWJlNmMyYmJkZjBjOWQ2MzhkY2NiNjg4NjFmNjUuLjFjMWY4MDhkYmExZjE0
YmNkM2MyYTQyNDgyMTM2NzI2Y2MxYjliMGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB
UEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0x
MTcsNiArMTE3LDcgQEAKIAkJMUM3OTIwMUMyMzRCREQ5QjAwMUVBRjIzIC8qIENvcHlSVEYubW0g
aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzc5MjAxQjIz
NEJERDlCMDAxRUFGMjMgLyogQ29weVJURi5tbSAqLzsgfTsKIAkJMUM3RkVCMjAyMDdDMEYyRTAw
RDIzMjc4IC8qIEJhY2tncm91bmRDb2xvci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1
aWxkRmlsZTsgZmlsZVJlZiA9IDFDN0ZFQjFGMjA3QzBGMkQwMEQyMzI3OCAvKiBCYWNrZ3JvdW5k
Q29sb3IubW0gKi87IH07CiAJCTFDODE4MDI3MjVGQjA5RTIwMDYwOEIzRSAvKiBGb250UmVnaXN0
cnlTYW5kYm94Q2hlY2subW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp
bGVSZWYgPSAxQzgxODAyNjI1RkIwOUUyMDA2MDhCM0UgLyogRm9udFJlZ2lzdHJ5U2FuZGJveENo
ZWNrLm1tICovOyB9OworCQkxQzhGQTUzQTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgu
bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzhGQTUz
OTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgubW0gKi87IH07CiAJCTFDOTA0MjBDMjMy
NkUwM0MwMEJFRjkxRSAvKiBTZWxlY3Rpb25CeVdvcmQubW0gaW4gU291cmNlcyAqLyA9IHtpc2Eg
PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzkwNDIwQjIzMjZFMDNDMDBCRUY5MUUgLyogU2Vs
ZWN0aW9uQnlXb3JkLm1tICovOyB9OwogCQkxQzlFQjg0MTFFMzgwREExMDA1QzY0NDIgLyogQ29t
cGxleFRleHRDb250cm9sbGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls
ZTsgZmlsZVJlZiA9IDFDOUVCODQwMUUzODBEQTEwMDVDNjQ0MiAvKiBDb21wbGV4VGV4dENvbnRy
b2xsZXIuY3BwICovOyB9OwogCQkxQ0FDQURBMTIzMDYyMEFFMDAwN0Q1NEMgLyogV0tXZWJWaWV3
T3BhcXVlLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g
MUNBQ0FEQTAyMzA2MjBBRDAwMDdENTRDIC8qIFdLV2ViVmlld09wYXF1ZS5tbSAqLzsgfTsKQEAg
LTE4NzMsNiArMTg3NCw3IEBACiAJCTFDNzkyMDFCMjM0QkREOUIwMDFFQUYyMyAvKiBDb3B5UlRG
Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL
bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gQ29weVJURi5tbTsg
c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUM3RkVCMUYyMDdDMEYyRDAwRDIzMjc4IC8q
IEJhY2tncm91bmRDb2xvci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j
b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0
aCA9IEJhY2tncm91bmRDb2xvci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUM4
MTgwMjYyNUZCMDlFMjAwNjA4QjNFIC8qIEZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbSAqLyA9
IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu
Y3BwLm9iamNwcDsgcGF0aCA9IEZvbnRSZWdpc3RyeVNhbmRib3hDaGVjay5tbTsgc291cmNlVHJl
ZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUM4RkE1MzkyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dp
ZHRoLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0g
c291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gU3RyaW5nV2lkdGgubW07IHNvdXJjZVRyZWUg
PSAiPGdyb3VwPiI7IH07CiAJCTFDOTA0MjBCMjMyNkUwM0MwMEJFRjkxRSAvKiBTZWxlY3Rpb25C
eVdvcmQubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg
bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBTZWxlY3Rp
b25CeVdvcmQubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDOUVCODQwMUUzODBE
QTEwMDVDNjQ0MiAvKiBDb21wbGV4VGV4dENvbnRyb2xsZXIuY3BwICovID0ge2lzYSA9IFBCWEZp
bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl
Y29kZS5jcHAuY3BwOyBwYXRoID0gQ29tcGxleFRleHRDb250cm9sbGVyLmNwcDsgc291cmNlVHJl
ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUNBQ0FEQTAyMzA2MjBBRDAwMDdENTRDIC8qIFdLV2ViVmll
d09wYXF1ZS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0
OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLV2Vi
Vmlld09wYXF1ZS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQ3NjIsNiArNDc2
NCw3IEBACiAJCQkJRTE5NEUxQkExNzdFNTE0NTAwOUM0RDRFIC8qIFN0b3BMb2FkaW5nRnJvbURp
ZFJlY2VpdmVSZXNwb25zZS5tbSAqLywKIAkJCQkzNzk5QUQzOTE0MTIwQTQzMDA1RUIwQzYgLyog
U3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJpbmcubW0gKi8sCiAJCQkJOTM5QkZF
MzkxOEU1NTQ4OTAwODgzMjc1IC8qIFN0cmluZ1RydW5jYXRvci5tbSAqLywKKwkJCQkxQzhGQTUz
OTI2ODVBNkQ1MDBCN0U0OUUgLyogU3RyaW5nV2lkdGgubW0gKi8sCiAJCQkJMzdBNjg5NUQxNDhB
OUI1MDAwNTEwMEZBIC8qIFN1YnJlc291cmNlRXJyb3JDcmFzaC5tbSAqLywKIAkJCQlFNDkwMjk2
NzE0RTJFM0E0MDAyQkVERDEgLyogVHlwaW5nU3R5bGVDcmFzaC5tbSAqLywKIAkJCQk1MzY3NzAz
MzFDQzgwMjI4MDBENDI1QjEgLyogV2ViU2NyaXB0T2JqZWN0RGVzY3JpcHRpb24ubW0gKi8sCkBA
IC01NzY3LDYgKzU3NzAsNyBAQAogCQkJCTdDQ0U3RUQwMUE0MTFBN0UwMDQ0N0M0QyAvKiBTdHJp
bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0RnJvbVN0cmluZy5tbSBpbiBTb3VyY2VzICovLAogCQkJ
CTdDQ0U3RUQxMUE0MTFBN0UwMDQ0N0M0QyAvKiBTdHJpbmdUcnVuY2F0b3IubW0gaW4gU291cmNl
cyAqLywKIAkJCQlFQ0E2ODBDRTFFNjhDQzA5MDA3MzFEMjAgLyogU3RyaW5nVXRpbGl0aWVzLm1t
IGluIFNvdXJjZXMgKi8sCisJCQkJMUM4RkE1M0EyNjg1QTZENTAwQjdFNDlFIC8qIFN0cmluZ1dp
ZHRoLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQ0U0RDVERTcxRjY3NDNCQTAwNzJDRkM2IC8qIFN0
cmluZ1dpdGhEaXJlY3Rpb24uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNDFFNjdBODUyNUQxNkU4
MzAwN0IwQTRDIC8qIFNUVU5NZXNzYWdlUGFyc2luZ1Rlc3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJ
CQkJN0NDRTdFRDIxQTQxMUE3RTAwNDQ3QzRDIC8qIFN1YnJlc291cmNlRXJyb3JDcmFzaC5tbSBp
biBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMv
U3RyaW5nV2lkdGgubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdXaWR0
aC5tbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi4yNzkzZTc1YjFiMDM0NmU5NjNkODM5OTc5MjhlMDYxM2ZmYjdkY2Jl
Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU3RyaW5n
V2lkdGgubW0KQEAgLTAsMCArMSw0MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBBcHBs
ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVz
ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmlj
YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv
bnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz
dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg
Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmli
dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK
KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg
ZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy
aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FS
RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn
JworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC
VVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U
QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND
TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMK
KyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ
QUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC
VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9S
IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAq
IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM
SVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo
SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZ
IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICog
VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZpZy5o
IgorCisjaWYgUExBVEZPUk0oTUFDKQorCisjaW1wb3J0IDxBcHBLaXQvQXBwS2l0Lmg+CisjaW1w
b3J0IDxGb3VuZGF0aW9uL0ZvdW5kYXRpb24uaD4KKyNpbXBvcnQgPFdlYktpdC9XZWJLaXROU1N0
cmluZ0V4dHJhcy5oPgorCitURVNUKFdlYktpdExlZ2FjeVN0cmluZ1dpZHRoLCBUaGFpV2lkdGhG
b3JXZWIpCit7CisgICAgTlNTdHJpbmcgKnRlc3RTdHJpbmcgPSBAIuC4hOC5ieC4meC4q+C4suC5
g+C4mSI7CisgICAgZmxvYXQgcmVzdWx0ID0gW3Rlc3RTdHJpbmcgX3dlYl93aWR0aFdpdGhGb250
OltOU0ZvbnQgc3lzdGVtRm9udE9mU2l6ZToxNl1dOworICAgIEVYUEVDVF9HRShyZXN1bHQsIDIw
KTsKK30KKworI2VuZGlmCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>