<?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>229633</bug_id>
          
          <creation_ts>2021-08-27 15:32:56 -0700</creation_ts>
          <short_desc>[Cocoa] Drawing system fallback fonts to canvas causes a crash</short_desc>
          <delta_ts>2021-09-11 02:07:48 -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>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=230187</see_also>
          <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>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1788205</commentid>
    <comment_count>0</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-08-27 15:32:56 -0700</bug_when>
    <thetext>[Cocoa] Drawing system fallback fonts to canvas causes a crash</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788207</commentid>
    <comment_count>1</comment_count>
      <attachid>436683</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-08-27 15:34:29 -0700</bug_when>
    <thetext>Created attachment 436683
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788208</commentid>
    <comment_count>2</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-08-27 15:35:00 -0700</bug_when>
    <thetext>&lt;rdar://problem/81889036&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788209</commentid>
    <comment_count>3</comment_count>
      <attachid>436684</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-08-27 15:35:17 -0700</bug_when>
    <thetext>Created attachment 436684
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788211</commentid>
    <comment_count>4</comment_count>
      <attachid>436683</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-08-27 15:40:03 -0700</bug_when>
    <thetext>Comment on attachment 436683
Patch

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

r=mews!

&gt; LayoutTests/fast/text/system-fallback-canvas.html:1
&gt; +&lt;!DOCTYPE html&gt;

Might be nice to have a ref-mismatch test to ensure that at least something was drawn to the canvas.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788212</commentid>
    <comment_count>5</comment_count>
      <attachid>436685</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-08-27 15:41:30 -0700</bug_when>
    <thetext>Created attachment 436685
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788215</commentid>
    <comment_count>6</comment_count>
      <attachid>436685</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-08-27 15:54:15 -0700</bug_when>
    <thetext>Comment on attachment 436685
Patch

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

&gt; LayoutTests/fast/text/draw-synthetic-system-bold-font-into-canvas-expected-mismatch.html:4
&gt; +&lt;script src=&quot;../../resources/js-test.js&quot;&gt;&lt;/script&gt;

This should probably be removed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788216</commentid>
    <comment_count>7</comment_count>
      <attachid>436687</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2021-08-27 15:56:47 -0700</bug_when>
    <thetext>Created attachment 436687
Patch for committing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788794</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-31 00:18:22 -0700</bug_when>
    <thetext>Committed r281792 (241129@main): &lt;https://commits.webkit.org/241129@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436687.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436683</attachid>
            <date>2021-08-27 15:34:29 -0700</date>
            <delta_ts>2021-08-27 15:40:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229633-20210827153429.patch</filename>
            <type>text/plain</type>
            <size>7440</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q
QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBjMjMxNTRh
NGZhOTQyZGVlYzAyMmVlMTk0NjM1Yjc4ZDNlYmEwNzYyLi5mNTEwZDRmMTNjYmJiMzhlZjI0YTU1
ZWU1M2IyMGU1Yjg5OGQ0YjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor
MjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg
ICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sgZm9udHMgdG8gY2FudmFzIGNh
dXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjk2MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIHBhbC9zcGkvY2YvQ29yZVRleHRTUEkuaDoKKwogMjAyMS0wOC0yNSAgS2F0ZSBDaGVu
ZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJDcnlwdG8gdXNl
cyBkZXByZWNhdGVkIENDS2V5RGVyaXZhdGlvbkhNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZTNmZDIyOTI3ZmRi
YzY5NzA3N2RjODNlZTU3NjcxN2MyMmMwNjliZC4uYWY4ZjhhNTIxNzU5YjhiYTQ1ZGFmY2RlNGE3
YzRmNmQ0YzUxNDRlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv
U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMS0wOC0yNyAgTXls
ZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0g
RHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sgZm9udHMgdG8gY2FudmFzIGNhdXNlcyBhIGNyYXNoCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk2MzMKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb3QtcHJlZml4
ZWQgZm9udCBuYW1lcyBkb24ndCBzdXJ2aXZlIHRoZSByb3VuZC10cmlwIHRocm91Z2gKKyAgICAg
ICAgQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGVzKENURm9udENvcHlGb250RGVzY3JpcHRv
cihmb250KSkgdW5sZXNzIHlvdSBhbHNvCisgICAgICAgIHBhc3MgaW4gdGhlIGtDVEZvbnRPcHRp
b25zU3lzdGVtVUlGb250IG9wdGlvbi4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvc3lzdGVt
LWZhbGxiYWNrLWNhbnZhcy5odG1sCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2ViQ29yZUFy
Z3VtZW50Q29kZXJzQ29jb2EubW06CisgICAgICAgIChJUEM6OmNyZWF0ZUNURm9udCk6CisgICAg
ICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjb2RlUGxhdGZv
cm1EYXRhKToKKwogMjAyMS0wOC0yNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog
CiAgICAgICAgIFtXSzJdIFJldXNlIHRoZSBzYW1lIG5ldHdvcmsgbG9hZCB3aGVuIHByb2Nlc3Mt
c3dhcHBpbmcgb24gcmVzb3VyY2UgcmVzcG9uc2UgZHVlIHRvIENPT1AKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmggYi9Tb3VyY2UvV2ViQ29y
ZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCmluZGV4IDQ5MDg2NjM5OGM0YjUwNDU0MDk0
YmJhOTRmZTgxOGRhYzNlZjhjZGEuLjJkMmJhZmM5NjY3ZWFiOWQxYzQ3NWI2NTJhMjkzOGNiZGJh
YjY5M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVUZXh0
U1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEkuaApA
QCAtNTgsNiArNTgsMTAgQEAgdHlwZWRlZiBDRl9PUFRJT05TKHVpbnQzMl90LCBDVEZvbnREZXNj
cmlwdG9yT3B0aW9ucykgewogICAgIGtDVEZvbnREZXNjcmlwdG9yT3B0aW9uUHJlZmVyQXBwbGVT
eXN0ZW1Gb250ID0ga0NURm9udE9wdGlvbnNQcmVmZXJTeXN0ZW1Gb250CiB9OwogCitlbnVtIHsK
KyAgICBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCA9IDEgPDwgMSwKK307CisKIGVudW0gewog
ICAgIGtDVFJ1blN0YXR1c0hhc09yaWdpbnMgPSAoMSA8PCA0KSwKIH07CkBAIC0xNDgsNiArMTUy
LDcgQEAgZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVEZyYW1lTWF4aW11bU51bWJlck9mTGlu
ZXNBdHRyaWJ1dGVOYW1lOwogCiBib29sIENURm9udERlc2NyaXB0b3JJc1N5c3RlbVVJRm9udChD
VEZvbnREZXNjcmlwdG9yUmVmKTsKIGJvb2wgQ1RGb250SXNTeXN0ZW1VSUZvbnQoQ1RGb250UmVm
KTsKK0NURm9udFJlZiBDVEZvbnRDcmVhdGVXaXRoRm9udERlc2NyaXB0b3JBbmRPcHRpb25zKENU
Rm9udERlc2NyaXB0b3JSZWYsIENHRmxvYXQgc2l6ZSwgY29uc3QgQ0dBZmZpbmVUcmFuc2Zvcm0q
LCBDVEZvbnRPcHRpb25zKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDU1MoQ0ZTdHJpbmdS
ZWYgbmFtZSwgdWludDE2X3Qgd2VpZ2h0LCBDVEZvbnRTeW1ib2xpY1RyYWl0cywgQ0dGbG9hdCBz
aXplKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1YWdlKENU
Rm9udFJlZiBjdXJyZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4
IGxlbmd0aCwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UsIENGSW5kZXggKmNvdmVyZWRMZW5ndGgpOwog
Q1RGb250UmVmIENURm9udENyZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2VBbmRPcHRpb24o
Q1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5k
ZXggbGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5ndWFnZSwgQ1RGb250RmFsbGJhY2tPcHRpb24sIENG
SW5kZXggKmNvdmVyZWRMZW5ndGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQv
Q29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJl
ZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQppbmRleCBhODJmZjg2NjhmNmRl
ZDdhZDE3MDcxNmQ5NzBhZDljNGYzMDg4NWExLi4yOWNkNjBmNTU3YzU3ZDk5OGFlZjdhYWE5NDJm
MTIzNmMwOTc3MTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJD
b3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2Nv
YS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbQpAQCAtNTAxLDYgKzUwMSwyNCBAQCBzdGF0
aWMgUmV0YWluUHRyPENURm9udERlc2NyaXB0b3JSZWY+IGZpbmRGb250RGVzY3JpcHRvcihjb25z
dCBTdHJpbmcmIHJlZmVyZW5jZQogICAgIHJldHVybiBudWxscHRyOwogfQogCitzdGF0aWMgUmV0
YWluUHRyPENURm9udFJlZj4gY3JlYXRlQ1RGb250KENGRGljdGlvbmFyeVJlZiBhdHRyaWJ1dGVz
LCBmbG9hdCBzaXplLCBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZVVSTCwgY29uc3QgU3RyaW5nJiBw
b3N0U2NyaXB0TmFtZSkKK3sKKyAgICBpZiAoYXV0byBuYW1lID0gc3RhdGljX2Nhc3Q8Q0ZTdHJp
bmdSZWY+KENGRGljdGlvbmFyeUdldFZhbHVlKGF0dHJpYnV0ZXMsIGtDVEZvbnROYW1lQXR0cmli
dXRlKSkpIHsKKyAgICAgICAgaWYgKENGU3RyaW5nSGFzUHJlZml4KG5hbWUsIENGU1RSKCIuIikp
KSB7CisgICAgICAgICAgICBhdXRvIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNj
cmlwdG9yQ3JlYXRlV2l0aEF0dHJpYnV0ZXMoYXR0cmlidXRlcykpOworICAgICAgICAgICAgaWYg
KCFmb250RGVzY3JpcHRvcikKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICAg
ICAgICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvckFuZE9w
dGlvbnMoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIsIGtDVEZvbnRPcHRpb25z
U3lzdGVtVUlGb250KSk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBhdXRvIGZvbnREZXNjcmlw
dG9yID0gZmluZEZvbnREZXNjcmlwdG9yKHJlZmVyZW5jZVVSTCwgcG9zdFNjcmlwdE5hbWUpOwor
ICAgIGlmICghZm9udERlc2NyaXB0b3IpCisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIGZv
bnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3JlYXRlQ29weVdpdGhBdHRy
aWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLCBhdHRyaWJ1dGVzKSk7CisgICAgcmV0dXJuIGFk
b3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGZvbnREZXNjcmlwdG9yLmdldCgp
LCBzaXplLCBudWxscHRyKSk7Cit9CisKIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6Rm9udFBsYXRm
b3JtRGF0YT4gQXJndW1lbnRDb2RlcjxSZWY8V2ViQ29yZTo6Rm9udD4+OjpkZWNvZGVQbGF0Zm9y
bURhdGEoRGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZv
bnRPcmllbnRhdGlvbj4gb3JpZW50YXRpb247CkBAIC01ODAsMTEgKzU5OCw5IEBAIHN0ZDo6b3B0
aW9uYWw8V2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YT4gQXJndW1lbnRDb2RlcjxSZWY8V2ViQ29y
ZTo6Rm9udD4+OjpkZWNvCiAgICAgaWYgKCFwb3N0U2NyaXB0TmFtZSkKICAgICAgICAgcmV0dXJu
IHN0ZDo6bnVsbG9wdDsKIAotICAgIGF1dG8gZm9udERlc2NyaXB0b3IgPSBmaW5kRm9udERlc2Ny
aXB0b3IoKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3JpcHROYW1lKTsKLSAgICBpZiAoIWZvbnREZXNj
cmlwdG9yKQorICAgIGF1dG8gY3RGb250ID0gY3JlYXRlQ1RGb250KGF0dHJpYnV0ZXMtPmdldCgp
LCAqc2l6ZSwgKnJlZmVyZW5jZVVSTCwgKnBvc3RTY3JpcHROYW1lKTsKKyAgICBpZiAoIWN0Rm9u
dCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICBmb250RGVzY3JpcHRvciA9IGFk
b3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZUNvcHlXaXRoQXR0cmlidXRlcyhmb250RGVzY3Jp
cHRvci5nZXQoKSwgYXR0cmlidXRlcy0+Z2V0KCkpKTsKLSAgICBhdXRvIGN0Rm9udCA9IGFkb3B0
Q0YoQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yKGZvbnREZXNjcmlwdG9yLmdldCgpLCAq
c2l6ZSwgbnVsbHB0cikpOwogCiAgICAgcmV0dXJuIFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGEo
Y3RGb250LmdldCgpLCAqc2l6ZSwgKnN5bnRoZXRpY0JvbGQsICpzeW50aGV0aWNPYmxpcXVlLCAq
b3JpZW50YXRpb24sICp3aWR0aFZhcmlhbnQsICp0ZXh0UmVuZGVyaW5nTW9kZSk7CiB9CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k
ZXggNTUzYjdlYzRkMjAzYTRhNjJjZTNkMmMzOTEwMmMzYWYyNWI0NmRkYS4uMzllZmNmOWQ0Mzky
YmZmZWI4OWQ5N2E2NWU3OTFhMTQzMDVkNDY0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIx
LTA4LTI3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAg
ICAgW0NvY29hXSBEcmF3aW5nIHN5c3RlbSBmYWxsYmFjayBmb250cyB0byBjYW52YXMgY2F1c2Vz
IGEgY3Jhc2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyOTYzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
ICogZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4K
KyAgICAgICAgKiBmYXN0L3RleHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZhcy5odG1sOiBBZGRlZC4K
KwogMjAyMS0wOC0yNyAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAog
ICAgICAgICBbIEJpZ1N1ciBFV1NdIHdlYnJ0Yy92aWRlby1tZWRpYXN0cmVhbXRyYWNrLXN0YXRz
Lmh0bWwgaXMgYSBmbGFreSBjcmFzaCAvIGZhaWxpbmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9mYXN0L3RleHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZhcy1leHBlY3RlZC50eHQgYi9MYXlvdXRU
ZXN0cy9mYXN0L3RleHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZhcy1leHBlY3RlZC50eHQKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uZmU1NjBiMGU4MTkxNzQ1ZDg4NWU5ZGZhMWQzZGE1MDhlMDgxY2NkYwotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLWV4
cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IGRyYXdp
bmcgYSBzeXN0ZW0gZmFsbGJhY2sgZm9udCB0byBjYW52YXMgZG9lc24ndCBjcmFzaCBhbnkgcHJv
Y2Vzcy4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIG5vIGNyYXNoLgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMuaHRtbCBiL0xheW91
dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLmh0bWwKbmV3IGZpbGUgbW9k
ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u
Y2EyMGJkOWIxZDY1ZDg2YjQxMTNmY2Y4YzZkNTU2ZjcxZjBlM2RmOQotLS0gL2Rldi9udWxsCisr
KyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLmh0bWwKQEAg
LTAsMCArMSwxOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hh
cnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0
IGRyYXdpbmcgYSBzeXN0ZW0gZmFsbGJhY2sgZm9udCB0byBjYW52YXMgZG9lc24ndCBjcmFzaCBh
bnkgcHJvY2Vzcy4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIG5vIGNyYXNoLgorPGNhbnZh
cyBpZD0iY2FudmFzIiB3aWR0aD0iNDAwIiBoZWlnaHQ9IjQwMCI+PC9jYW52YXM+Cis8c2NyaXB0
PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwor
bGV0IGNhbnZhcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjYW52YXMiKTsKK2xldCBjb250
ZXh0ID0gY2FudmFzLmdldENvbnRleHQoIjJkIik7Citjb250ZXh0LmZvbnQgPSAiYm9sZCAzNnB4
IHN5c3RlbS11aSI7Citjb250ZXh0LmZpbGxUZXh0KCLoi7nmnpznlLXohJEiLCAxMDAsIDEwMCk7
Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436684</attachid>
            <date>2021-08-27 15:35:17 -0700</date>
            <delta_ts>2021-08-27 15:41:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229633-20210827153517.patch</filename>
            <type>text/plain</type>
            <size>7545</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q
QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBjMjMxNTRh
NGZhOTQyZGVlYzAyMmVlMTk0NjM1Yjc4ZDNlYmEwNzYyLi45YjY1ZmZiM2JlOTUwNjdhZWUzM2Zm
OTNiMzIwY2ExOWM1NWU1ZmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor
MjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg
ICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sgZm9udHMgdG8gY2FudmFzIGNh
dXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjk2MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxODg5MDM2PgorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFsL3NwaS9jZi9Db3Jl
VGV4dFNQSS5oOgorCiAyMDIxLTA4LTI1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlA
YXBwbGUuY29tPgogCiAgICAgICAgIFdlYkNyeXB0byB1c2VzIGRlcHJlY2F0ZWQgQ0NLZXlEZXJp
dmF0aW9uSE1hYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZwppbmRleCBlM2ZkMjI5MjdmZGJjNjk3MDc3ZGM4M2VlNTc2NzE3YzIy
YzA2OWJkLi44ZTM4ZDNkM2RiMDY2Mjk1NWVkZWFkMTQyNzU4ZjNmOTBiZTRkMTUwIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTI3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhm
aWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBEcmF3aW5nIHN5c3RlbSBmYWxsYmFj
ayBmb250cyB0byBjYW52YXMgY2F1c2VzIGEgY3Jhc2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTYzMworICAgICAgICA8cmRhcjovL3Byb2JsZW0v
ODE4ODkwMzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgRG90LXByZWZpeGVkIGZvbnQgbmFtZXMgZG9uJ3Qgc3Vydml2ZSB0aGUgcm91bmQtdHJpcCB0
aHJvdWdoCisgICAgICAgIENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlcyhDVEZvbnRDb3B5
Rm9udERlc2NyaXB0b3IoZm9udCkpIHVubGVzcyB5b3UgYWxzbworICAgICAgICBwYXNzIGluIHRo
ZSBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCBvcHRpb24uCisKKyAgICAgICAgVGVzdDogZmFz
dC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMuaHRtbAorCisgICAgICAgICogU2hhcmVkL0Nv
Y29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgorICAgICAgICAoSVBDOjpjcmVhdGVD
VEZvbnQpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj46
OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIwMjEtMDgtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6
QGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBSZXVzZSB0aGUgc2FtZSBuZXR3b3JrIGxvYWQg
d2hlbiBwcm9jZXNzLXN3YXBwaW5nIG9uIHJlc291cmNlIHJlc3BvbnNlIGR1ZSB0byBDT09QCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oIGIv
U291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEkuaAppbmRleCA0OTA4NjYz
OThjNGI1MDQ1NDA5NGJiYTk0ZmU4MThkYWMzZWY4Y2RhLi4yZDJiYWZjOTY2N2VhYjlkMWM0NzVi
NjUyYTI5MzhjYmRiYWI2OTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3Nw
aS9jZi9Db3JlVGV4dFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0Nv
cmVUZXh0U1BJLmgKQEAgLTU4LDYgKzU4LDEwIEBAIHR5cGVkZWYgQ0ZfT1BUSU9OUyh1aW50MzJf
dCwgQ1RGb250RGVzY3JpcHRvck9wdGlvbnMpIHsKICAgICBrQ1RGb250RGVzY3JpcHRvck9wdGlv
blByZWZlckFwcGxlU3lzdGVtRm9udCA9IGtDVEZvbnRPcHRpb25zUHJlZmVyU3lzdGVtRm9udAog
fTsKIAorZW51bSB7CisgICAga0NURm9udE9wdGlvbnNTeXN0ZW1VSUZvbnQgPSAxIDw8IDEsCit9
OworCiBlbnVtIHsKICAgICBrQ1RSdW5TdGF0dXNIYXNPcmlnaW5zID0gKDEgPDwgNCksCiB9OwpA
QCAtMTQ4LDYgKzE1Miw3IEBAIGV4dGVybiBjb25zdCBDRlN0cmluZ1JlZiBrQ1RGcmFtZU1heGlt
dW1OdW1iZXJPZkxpbmVzQXR0cmlidXRlTmFtZTsKIAogYm9vbCBDVEZvbnREZXNjcmlwdG9ySXNT
eXN0ZW1VSUZvbnQoQ1RGb250RGVzY3JpcHRvclJlZik7CiBib29sIENURm9udElzU3lzdGVtVUlG
b250KENURm9udFJlZik7CitDVEZvbnRSZWYgQ1RGb250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9y
QW5kT3B0aW9ucyhDVEZvbnREZXNjcmlwdG9yUmVmLCBDR0Zsb2F0IHNpemUsIGNvbnN0IENHQWZm
aW5lVHJhbnNmb3JtKiwgQ1RGb250T3B0aW9ucyk7CiBDVEZvbnRSZWYgQ1RGb250Q3JlYXRlRm9y
Q1NTKENGU3RyaW5nUmVmIG5hbWUsIHVpbnQxNl90IHdlaWdodCwgQ1RGb250U3ltYm9saWNUcmFp
dHMsIENHRmxvYXQgc2l6ZSk7CiBDVEZvbnRSZWYgQ1RGb250Q3JlYXRlRm9yQ2hhcmFjdGVyc1dp
dGhMYW5ndWFnZShDVEZvbnRSZWYgY3VycmVudEZvbnQsIGNvbnN0IFVURjE2Q2hhciAqY2hhcmFj
dGVycywgQ0ZJbmRleCBsZW5ndGgsIENGU3RyaW5nUmVmIGxhbmd1YWdlLCBDRkluZGV4ICpjb3Zl
cmVkTGVuZ3RoKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFyYWN0ZXJzV2l0aExhbmd1
YWdlQW5kT3B0aW9uKENURm9udFJlZiBjdXJyZW50Rm9udCwgY29uc3QgVVRGMTZDaGFyICpjaGFy
YWN0ZXJzLCBDRkluZGV4IGxlbmd0aCwgQ0ZTdHJpbmdSZWYgbGFuZ3VhZ2UsIENURm9udEZhbGxi
YWNrT3B0aW9uLCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tIGIvU291cmNl
L1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KaW5kZXgg
YTgyZmY4NjY4ZjZkZWQ3YWQxNzA3MTZkOTcwYWQ5YzRmMzA4ODVhMS4uMjljZDYwZjU1N2M1N2Q5
OThhZWY3YWFhOTQyZjEyMzZjMDk3NzEzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFy
ZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktp
dC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KQEAgLTUwMSw2ICs1
MDEsMjQgQEAgc3RhdGljIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9yUmVmPiBmaW5kRm9udERl
c2NyaXB0b3IoY29uc3QgU3RyaW5nJiByZWZlcmVuY2UKICAgICByZXR1cm4gbnVsbHB0cjsKIH0K
IAorc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9udChDRkRpY3Rpb25hcnlS
ZWYgYXR0cmlidXRlcywgZmxvYXQgc2l6ZSwgY29uc3QgU3RyaW5nJiByZWZlcmVuY2VVUkwsIGNv
bnN0IFN0cmluZyYgcG9zdFNjcmlwdE5hbWUpCit7CisgICAgaWYgKGF1dG8gbmFtZSA9IHN0YXRp
Y19jYXN0PENGU3RyaW5nUmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1ZShhdHRyaWJ1dGVzLCBrQ1RG
b250TmFtZUF0dHJpYnV0ZSkpKSB7CisgICAgICAgIGlmIChDRlN0cmluZ0hhc1ByZWZpeChuYW1l
LCBDRlNUUigiLiIpKSkgeworICAgICAgICAgICAgYXV0byBmb250RGVzY3JpcHRvciA9IGFkb3B0
Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhBdHRyaWJ1dGVzKGF0dHJpYnV0ZXMpKTsKKyAg
ICAgICAgICAgIGlmICghZm9udERlc2NyaXB0b3IpCisgICAgICAgICAgICAgICAgcmV0dXJuIG51
bGxwdHI7CisgICAgICAgICAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERl
c2NyaXB0b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBzaXplLCBudWxscHRyLCBr
Q1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCkpOworICAgICAgICB9CisgICAgfQorCisgICAgYXV0
byBmb250RGVzY3JpcHRvciA9IGZpbmRGb250RGVzY3JpcHRvcihyZWZlcmVuY2VVUkwsIHBvc3RT
Y3JpcHROYW1lKTsKKyAgICBpZiAoIWZvbnREZXNjcmlwdG9yKQorICAgICAgICByZXR1cm4gbnVs
bHB0cjsKKyAgICBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0
ZUNvcHlXaXRoQXR0cmlidXRlcyhmb250RGVzY3JpcHRvci5nZXQoKSwgYXR0cmlidXRlcykpOwor
ICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihmb250RGVz
Y3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpOworfQorCiBzdGQ6Om9wdGlvbmFsPFdlYkNv
cmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6
ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIpCiB7CiAgICAgc3RkOjpvcHRpb25h
bDxXZWJDb3JlOjpGb250T3JpZW50YXRpb24+IG9yaWVudGF0aW9uOwpAQCAtNTgwLDExICs1OTgs
OSBAQCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29k
ZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjbwogICAgIGlmICghcG9zdFNjcmlwdE5hbWUpCiAg
ICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBhdXRvIGZvbnREZXNjcmlwdG9yID0g
ZmluZEZvbnREZXNjcmlwdG9yKCpyZWZlcmVuY2VVUkwsICpwb3N0U2NyaXB0TmFtZSk7Ci0gICAg
aWYgKCFmb250RGVzY3JpcHRvcikKKyAgICBhdXRvIGN0Rm9udCA9IGNyZWF0ZUNURm9udChhdHRy
aWJ1dGVzLT5nZXQoKSwgKnNpemUsICpyZWZlcmVuY2VVUkwsICpwb3N0U2NyaXB0TmFtZSk7Cisg
ICAgaWYgKCFjdEZvbnQpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgZm9udERl
c2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0aEF0dHJpYnV0
ZXMoZm9udERlc2NyaXB0b3IuZ2V0KCksIGF0dHJpYnV0ZXMtPmdldCgpKSk7Ci0gICAgYXV0byBj
dEZvbnQgPSBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3JpcHRvcihmb250RGVzY3Jp
cHRvci5nZXQoKSwgKnNpemUsIG51bGxwdHIpKTsKIAogICAgIHJldHVybiBXZWJDb3JlOjpGb250
UGxhdGZvcm1EYXRhKGN0Rm9udC5nZXQoKSwgKnNpemUsICpzeW50aGV0aWNCb2xkLCAqc3ludGhl
dGljT2JsaXF1ZSwgKm9yaWVudGF0aW9uLCAqd2lkdGhWYXJpYW50LCAqdGV4dFJlbmRlcmluZ01v
ZGUpOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCmluZGV4IDU1M2I3ZWM0ZDIwM2E0YTYyY2UzZDJjMzkxMDJjM2FmMjViNDZkZGEu
LjQ4NTRkMGRiNjFkYWU3MzAzZGVlNTYzM2EzYTBjM2IzZDhhMDMyYTEgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr
MSwxNCBAQAorMjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUu
Y29tPgorCisgICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sgZm9udHMgdG8g
Y2FudmFzIGNhdXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjk2MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxODg5MDM2Pgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC90
ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg
KiBmYXN0L3RleHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZhcy5odG1sOiBBZGRlZC4KKwogMjAyMS0w
OC0yNyAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxlLmNvbT4KIAogICAgICAgICBb
IEJpZ1N1ciBFV1NdIHdlYnJ0Yy92aWRlby1tZWRpYXN0cmVhbXRyYWNrLXN0YXRzLmh0bWwgaXMg
YSBmbGFreSBjcmFzaCAvIGZhaWxpbmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Rl
eHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZhcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0
L3RleHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZhcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx
MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmU1
NjBiMGU4MTkxNzQ1ZDg4NWU5ZGZhMWQzZGE1MDhlMDgxY2NkYwotLS0gL2Rldi9udWxsCisrKyBi
L0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLWV4cGVjdGVkLnR4
dApAQCAtMCwwICsxIEBACitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IGRyYXdpbmcgYSBzeXN0
ZW0gZmFsbGJhY2sgZm9udCB0byBjYW52YXMgZG9lc24ndCBjcmFzaCBhbnkgcHJvY2Vzcy4gVGhl
IHRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIG5vIGNyYXNoLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMuaHRtbCBiL0xheW91dFRlc3RzL2Zh
c3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2EyMGJkOWIx
ZDY1ZDg2YjQxMTNmY2Y4YzZkNTU2ZjcxZjBlM2RmOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLmh0bWwKQEAgLTAsMCArMSwx
OCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRm
LTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IGRyYXdpbmcg
YSBzeXN0ZW0gZmFsbGJhY2sgZm9udCB0byBjYW52YXMgZG9lc24ndCBjcmFzaCBhbnkgcHJvY2Vz
cy4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIG5vIGNyYXNoLgorPGNhbnZhcyBpZD0iY2Fu
dmFzIiB3aWR0aD0iNDAwIiBoZWlnaHQ9IjQwMCI+PC9jYW52YXM+Cis8c2NyaXB0PgoraWYgKHdp
bmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworbGV0IGNhbnZh
cyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjYW52YXMiKTsKK2xldCBjb250ZXh0ID0gY2Fu
dmFzLmdldENvbnRleHQoIjJkIik7Citjb250ZXh0LmZvbnQgPSAiYm9sZCAzNnB4IHN5c3RlbS11
aSI7Citjb250ZXh0LmZpbGxUZXh0KCLoi7nmnpznlLXohJEiLCAxMDAsIDEwMCk7Cis8L3Njcmlw
dD4KKzwvYm9keT4KKzwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436685</attachid>
            <date>2021-08-27 15:41:30 -0700</date>
            <delta_ts>2021-08-27 15:54:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229633-20210827154129.patch</filename>
            <type>text/plain</type>
            <size>9568</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q
QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBjMjMxNTRh
NGZhOTQyZGVlYzAyMmVlMTk0NjM1Yjc4ZDNlYmEwNzYyLi45YjY1ZmZiM2JlOTUwNjdhZWUzM2Zm
OTNiMzIwY2ExOWM1NWU1ZmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor
MjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg
ICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sgZm9udHMgdG8gY2FudmFzIGNh
dXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjk2MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxODg5MDM2PgorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFsL3NwaS9jZi9Db3Jl
VGV4dFNQSS5oOgorCiAyMDIxLTA4LTI1ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlA
YXBwbGUuY29tPgogCiAgICAgICAgIFdlYkNyeXB0byB1c2VzIGRlcHJlY2F0ZWQgQ0NLZXlEZXJp
dmF0aW9uSE1hYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZwppbmRleCBlM2ZkMjI5MjdmZGJjNjk3MDc3ZGM4M2VlNTc2NzE3YzIy
YzA2OWJkLi44MTVhNGRkOWQ5MDYxZmE1M2MwNzdjNDFiZTdiMGI3NjJlMjAzNWVhIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA4LTI3ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhm
aWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBEcmF3aW5nIHN5c3RlbSBmYWxsYmFj
ayBmb250cyB0byBjYW52YXMgY2F1c2VzIGEgY3Jhc2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTYzMworICAgICAgICA8cmRhcjovL3Byb2JsZW0v
ODE4ODkwMzY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgRG90LXByZWZpeGVkIGZvbnQgbmFtZXMgZG9uJ3Qgc3Vydml2ZSB0aGUgcm91bmQtdHJpcCB0
aHJvdWdoCisgICAgICAgIENURm9udERlc2NyaXB0b3JDb3B5QXR0cmlidXRlcyhDVEZvbnRDb3B5
Rm9udERlc2NyaXB0b3IoZm9udCkpIHVubGVzcyB5b3UgYWxzbworICAgICAgICBwYXNzIGluIHRo
ZSBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCBvcHRpb24uCisKKyAgICAgICAgVGVzdHM6IGZh
c3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLmh0bWwKKyAgICAgICAgICAgICAgIGZhc3Qv
dGV4dC9kcmF3LXN5bnRoZXRpYy1zeXN0ZW0tYm9sZC1mb250LWludG8tY2FudmFzLmh0bWwKKwor
ICAgICAgICAqIFNoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5tbToKKyAg
ICAgICAgKElQQzo6Y3JlYXRlQ1RGb250KToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxS
ZWY8V2ViQ29yZTo6Rm9udD4+OjpkZWNvZGVQbGF0Zm9ybURhdGEpOgorCiAyMDIxLTA4LTI3ICBD
aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gUmV1c2UgdGhl
IHNhbWUgbmV0d29yayBsb2FkIHdoZW4gcHJvY2Vzcy1zd2FwcGluZyBvbiByZXNvdXJjZSByZXNw
b25zZSBkdWUgdG8gQ09PUApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkv
Y2YvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL2NmL0NvcmVUZXh0
U1BJLmgKaW5kZXggNDkwODY2Mzk4YzRiNTA0NTQwOTRiYmE5NGZlODE4ZGFjM2VmOGNkYS4uMmQy
YmFmYzk2NjdlYWI5ZDFjNDc1YjY1MmEyOTM4Y2JkYmFiNjkzYSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCkBAIC01OCw2ICs1OCwxMCBAQCB0eXBlZGVm
IENGX09QVElPTlModWludDMyX3QsIENURm9udERlc2NyaXB0b3JPcHRpb25zKSB7CiAgICAga0NU
Rm9udERlc2NyaXB0b3JPcHRpb25QcmVmZXJBcHBsZVN5c3RlbUZvbnQgPSBrQ1RGb250T3B0aW9u
c1ByZWZlclN5c3RlbUZvbnQKIH07CiAKK2VudW0geworICAgIGtDVEZvbnRPcHRpb25zU3lzdGVt
VUlGb250ID0gMSA8PCAxLAorfTsKKwogZW51bSB7CiAgICAga0NUUnVuU3RhdHVzSGFzT3JpZ2lu
cyA9ICgxIDw8IDQpLAogfTsKQEAgLTE0OCw2ICsxNTIsNyBAQCBleHRlcm4gY29uc3QgQ0ZTdHJp
bmdSZWYga0NURnJhbWVNYXhpbXVtTnVtYmVyT2ZMaW5lc0F0dHJpYnV0ZU5hbWU7CiAKIGJvb2wg
Q1RGb250RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KENURm9udERlc2NyaXB0b3JSZWYpOwogYm9v
bCBDVEZvbnRJc1N5c3RlbVVJRm9udChDVEZvbnRSZWYpOworQ1RGb250UmVmIENURm9udENyZWF0
ZVdpdGhGb250RGVzY3JpcHRvckFuZE9wdGlvbnMoQ1RGb250RGVzY3JpcHRvclJlZiwgQ0dGbG9h
dCBzaXplLCBjb25zdCBDR0FmZmluZVRyYW5zZm9ybSosIENURm9udE9wdGlvbnMpOwogQ1RGb250
UmVmIENURm9udENyZWF0ZUZvckNTUyhDRlN0cmluZ1JlZiBuYW1lLCB1aW50MTZfdCB3ZWlnaHQs
IENURm9udFN5bWJvbGljVHJhaXRzLCBDR0Zsb2F0IHNpemUpOwogQ1RGb250UmVmIENURm9udENy
ZWF0ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UoQ1RGb250UmVmIGN1cnJlbnRGb250LCBjb25z
dCBVVEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5kZXggbGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5n
dWFnZSwgQ0ZJbmRleCAqY292ZXJlZExlbmd0aCk7CiBDVEZvbnRSZWYgQ1RGb250Q3JlYXRlRm9y
Q2hhcmFjdGVyc1dpdGhMYW5ndWFnZUFuZE9wdGlvbihDVEZvbnRSZWYgY3VycmVudEZvbnQsIGNv
bnN0IFVURjE2Q2hhciAqY2hhcmFjdGVycywgQ0ZJbmRleCBsZW5ndGgsIENGU3RyaW5nUmVmIGxh
bmd1YWdlLCBDVEZvbnRGYWxsYmFja09wdGlvbiwgQ0ZJbmRleCAqY292ZXJlZExlbmd0aCk7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2Rl
cnNDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENv
ZGVyc0NvY29hLm1tCmluZGV4IGE4MmZmODY2OGY2ZGVkN2FkMTcwNzE2ZDk3MGFkOWM0ZjMwODg1
YTEuLjI5Y2Q2MGY1NTdjNTdkOTk4YWVmN2FhYTk0MmYxMjM2YzA5NzcxMzkgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1t
CisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0Nv
Y29hLm1tCkBAIC01MDEsNiArNTAxLDI0IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q1RGb250RGVzY3Jp
cHRvclJlZj4gZmluZEZvbnREZXNjcmlwdG9yKGNvbnN0IFN0cmluZyYgcmVmZXJlbmNlCiAgICAg
cmV0dXJuIG51bGxwdHI7CiB9CiAKK3N0YXRpYyBSZXRhaW5QdHI8Q1RGb250UmVmPiBjcmVhdGVD
VEZvbnQoQ0ZEaWN0aW9uYXJ5UmVmIGF0dHJpYnV0ZXMsIGZsb2F0IHNpemUsIGNvbnN0IFN0cmlu
ZyYgcmVmZXJlbmNlVVJMLCBjb25zdCBTdHJpbmcmIHBvc3RTY3JpcHROYW1lKQoreworICAgIGlm
IChhdXRvIG5hbWUgPSBzdGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ0ZEaWN0aW9uYXJ5R2V0VmFs
dWUoYXR0cmlidXRlcywga0NURm9udE5hbWVBdHRyaWJ1dGUpKSkgeworICAgICAgICBpZiAoQ0ZT
dHJpbmdIYXNQcmVmaXgobmFtZSwgQ0ZTVFIoIi4iKSkpIHsKKyAgICAgICAgICAgIGF1dG8gZm9u
dERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVXaXRoQXR0cmlidXRl
cyhhdHRyaWJ1dGVzKSk7CisgICAgICAgICAgICBpZiAoIWZvbnREZXNjcmlwdG9yKQorICAgICAg
ICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICAgICAgcmV0dXJuIGFkb3B0Q0YoQ1RG
b250Q3JlYXRlV2l0aEZvbnREZXNjcmlwdG9yQW5kT3B0aW9ucyhmb250RGVzY3JpcHRvci5nZXQo
KSwgc2l6ZSwgbnVsbHB0ciwga0NURm9udE9wdGlvbnNTeXN0ZW1VSUZvbnQpKTsKKyAgICAgICAg
fQorICAgIH0KKworICAgIGF1dG8gZm9udERlc2NyaXB0b3IgPSBmaW5kRm9udERlc2NyaXB0b3Io
cmVmZXJlbmNlVVJMLCBwb3N0U2NyaXB0TmFtZSk7CisgICAgaWYgKCFmb250RGVzY3JpcHRvcikK
KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENU
Rm9udERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0aEF0dHJpYnV0ZXMoZm9udERlc2NyaXB0b3IuZ2V0
KCksIGF0dHJpYnV0ZXMpKTsKKyAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9u
dERlc2NyaXB0b3IoZm9udERlc2NyaXB0b3IuZ2V0KCksIHNpemUsIG51bGxwdHIpKTsKK30KKwog
c3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhPiBBcmd1bWVudENvZGVyPFJl
ZjxXZWJDb3JlOjpGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YShEZWNvZGVyJiBkZWNvZGVyKQog
ewogICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6Rm9udE9yaWVudGF0aW9uPiBvcmllbnRhdGlv
bjsKQEAgLTU4MCwxMSArNTk4LDkgQEAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGb250UGxhdGZv
cm1EYXRhPiBBcmd1bWVudENvZGVyPFJlZjxXZWJDb3JlOjpGb250Pj46OmRlY28KICAgICBpZiAo
IXBvc3RTY3JpcHROYW1lKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCi0gICAgYXV0
byBmb250RGVzY3JpcHRvciA9IGZpbmRGb250RGVzY3JpcHRvcigqcmVmZXJlbmNlVVJMLCAqcG9z
dFNjcmlwdE5hbWUpOwotICAgIGlmICghZm9udERlc2NyaXB0b3IpCisgICAgYXV0byBjdEZvbnQg
PSBjcmVhdGVDVEZvbnQoYXR0cmlidXRlcy0+Z2V0KCksICpzaXplLCAqcmVmZXJlbmNlVVJMLCAq
cG9zdFNjcmlwdE5hbWUpOworICAgIGlmICghY3RGb250KQogICAgICAgICByZXR1cm4gc3RkOjpu
dWxsb3B0OwotICAgIGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3Jl
YXRlQ29weVdpdGhBdHRyaWJ1dGVzKGZvbnREZXNjcmlwdG9yLmdldCgpLCBhdHRyaWJ1dGVzLT5n
ZXQoKSkpOwotICAgIGF1dG8gY3RGb250ID0gYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoRm9udERl
c2NyaXB0b3IoZm9udERlc2NyaXB0b3IuZ2V0KCksICpzaXplLCBudWxscHRyKSk7CiAKICAgICBy
ZXR1cm4gV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YShjdEZvbnQuZ2V0KCksICpzaXplLCAqc3lu
dGhldGljQm9sZCwgKnN5bnRoZXRpY09ibGlxdWUsICpvcmllbnRhdGlvbiwgKndpZHRoVmFyaWFu
dCwgKnRleHRSZW5kZXJpbmdNb2RlKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1NTNiN2VjNGQyMDNhNGE2MmNlM2Qy
YzM5MTAyYzNhZjI1YjQ2ZGRhLi40ODU0ZDBkYjYxZGFlNzMwM2RlZTU2MzNhM2EwYzNiM2Q4YTAz
MmExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDgtMjcgIE15bGVzIEMuIE1heGZpZWxk
ICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIERyYXdpbmcgc3lzdGVt
IGZhbGxiYWNrIGZvbnRzIHRvIGNhbnZhcyBjYXVzZXMgYSBjcmFzaAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NjMzCisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS84MTg4OTAzNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIGZhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLWV4cGVjdGVkLnR4
dDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMuaHRt
bDogQWRkZWQuCisKIDIwMjEtMDgtMjcgIEF5dW1pIEtvamltYSAgPGF5dW1pX2tvamltYUBhcHBs
ZS5jb20+CiAKICAgICAgICAgWyBCaWdTdXIgRVdTXSB3ZWJydGMvdmlkZW8tbWVkaWFzdHJlYW10
cmFjay1zdGF0cy5odG1sIGlzIGEgZmxha3kgY3Jhc2ggLyBmYWlsaW5nLgpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RyYXctc3ludGhldGljLXN5c3RlbS1ib2xkLWZvbnQtaW50
by1jYW52YXMtZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9k
cmF3LXN5bnRoZXRpYy1zeXN0ZW0tYm9sZC1mb250LWludG8tY2FudmFzLWV4cGVjdGVkLW1pc21h
dGNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMC4uMTk5NmZmNTIyZjJkZTBlNDZmZTRjNTY3NzZjOGUyMTIzMjY3
ZTRkYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9kcmF3LXN5bnRo
ZXRpYy1zeXN0ZW0tYm9sZC1mb250LWludG8tY2FudmFzLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwK
QEAgLTAsMCArMSwxNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlw
dCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2Nh
bnZhcyB7CisgICAgd2lkdGg6IDIwMHB4OworICAgIGhlaWdodDogMjAwcHg7CisgICAgbWFyZ2lu
LXRvcDogMDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdCBwYXNz
ZXMgaWYgaXQgZG9lcyBub3QgaGFuZyBvciBjcmFzaC48L3A+Cis8Y2FudmFzIHdpZHRoPSI0MDAi
IGhlaWdodD0iNDAwIj48L2NhbnZhcz4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0
IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZHJhdy1zeW50
aGV0aWMtc3lzdGVtLWJvbGQtZm9udC1pbnRvLWNhbnZhcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFz
dC90ZXh0L2RyYXctc3ludGhldGljLXN5c3RlbS1ib2xkLWZvbnQtaW50by1jYW52YXMuaHRtbApu
ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwLi5mZjE2MTMyYjM5NWUzMjlhYjdlM2YwZTc1NGRhNTljODM3MDhhNWYzCi0tLSAv
ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RyYXctc3ludGhldGljLXN5c3Rl
bS1ib2xkLWZvbnQtaW50by1jYW52YXMuaHRtbApAQCAtMCwwICsxLDMzIEBACis8IURPQ1RZUEUg
aHRtbD4KKzxodG1sPgorPG1ldGEgY2hhcnNldD0idXRmOCI+Cis8aGVhZD4KKzxzY3JpcHQgc3Jj
PSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2NhbnZh
cyB7CisgICAgd2lkdGg6IDIwMHB4OworICAgIGhlaWdodDogMjAwcHg7CisgICAgbWFyZ2luLXRv
cDogMDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdCBwYXNzZXMg
aWYgaXQgZG9lcyBub3QgaGFuZyBvciBjcmFzaC48L3A+Cis8Y2FudmFzIHdpZHRoPSI0MDAiIGhl
aWdodD0iNDAwIj48L2NhbnZhcz4KKzwvYm9keT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RS
dW5uZXIpCisgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKK2FkZEV2ZW50TGlzdGVu
ZXIoImxvYWQiLCBhc3luYyAoKSA9PiB7CisgICAgbGV0IGNhbnZhcyA9IGRvY3VtZW50LnF1ZXJ5
U2VsZWN0b3IoImNhbnZhcyIpOworICAgIGxldCBjb250ZXh0ID0gY2FudmFzLmdldENvbnRleHQo
IjJkIik7CisgICAgY29udGV4dC5mb250ID0gImJvbGQgMzZweCAnLkFwcGxlU2ltcGxpZmllZENo
aW5lc2VGb250LUhlYXZ5JyI7CisgICAgY29udGV4dC5zdHJva2VUZXh0KCLoi7nmnpznlLXohJEi
LCA0MCwgNDApOworICAgIGF3YWl0IFVJSGVscGVyLnJlbmRlcmluZ1VwZGF0ZSgpOworCisgICAg
aWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsK
K30pOworPC9zY3JpcHQ+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMtZXhw
ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMt
ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZlNTYwYjBlODE5MTc0NWQ4ODVlOWRmYTFkM2RhNTA4
ZTA4MWNjZGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvc3lzdGVt
LWZhbGxiYWNrLWNhbnZhcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorVGhpcyB0ZXN0IG1h
a2VzIHN1cmUgdGhhdCBkcmF3aW5nIGEgc3lzdGVtIGZhbGxiYWNrIGZvbnQgdG8gY2FudmFzIGRv
ZXNuJ3QgY3Jhc2ggYW55IHByb2Nlc3MuIFRoZSB0ZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBubyBj
cmFzaC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2st
Y2FudmFzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvc3lzdGVtLWZhbGxiYWNrLWNhbnZh
cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLmNhMjBiZDliMWQ2NWQ4NmI0MTEzZmNmOGM2ZDU1NmY3MWYwZTNk
ZjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvc3lzdGVtLWZhbGxi
YWNrLWNhbnZhcy5odG1sCkBAIC0wLDAgKzEsMTggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+
Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzwvaGVhZD4KKzxib2R5PgorVGhpcyB0
ZXN0IG1ha2VzIHN1cmUgdGhhdCBkcmF3aW5nIGEgc3lzdGVtIGZhbGxiYWNrIGZvbnQgdG8gY2Fu
dmFzIGRvZXNuJ3QgY3Jhc2ggYW55IHByb2Nlc3MuIFRoZSB0ZXN0IHBhc3NlcyBpZiB0aGVyZSBp
cyBubyBjcmFzaC4KKzxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjQwMCIgaGVpZ2h0PSI0MDAi
PjwvY2FudmFzPgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVu
bmVyLmR1bXBBc1RleHQoKTsKK2xldCBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi
Y2FudmFzIik7CitsZXQgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworY29udGV4
dC5mb250ID0gImJvbGQgMzZweCBzeXN0ZW0tdWkiOworY29udGV4dC5maWxsVGV4dCgi6Iu55p6c
55S16ISRIiwgMTAwLCAxMDApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>
<flag name="review"
          id="459755"
          type_id="1"
          status="+"
          setter="wenson_hsieh"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436687</attachid>
            <date>2021-08-27 15:56:47 -0700</date>
            <delta_ts>2021-08-31 00:18:22 -0700</delta_ts>
            <desc>Patch for committing</desc>
            <filename>bug-229633-20210827155647.patch</filename>
            <type>text/plain</type>
            <size>9344</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q
QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBjMjMxNTRh
NGZhOTQyZGVlYzAyMmVlMTk0NjM1Yjc4ZDNlYmEwNzYyLi5lNTU0MzQ1MzA1NjA0NzRiMTk1ZjFm
NmIyMDQ5N2Y3ODg1NGRlNzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor
MjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisg
ICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sgZm9udHMgdG8gY2FudmFzIGNh
dXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjk2MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxODg5MDM2PgorCisgICAgICAg
IFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICAqIHBhbC9zcGkvY2YvQ29yZVRl
eHRTUEkuaDoKKwogMjAyMS0wOC0yNSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFw
cGxlLmNvbT4KIAogICAgICAgICBXZWJDcnlwdG8gdXNlcyBkZXByZWNhdGVkIENDS2V5RGVyaXZh
dGlvbkhNYWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKaW5kZXggZTNmZDIyOTI3ZmRiYzY5NzA3N2RjODNlZTU3NjcxN2MyMmMw
NjliZC4uNTk2MWQzZWYwYWIwZDZiNjI0YmIyMGVlNDFiYmVmN2VmMzYwZTg2OCAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwyMiBAQAorMjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4Zmll
bGRAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFsbGJhY2sg
Zm9udHMgdG8gY2FudmFzIGNhdXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk2MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgx
ODg5MDM2PgorCisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBE
b3QtcHJlZml4ZWQgZm9udCBuYW1lcyBkb24ndCBzdXJ2aXZlIHRoZSByb3VuZC10cmlwIHRocm91
Z2gKKyAgICAgICAgQ1RGb250RGVzY3JpcHRvckNvcHlBdHRyaWJ1dGVzKENURm9udENvcHlGb250
RGVzY3JpcHRvcihmb250KSkgdW5sZXNzIHlvdSBhbHNvCisgICAgICAgIHBhc3MgaW4gdGhlIGtD
VEZvbnRPcHRpb25zU3lzdGVtVUlGb250IG9wdGlvbi4KKworICAgICAgICBUZXN0czogZmFzdC90
ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMuaHRtbAorICAgICAgICAgICAgICAgZmFzdC90ZXh0
L2RyYXctc3ludGhldGljLXN5c3RlbS1ib2xkLWZvbnQtaW50by1jYW52YXMuaHRtbAorCisgICAg
ICAgICogU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tOgorICAgICAg
ICAoSVBDOjpjcmVhdGVDVEZvbnQpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlZjxX
ZWJDb3JlOjpGb250Pj46OmRlY29kZVBsYXRmb3JtRGF0YSk6CisKIDIwMjEtMDgtMjcgIENocmlz
IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBSZXVzZSB0aGUgc2Ft
ZSBuZXR3b3JrIGxvYWQgd2hlbiBwcm9jZXNzLXN3YXBwaW5nIG9uIHJlc291cmNlIHJlc3BvbnNl
IGR1ZSB0byBDT09QCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jZi9D
b3JlVGV4dFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY2YvQ29yZVRleHRTUEku
aAppbmRleCA0OTA4NjYzOThjNGI1MDQ1NDA5NGJiYTk0ZmU4MThkYWMzZWY4Y2RhLi4yZDJiYWZj
OTY2N2VhYjlkMWM0NzViNjUyYTI5MzhjYmRiYWI2OTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9QQUwvcGFsL3NwaS9jZi9Db3JlVGV4dFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BB
TC9wYWwvc3BpL2NmL0NvcmVUZXh0U1BJLmgKQEAgLTU4LDYgKzU4LDEwIEBAIHR5cGVkZWYgQ0Zf
T1BUSU9OUyh1aW50MzJfdCwgQ1RGb250RGVzY3JpcHRvck9wdGlvbnMpIHsKICAgICBrQ1RGb250
RGVzY3JpcHRvck9wdGlvblByZWZlckFwcGxlU3lzdGVtRm9udCA9IGtDVEZvbnRPcHRpb25zUHJl
ZmVyU3lzdGVtRm9udAogfTsKIAorZW51bSB7CisgICAga0NURm9udE9wdGlvbnNTeXN0ZW1VSUZv
bnQgPSAxIDw8IDEsCit9OworCiBlbnVtIHsKICAgICBrQ1RSdW5TdGF0dXNIYXNPcmlnaW5zID0g
KDEgPDwgNCksCiB9OwpAQCAtMTQ4LDYgKzE1Miw3IEBAIGV4dGVybiBjb25zdCBDRlN0cmluZ1Jl
ZiBrQ1RGcmFtZU1heGltdW1OdW1iZXJPZkxpbmVzQXR0cmlidXRlTmFtZTsKIAogYm9vbCBDVEZv
bnREZXNjcmlwdG9ySXNTeXN0ZW1VSUZvbnQoQ1RGb250RGVzY3JpcHRvclJlZik7CiBib29sIENU
Rm9udElzU3lzdGVtVUlGb250KENURm9udFJlZik7CitDVEZvbnRSZWYgQ1RGb250Q3JlYXRlV2l0
aEZvbnREZXNjcmlwdG9yQW5kT3B0aW9ucyhDVEZvbnREZXNjcmlwdG9yUmVmLCBDR0Zsb2F0IHNp
emUsIGNvbnN0IENHQWZmaW5lVHJhbnNmb3JtKiwgQ1RGb250T3B0aW9ucyk7CiBDVEZvbnRSZWYg
Q1RGb250Q3JlYXRlRm9yQ1NTKENGU3RyaW5nUmVmIG5hbWUsIHVpbnQxNl90IHdlaWdodCwgQ1RG
b250U3ltYm9saWNUcmFpdHMsIENHRmxvYXQgc2l6ZSk7CiBDVEZvbnRSZWYgQ1RGb250Q3JlYXRl
Rm9yQ2hhcmFjdGVyc1dpdGhMYW5ndWFnZShDVEZvbnRSZWYgY3VycmVudEZvbnQsIGNvbnN0IFVU
RjE2Q2hhciAqY2hhcmFjdGVycywgQ0ZJbmRleCBsZW5ndGgsIENGU3RyaW5nUmVmIGxhbmd1YWdl
LCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVGb3JDaGFy
YWN0ZXJzV2l0aExhbmd1YWdlQW5kT3B0aW9uKENURm9udFJlZiBjdXJyZW50Rm9udCwgY29uc3Qg
VVRGMTZDaGFyICpjaGFyYWN0ZXJzLCBDRkluZGV4IGxlbmd0aCwgQ0ZTdHJpbmdSZWYgbGFuZ3Vh
Z2UsIENURm9udEZhbGxiYWNrT3B0aW9uLCBDRkluZGV4ICpjb3ZlcmVkTGVuZ3RoKTsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0Nv
Y29hLm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJz
Q29jb2EubW0KaW5kZXggYTgyZmY4NjY4ZjZkZWQ3YWQxNzA3MTZkOTcwYWQ5YzRmMzA4ODVhMS4u
MjljZDYwZjU1N2M1N2Q5OThhZWY3YWFhOTQyZjEyMzZjMDk3NzEzOSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW0KKysr
IGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2Eu
bW0KQEAgLTUwMSw2ICs1MDEsMjQgQEAgc3RhdGljIFJldGFpblB0cjxDVEZvbnREZXNjcmlwdG9y
UmVmPiBmaW5kRm9udERlc2NyaXB0b3IoY29uc3QgU3RyaW5nJiByZWZlcmVuY2UKICAgICByZXR1
cm4gbnVsbHB0cjsKIH0KIAorc3RhdGljIFJldGFpblB0cjxDVEZvbnRSZWY+IGNyZWF0ZUNURm9u
dChDRkRpY3Rpb25hcnlSZWYgYXR0cmlidXRlcywgZmxvYXQgc2l6ZSwgY29uc3QgU3RyaW5nJiBy
ZWZlcmVuY2VVUkwsIGNvbnN0IFN0cmluZyYgcG9zdFNjcmlwdE5hbWUpCit7CisgICAgaWYgKGF1
dG8gbmFtZSA9IHN0YXRpY19jYXN0PENGU3RyaW5nUmVmPihDRkRpY3Rpb25hcnlHZXRWYWx1ZShh
dHRyaWJ1dGVzLCBrQ1RGb250TmFtZUF0dHJpYnV0ZSkpKSB7CisgICAgICAgIGlmIChDRlN0cmlu
Z0hhc1ByZWZpeChuYW1lLCBDRlNUUigiLiIpKSkgeworICAgICAgICAgICAgYXV0byBmb250RGVz
Y3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250RGVzY3JpcHRvckNyZWF0ZVdpdGhBdHRyaWJ1dGVzKGF0
dHJpYnV0ZXMpKTsKKyAgICAgICAgICAgIGlmICghZm9udERlc2NyaXB0b3IpCisgICAgICAgICAg
ICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgICAgICByZXR1cm4gYWRvcHRDRihDVEZvbnRD
cmVhdGVXaXRoRm9udERlc2NyaXB0b3JBbmRPcHRpb25zKGZvbnREZXNjcmlwdG9yLmdldCgpLCBz
aXplLCBudWxscHRyLCBrQ1RGb250T3B0aW9uc1N5c3RlbVVJRm9udCkpOworICAgICAgICB9Cisg
ICAgfQorCisgICAgYXV0byBmb250RGVzY3JpcHRvciA9IGZpbmRGb250RGVzY3JpcHRvcihyZWZl
cmVuY2VVUkwsIHBvc3RTY3JpcHROYW1lKTsKKyAgICBpZiAoIWZvbnREZXNjcmlwdG9yKQorICAg
ICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICBmb250RGVzY3JpcHRvciA9IGFkb3B0Q0YoQ1RGb250
RGVzY3JpcHRvckNyZWF0ZUNvcHlXaXRoQXR0cmlidXRlcyhmb250RGVzY3JpcHRvci5nZXQoKSwg
YXR0cmlidXRlcykpOworICAgIHJldHVybiBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVz
Y3JpcHRvcihmb250RGVzY3JpcHRvci5nZXQoKSwgc2l6ZSwgbnVsbHB0cikpOworfQorCiBzdGQ6
Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdl
YkNvcmU6OkZvbnQ+Pjo6ZGVjb2RlUGxhdGZvcm1EYXRhKERlY29kZXImIGRlY29kZXIpCiB7CiAg
ICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGb250T3JpZW50YXRpb24+IG9yaWVudGF0aW9uOwpA
QCAtNTgwLDExICs1OTgsOSBAQCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURh
dGE+IEFyZ3VtZW50Q29kZXI8UmVmPFdlYkNvcmU6OkZvbnQ+Pjo6ZGVjbwogICAgIGlmICghcG9z
dFNjcmlwdE5hbWUpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBhdXRvIGZv
bnREZXNjcmlwdG9yID0gZmluZEZvbnREZXNjcmlwdG9yKCpyZWZlcmVuY2VVUkwsICpwb3N0U2Ny
aXB0TmFtZSk7Ci0gICAgaWYgKCFmb250RGVzY3JpcHRvcikKKyAgICBhdXRvIGN0Rm9udCA9IGNy
ZWF0ZUNURm9udChhdHRyaWJ1dGVzLT5nZXQoKSwgKnNpemUsICpyZWZlcmVuY2VVUkwsICpwb3N0
U2NyaXB0TmFtZSk7CisgICAgaWYgKCFjdEZvbnQpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxv
cHQ7Ci0gICAgZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENURm9udERlc2NyaXB0b3JDcmVhdGVD
b3B5V2l0aEF0dHJpYnV0ZXMoZm9udERlc2NyaXB0b3IuZ2V0KCksIGF0dHJpYnV0ZXMtPmdldCgp
KSk7Ci0gICAgYXV0byBjdEZvbnQgPSBhZG9wdENGKENURm9udENyZWF0ZVdpdGhGb250RGVzY3Jp
cHRvcihmb250RGVzY3JpcHRvci5nZXQoKSwgKnNpemUsIG51bGxwdHIpKTsKIAogICAgIHJldHVy
biBXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhKGN0Rm9udC5nZXQoKSwgKnNpemUsICpzeW50aGV0
aWNCb2xkLCAqc3ludGhldGljT2JsaXF1ZSwgKm9yaWVudGF0aW9uLCAqd2lkdGhWYXJpYW50LCAq
dGV4dFJlbmRlcmluZ01vZGUpOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDU1M2I3ZWM0ZDIwM2E0YTYyY2UzZDJjMzkx
MDJjM2FmMjViNDZkZGEuLjA5YTZmNWYxZjczYmNjMWU5NTVkYmJjY2RkMmZkOTMzYWNmMDE2YzUg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wOC0yNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxt
bWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gRHJhd2luZyBzeXN0ZW0gZmFs
bGJhY2sgZm9udHMgdG8gY2FudmFzIGNhdXNlcyBhIGNyYXNoCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk2MzMKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzgxODg5MDM2PgorCisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAg
ICAgICAqIGZhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFzLWV4cGVjdGVkLnR4dDogQWRk
ZWQuCisgICAgICAgICogZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1jYW52YXMuaHRtbDogQWRk
ZWQuCisKIDIwMjEtMDgtMjcgIEF5dW1pIEtvamltYSAgPGF5dW1pX2tvamltYUBhcHBsZS5jb20+
CiAKICAgICAgICAgWyBCaWdTdXIgRVdTXSB3ZWJydGMvdmlkZW8tbWVkaWFzdHJlYW10cmFjay1z
dGF0cy5odG1sIGlzIGEgZmxha3kgY3Jhc2ggLyBmYWlsaW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvZmFzdC90ZXh0L2RyYXctc3ludGhldGljLXN5c3RlbS1ib2xkLWZvbnQtaW50by1jYW52
YXMtZXhwZWN0ZWQtbWlzbWF0Y2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9kcmF3LXN5
bnRoZXRpYy1zeXN0ZW0tYm9sZC1mb250LWludG8tY2FudmFzLWV4cGVjdGVkLW1pc21hdGNoLmh0
bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uM2Q4OTUxNDg2YTFkN2NhMTkwMDBiMjY0ZjU0YzMxNWY0Y2ZkYTJiYQot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9kcmF3LXN5bnRoZXRpYy1z
eXN0ZW0tYm9sZC1mb250LWludG8tY2FudmFzLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwKQEAgLTAs
MCArMSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorY2Fu
dmFzIHsKKyAgICB3aWR0aDogMjAwcHg7CisgICAgaGVpZ2h0OiAyMDBweDsKKyAgICBtYXJnaW4t
dG9wOiAwOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGNhbnZhcyB3aWR0aD0iNDAw
IiBoZWlnaHQ9IjQwMCI+PC9jYW52YXM+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9mYXN0L3RleHQvZHJhdy1zeW50aGV0aWMtc3lzdGVtLWJvbGQtZm9udC1pbnRv
LWNhbnZhcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RyYXctc3ludGhldGljLXN5c3Rl
bS1ib2xkLWZvbnQtaW50by1jYW52YXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42MWNhZjM1NDQzY2E0MjVk
ZjkzMzBmNWYzODJjY2QxMjI1YzJhYWUzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv
ZmFzdC90ZXh0L2RyYXctc3ludGhldGljLXN5c3RlbS1ib2xkLWZvbnQtaW50by1jYW52YXMuaHRt
bApAQCAtMCwwICsxLDMyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPG1ldGEgY2hhcnNl
dD0idXRmOCI+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy
LmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KK2NhbnZhcyB7CisgICAgd2lkdGg6IDIwMHB4OworICAg
IGhlaWdodDogMjAwcHg7CisgICAgbWFyZ2luLXRvcDogMDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+
Cis8Ym9keT4KKzxjYW52YXMgd2lkdGg9IjQwMCIgaGVpZ2h0PSI0MDAiPjwvY2FudmFzPgorPC9i
b2R5PgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLndh
aXRVbnRpbERvbmUoKTsKKworYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGFzeW5jICgpID0+IHsK
KyAgICBsZXQgY2FudmFzID0gZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiY2FudmFzIik7CisgICAg
bGV0IGNvbnRleHQgPSBjYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKKyAgICBjb250ZXh0LmZvbnQg
PSAiYm9sZCAzNnB4ICcuQXBwbGVTaW1wbGlmaWVkQ2hpbmVzZUZvbnQtSGVhdnknIjsKKyAgICBj
b250ZXh0LnN0cm9rZVRleHQoIuiLueaenOeUteiEkSIsIDQwLCA0MCk7CisgICAgYXdhaXQgVUlI
ZWxwZXIucmVuZGVyaW5nVXBkYXRlKCk7CisKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisg
ICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworfSk7Cis8L3NjcmlwdD4KKzwvaHRtbD4K
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2FudmFz
LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9zeXN0ZW0tZmFsbGJhY2stY2Fu
dmFzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mZTU2MGIwZTgxOTE3NDVkODg1ZTlkZmExZDNk
YTUwOGUwODFjY2RjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3N5
c3RlbS1mYWxsYmFjay1jYW52YXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1RoaXMgdGVz
dCBtYWtlcyBzdXJlIHRoYXQgZHJhd2luZyBhIHN5c3RlbSBmYWxsYmFjayBmb250IHRvIGNhbnZh
cyBkb2Vzbid0IGNyYXNoIGFueSBwcm9jZXNzLiBUaGUgdGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMg
bm8gY3Jhc2guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvc3lzdGVtLWZhbGxi
YWNrLWNhbnZhcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3N5c3RlbS1mYWxsYmFjay1j
YW52YXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jYTIwYmQ5YjFkNjVkODZiNDExM2ZjZjhjNmQ1NTZmNzFm
MGUzZGY5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3N5c3RlbS1m
YWxsYmFjay1jYW52YXMuaHRtbApAQCAtMCwwICsxLDE4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxo
dG1sPgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8L2hlYWQ+Cis8Ym9keT4KK1Ro
aXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgZHJhd2luZyBhIHN5c3RlbSBmYWxsYmFjayBmb250IHRv
IGNhbnZhcyBkb2Vzbid0IGNyYXNoIGFueSBwcm9jZXNzLiBUaGUgdGVzdCBwYXNzZXMgaWYgdGhl
cmUgaXMgbm8gY3Jhc2guCis8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSI0MDAiIGhlaWdodD0i
NDAwIj48L2NhbnZhcz4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVz
dFJ1bm5lci5kdW1wQXNUZXh0KCk7CitsZXQgY2FudmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5
SWQoImNhbnZhcyIpOworbGV0IGNvbnRleHQgPSBjYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKK2Nv
bnRleHQuZm9udCA9ICJib2xkIDM2cHggc3lzdGVtLXVpIjsKK2NvbnRleHQuZmlsbFRleHQoIuiL
ueaenOeUteiEkSIsIDEwMCwgMTAwKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>