<?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>229026</bug_id>
          
          <creation_ts>2021-08-11 21:52:06 -0700</creation_ts>
          <short_desc>[LFC][IFC] Make mid-word breaking surrogate pair aware</short_desc>
          <delta_ts>2021-08-21 06:42:58 -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>Layout and Rendering</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="alan">zalan</reporter>
          <assigned_to name="alan">zalan</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>darin</cc>
    
    <cc>koivisto</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1783740</commentid>
    <comment_count>0</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-08-11 21:52:06 -0700</bug_when>
    <thetext>ssia</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1783741</commentid>
    <comment_count>1</comment_count>
      <attachid>435394</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-08-11 21:58:57 -0700</bug_when>
    <thetext>Created attachment 435394
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1783854</commentid>
    <comment_count>2</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-08-12 09:37:44 -0700</bug_when>
    <thetext>Enabling surrogate pairs requires the non-primary font patch where glyphs can stretch the parent inline box.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785381</commentid>
    <comment_count>3</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-18 21:53:23 -0700</bug_when>
    <thetext>&lt;rdar://problem/82109382&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786004</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-20 15:00:22 -0700</bug_when>
    <thetext>Committed r281341 (240758@main): &lt;https://commits.webkit.org/240758@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 435394.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786016</commentid>
    <comment_count>5</comment_count>
      <attachid>435394</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-08-20 15:11:42 -0700</bug_when>
    <thetext>Comment on attachment 435394
Patch

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

&gt; Source/WebCore/ChangeLog:15
&gt; +        (WebCore::Layout::TextUtil::midWorkdBreak):

s/Workd/Word/g</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786022</commentid>
    <comment_count>6</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-08-20 15:23:57 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #5)
&gt; Comment on attachment 435394 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=435394&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/ChangeLog:15
&gt; &gt; +        (WebCore::Layout::TextUtil::midWorkdBreak):
&gt; 
&gt; s/Workd/Word/g
:( thanks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786071</commentid>
    <comment_count>7</comment_count>
      <attachid>436052</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-08-20 18:19:40 -0700</bug_when>
    <thetext>Created attachment 436052
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786074</commentid>
    <comment_count>8</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-08-20 18:29:39 -0700</bug_when>
    <thetext>Fix spelling issue</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786098</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-20 21:01:31 -0700</bug_when>
    <thetext>Found 1 new test failure: http/tests/media/modern-media-controls/pip-support/pip-support-live-broadcast.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786132</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-21 06:42:56 -0700</bug_when>
    <thetext>Committed r281372 (240787@main): &lt;https://commits.webkit.org/240787@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436052.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435394</attachid>
            <date>2021-08-11 21:58:57 -0700</date>
            <delta_ts>2021-08-20 15:00:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229026-20210811215856.patch</filename>
            <type>text/plain</type>
            <size>8091</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDlhNWZlMGY4MGE4MmYw
MzE1NTQzNTMyNTJkY2M0NmVjNmJjNTMxNy4uY2VjNzhjYjY3NzZmMzE1NmZlNjU2YjBiNDFlOTRh
NDNlZTJhYzA0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTExICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgbWlk
LXdvcmQgYnJlYWtpbmcgc3Vycm9nYXRlIHBhaXIgYXdhcmUKKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTAyNgorCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN1cnJvZ2F0ZSBwYWlycyByZXByZXNlbnQgb25l
ICJjaGFyYWN0ZXIiIChVMTZfSVNfTEVBRCArIFUxNl9JU19UQUlMKS4KKyAgICAgICAgV2Ugc2hv
dWxkIG5ldmVyIGJyZWFrIHRoZW0gaGFsZiBldmVuIHdoZW4gQ1NTIHRlbGxzIHVzIHRvIGJyZWFr
IHRoZSB3b3JkIGF0IGFyYml0cmFyeSBwb3NpdGlvbi4gCisgICAgICAgIFRoaXMgaXMgaW4gcHJl
cGFyYXRpb24gZm9yIHJlbW92aW5nIHRoZSBVMTZfSVNfU1VSUk9HQVRFIGNoZWNrIGluIGNhblVz
ZUZvckNoYXJhY3Rlci4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s
aW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6
SW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1biBjb25zdCk6CisgICAgICAg
ICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRleHRVdGlsOjptaWRXb3JrZEJyZWFrKToKKyAgICAg
ICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OnNwbGl0KTogRGVsZXRlZC4KKyAgICAgICAg
KiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmg6CisKIDIw
MjEtMDctMjggIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAg
Q3Jhc2ggaW4gQXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5UmVsYXRpdmVGb250U3R5bGVDaGFuZ2UK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s
aW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt
YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcAppbmRleCBlYmZm
M2IzMzQyOGQwMjA2NDA5OTkzOTYyNDA3OWU1Njc1N2M3ZDlhLi4wYjllOTEwZDRkZWM0YWZjZjI2
ZmFjZmM5YjhhYzQ4OTEzMzVkYmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29u
dGVudEJyZWFrZXIuY3BwCkBAIC00NTksNyArNDU5LDcgQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVD
b250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFr
aW4KICAgICAgICAgICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuID0g
KmF2YWlsYWJsZVdpZHRoIC0gaHlwaGVuV2lkdGg7CiAgICAgICAgICAgICAgICAgaWYgKGF2YWls
YWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVuYXRp
b24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGZvbnRDYXNjYWRlLnBpeGVsU2l6ZSgp
KSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgICAgICAgICBsZWZ0
U2lkZUxlbmd0aCA9IFRleHRVdGlsOjpzcGxpdChpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdS
dW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiwgbG9naWNhbExl
ZnQpLmxlbmd0aDsKKyAgICAgICAgICAgICAgICBsZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjpt
aWRXb3JrZEJyZWFrKGlubGluZVRleHRJdGVtLCBvdmVyZmxvd2luZ1J1bi5sb2dpY2FsV2lkdGgs
IGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuLCBsb2dpY2FsTGVmdCkubGVuZ3RoOwogICAg
ICAgICAgICAgfQogICAgICAgICAgICAgaWYgKGxlZnRTaWRlTGVuZ3RoIDwgbGltaXRCZWZvcmUp
CiAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKQEAgLTQ5Myw4ICs0OTMsOCBAQCBzdGQ6Om9w
dGlvbmFsPElubGluZUNvbnRlbnRCcmVha2VyOjpQYXJ0aWFsUnVuPiBJbmxpbmVDb250ZW50QnJl
YWtlcjo6dHJ5QnJlYWtpbgogICAgICAgICAgICAgICAgIC8vIEZhc3QgcGF0aCBmb3IgY2FzZXMg
d2hlbiB0aGVyZSdzIG5vIHJvb20gYXQgYWxsLiBUaGUgY29udGVudCBpcyBicmVha2FibGUgYnV0
IHdlIGRvbid0IGhhdmUgc3BhY2UgZm9yIGl0LgogICAgICAgICAgICAgICAgIHJldHVybiB7IH07
CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBhdXRvIHNwbGl0RGF0YSA9IFRleHRVdGlsOjpz
cGxpdChpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdpZHRoLCAqYXZhaWxh
YmxlV2lkdGgsIGxvZ2ljYWxMZWZ0KTsKLSAgICAgICAgICAgIHJldHVybiB7IHNwbGl0RGF0YS5s
ZW5ndGgsIHNwbGl0RGF0YS5sb2dpY2FsV2lkdGggfTsKKyAgICAgICAgICAgIGF1dG8gbWlkV29y
a2RCcmVhayA9IFRleHRVdGlsOjptaWRXb3JrZEJyZWFrKGlubGluZVRleHRJdGVtLCBvdmVyZmxv
d2luZ1J1bi5sb2dpY2FsV2lkdGgsICphdmFpbGFibGVXaWR0aCwgbG9naWNhbExlZnQpOworICAg
ICAgICAgICAgcmV0dXJuIHsgbWlkV29ya2RCcmVhay5sZW5ndGgsIG1pZFdvcmtkQnJlYWsubG9n
aWNhbFdpZHRoIH07CiAgICAgICAgIH07CiAgICAgICAgIC8vIFdpdGggYXJiaXRyYXJ5IGJyZWFr
aW5nIHRoZXJlJ3MgYWx3YXlzIGEgdmFsaWQgYnJlYWtpbmcgcG9zaXRpb24gKGV2ZW4gaWYgaXQg
aXMgYmVmb3JlIHRoZSBmaXJzdCBwb3NpdGlvbikuCiAgICAgICAgIHJldHVybiB0cnlCcmVha2lu
Z0F0QXJiaXRyYXJ5UG9zaXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91
dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuY3BwIGIvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAK
aW5kZXggN2U1NzViY2U3Mjg1M2E4YzlkYmYzNjJmNGZjOWIxOTk3NmFiMjUyMC4uNmRkMmQyMGRh
NmY4ZTRiZjQ3ZWE5ZDE3YTgwYTcxOWYwY2EyYmRhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9U
ZXh0VXRpbC5jcHAKQEAgLTg0LDMwICs4NCw0OSBAQCBJbmxpbmVMYXlvdXRVbml0IFRleHRVdGls
Ojp3aWR0aChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCB1bnNpZ25lZCBmcgog
ICAgIHJldHVybiBzdGQ6OmlzbmFuKHdpZHRoKSA/IDAuMGYgOiBzdGQ6OmlzaW5mKHdpZHRoKSA/
IG1heElubGluZUxheW91dFVuaXQoKSA6IHdpZHRoOwogfQogCi1UZXh0VXRpbDo6U3BsaXREYXRh
IFRleHRVdGlsOjpzcGxpdChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElu
bGluZUxheW91dFVuaXQgdGV4dFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRo
LCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCkKK1RleHRVdGlsOjpNaWRXb3Jr
ZEJyZWFrIFRleHRVdGlsOjptaWRXb3JrZEJyZWFrKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxp
bmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQg
YXZhaWxhYmxlV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KQogewog
ICAgIEFTU0VSVChhdmFpbGFibGVXaWR0aCA+PSAwKTsKICAgICBhdXRvIHN0YXJ0UG9zaXRpb24g
PSBpbmxpbmVUZXh0SXRlbS5zdGFydCgpOwogICAgIGF1dG8gbGVuZ3RoID0gaW5saW5lVGV4dEl0
ZW0ubGVuZ3RoKCk7CiAgICAgQVNTRVJUKGxlbmd0aCk7CiAKKyAgICBhdXRvIHRleHQgPSBpbmxp
bmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94KCkuY29udGVudCgpOworICAgIGF1dG8gc3Vycm9nYXRl
UGFpckF3YXJlSW5kZXggPSBbJl0gKGF1dG8gaW5kZXgpIHsKKyAgICAgICAgLy8gV2Ugc2hvdWxk
IG5ldmVyIGJyZWFrIGluIHRoZSBtaWRkbGUgb2YgYSBzdXJyb2dhdGUgcGFpci4gVGhleSBhcmUg
Y29uc2lkZXJlZCBvbmUgam9pbnQgZW50aXR5LgorICAgICAgICBSRUxFQVNFX0FTU0VSVChpbmRl
eCA8IHRleHQubGVuZ3RoKCkpOworICAgICAgICBpZiAoIVUxNl9JU19MRUFEKHRleHRbaW5kZXhd
KSkKKyAgICAgICAgICAgIHJldHVybiBpbmRleDsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoaW5k
ZXggKyAxIDwgdGV4dC5sZW5ndGgoKSk7CisgICAgICAgIEFTU0VSVChVMTZfSVNfVFJBSUwodGV4
dFtpbmRleCArIDFdKSk7CisgICAgICAgIHJldHVybiArK2luZGV4OworICAgIH07CisKICAgICBh
dXRvIGxlZnQgPSBzdGFydFBvc2l0aW9uOwogICAgIC8vIFBhdGhvbG9naWNhbCBjYXNlIG9mIChl
eHRyZW1lbHkpbG9uZyBzdHJpbmcgYW5kIG5hcnJvdyBsaW5lcy4KICAgICAvLyBBZGp1c3QgdGhl
IHJhbmdlIHNvIHRoYXQgd2UgY2FuIHBpY2sgYSByZWFzb25hYmxlIG1pZHBvaW50LgotICAgIElu
bGluZUxheW91dFVuaXQgYXZlcmFnZUNoYXJhY3RlcldpZHRoID0gdGV4dFdpZHRoIC8gbGVuZ3Ro
OworICAgIGF1dG8gYXZlcmFnZUNoYXJhY3RlcldpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IHRl
eHRXaWR0aCAvIGxlbmd0aCB9OwogICAgIHVuc2lnbmVkIG9mZnNldCA9IHRvTGF5b3V0VW5pdCgy
ICogYXZhaWxhYmxlV2lkdGggLyBhdmVyYWdlQ2hhcmFjdGVyV2lkdGgpLnRvVW5zaWduZWQoKTsK
LSAgICBhdXRvIHJpZ2h0ID0gc3RkOjptaW48dW5zaWduZWQ+KGxlZnQgKyBvZmZzZXQsIChzdGFy
dFBvc2l0aW9uICsgbGVuZ3RoIC0gMSkpOworICAgIGF1dG8gcmlnaHQgPSBzdXJyb2dhdGVQYWly
QXdhcmVJbmRleChzdGQ6Om1pbjx1bnNpZ25lZD4obGVmdCArIG9mZnNldCwgKHN0YXJ0UG9zaXRp
b24gKyBsZW5ndGggLSAxKSkpOwogICAgIC8vIFByZXNlcnZlIHRoZSBsZWZ0IHdpZHRoIGZvciB0
aGUgZmluYWwgc3BsaXQgcG9zaXRpb24gc28gdGhhdCB3ZSBkb24ndCBuZWVkIHRvIHJlbWVhc3Vy
ZSB0aGUgbGVmdCBzaWRlIGFnYWluLgotICAgIElubGluZUxheW91dFVuaXQgbGVmdFNpZGVXaWR0
aCA9IDA7CisgICAgYXV0byBsZWZ0U2lkZVdpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IDAgfTsK
ICAgICB3aGlsZSAobGVmdCA8IHJpZ2h0KSB7Ci0gICAgICAgIGF1dG8gbWlkZGxlID0gKGxlZnQg
KyByaWdodCkgLyAyOworICAgICAgICBhdXRvIG1pZGRsZSA9IHN1cnJvZ2F0ZVBhaXJBd2FyZUlu
ZGV4KChsZWZ0ICsgcmlnaHQpIC8gMik7CiAgICAgICAgIGF1dG8gd2lkdGggPSBUZXh0VXRpbDo6
d2lkdGgoaW5saW5lVGV4dEl0ZW0sIHN0YXJ0UG9zaXRpb24sIG1pZGRsZSArIDEsIGNvbnRlbnRM
b2dpY2FsTGVmdCk7CiAgICAgICAgIGlmICh3aWR0aCA8IGF2YWlsYWJsZVdpZHRoKSB7CiAgICAg
ICAgICAgICBsZWZ0ID0gbWlkZGxlICsgMTsKICAgICAgICAgICAgIGxlZnRTaWRlV2lkdGggPSB3
aWR0aDsKLSAgICAgICAgfSBlbHNlIGlmICh3aWR0aCA+IGF2YWlsYWJsZVdpZHRoKQotICAgICAg
ICAgICAgcmlnaHQgPSBtaWRkbGU7Ci0gICAgICAgIGVsc2UgeworICAgICAgICB9IGVsc2UgaWYg
KHdpZHRoID4gYXZhaWxhYmxlV2lkdGgpIHsKKyAgICAgICAgICAgIGF1dG8gc3Vycm9nYXRlUGFp
ckF3YXJlU3RhcnQgPSBbJl0gKGF1dG8gaW5kZXgpIHsKKyAgICAgICAgICAgICAgICBpZiAoIVUx
Nl9JU19UUkFJTCh0ZXh0W21pZGRsZV0pKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gaW5k
ZXg7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoaW5kZXgpOworICAgICAgICAgICAg
ICAgIEFTU0VSVChVMTZfSVNfTEVBRCh0ZXh0W2luZGV4IC0gMV0pKTsKKyAgICAgICAgICAgICAg
ICByZXR1cm4gLS1pbmRleDsKKyAgICAgICAgICAgIH07CisgICAgICAgICAgICAvLyBXaGVuIHRo
ZSBzdWJzdHJpbmcgZG9lcyBub3QgZml0LCB0aGUgcmlnaHQgc2lkZSBpcyBzdXBwb3NlZCB0byBi
ZSB0aGUgc3RhcnQgb2YgdGhlIHN1cnJvZ2F0ZSBwYWlyIGlmIGFwcGxpY2FibGUuIAorICAgICAg
ICAgICAgcmlnaHQgPSBzdXJyb2dhdGVQYWlyQXdhcmVTdGFydChtaWRkbGUpOworICAgICAgICB9
IGVsc2UgewogICAgICAgICAgICAgcmlnaHQgPSBtaWRkbGUgKyAxOwogICAgICAgICAgICAgbGVm
dFNpZGVXaWR0aCA9IHdpZHRoOwogICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGls
LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0
L1RleHRVdGlsLmgKaW5kZXggZDEzODI1MzEyYTcxODRmY2NjYmQzZjVlN2RiNzkzYzMxOTY0Nzcw
ZC4uMDYyMmZjZDU2Yjc2NzhkZGNiM2Y5YTU4OGVlY2YwYWMzOTJmNWViMyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0
VXRpbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s
aW5lL3RleHQvVGV4dFV0aWwuaApAQCAtNDcsMTIgKzQ3LDEyIEBAIHB1YmxpYzoKICAgICBzdGF0
aWMgSW5saW5lTGF5b3V0VW5pdCB3aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYsIHVuc2lnbmVk
IGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7
CiAgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgd2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYs
IHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dp
Y2FsTGVmdCk7CiAKLSAgICBzdHJ1Y3QgU3BsaXREYXRhIHsKLSAgICAgICAgdW5zaWduZWQgc3Rh
cnQgeyAwIH07Ci0gICAgICAgIHVuc2lnbmVkIGxlbmd0aCB7IDAgfTsKKyAgICBzdHJ1Y3QgTWlk
V29ya2RCcmVhayB7CisgICAgICAgIHNpemVfdCBzdGFydCB7IDAgfTsKKyAgICAgICAgc2l6ZV90
IGxlbmd0aCB7IDAgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGggeyAw
IH07CiAgICAgfTsKLSAgICBzdGF0aWMgU3BsaXREYXRhIHNwbGl0KGNvbnN0IElubGluZVRleHRJ
dGVtJiwgSW5saW5lTGF5b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxh
YmxlV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKKyAgICBzdGF0
aWMgTWlkV29ya2RCcmVhayBtaWRXb3JrZEJyZWFrKGNvbnN0IElubGluZVRleHRJdGVtJiwgSW5s
aW5lTGF5b3V0VW5pdCB0ZXh0V2lkdGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgs
IElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KTsKIAogICAgIHN0YXRpYyB1bnNp
Z25lZCBmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKExhenlMaW5lQnJlYWtJdGVyYXRvciYsIHVu
c2lnbmVkIHN0YXJ0UG9zaXRpb24sIGNvbnN0IFJlbmRlclN0eWxlJik7CiAgICAgc3RhdGljIExp
bmVCcmVha0l0ZXJhdG9yTW9kZSBsaW5lQnJlYWtJdGVyYXRvck1vZGUoTGluZUJyZWFrKTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436052</attachid>
            <date>2021-08-20 18:19:40 -0700</date>
            <delta_ts>2021-08-21 06:42:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>Patch.txt</filename>
            <type>text/plain</type>
            <size>5045</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCAwODU1ZTA5YmY1NjUuLjE5MTNmNjNkYThjZiAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDE2IEBACisyMDIxLTA4LTIwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+
CisKKyAgICAgICAgRml4IHNwZWxsaW5nOiBNaWRXb3JrZEJyZWFrIC0+IE1pZFdvcmRCcmVhawor
CisgICAgICAgIFVucmV2aWV3ZWQuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRl
eHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM
YXlvdXQ6OklubGluZUNvbnRlbnRCcmVha2VyOjp0cnlCcmVha2luZ1RleHRSdW4gY29uc3QpOgor
ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6bWlkV29yZEJyZWFrKToK
KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6Om1pZFdvcmtkQnJlYWspOiBEZWxl
dGVkLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3RleHQvVGV4
dFV0aWwuaDoKKwogMjAyMS0wOC0yMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK
ICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIEVuYWJsZSBub24tYXV0byBsaW5lLWJyZWFrIHZh
bHVlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0
cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0
L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEJyZWFrZXIuY3BwCmluZGV4
IDI5YTRhNDNhNmI0ZS4uMWYyODEzYzFkN2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s
YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s
aW5lQ29udGVudEJyZWFrZXIuY3BwCkBAIC00NTksNyArNDU5LDcgQEAgc3RkOjpvcHRpb25hbDxJ
bmxpbmVDb250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5saW5lQ29udGVudEJyZWFrZXI6OnRy
eUJyZWFraW4KICAgICAgICAgICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlw
aGVuID0gKmF2YWlsYWJsZVdpZHRoIC0gaHlwaGVuV2lkdGg7CiAgICAgICAgICAgICAgICAgaWYg
KGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlw
aGVuYXRpb24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIGZvbnRDYXNjYWRlLnBpeGVs
U2l6ZSgpKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICAgICAgICAgICAg
ICBsZWZ0U2lkZUxlbmd0aCA9IFRleHRVdGlsOjptaWRXb3JrZEJyZWFrKGlubGluZVRleHRJdGVt
LCBvdmVyZmxvd2luZ1J1bi5sb2dpY2FsV2lkdGgsIGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlw
aGVuLCBsb2dpY2FsTGVmdCkubGVuZ3RoOworICAgICAgICAgICAgICAgIGxlZnRTaWRlTGVuZ3Ro
ID0gVGV4dFV0aWw6Om1pZFdvcmRCcmVhayhpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdSdW4u
bG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiwgbG9naWNhbExlZnQp
Lmxlbmd0aDsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChsZWZ0U2lkZUxlbmd0aCA8
IGxpbWl0QmVmb3JlKQogICAgICAgICAgICAgICAgIHJldHVybiB7IH07CkBAIC00OTMsOCArNDkz
LDggQEAgc3RkOjpvcHRpb25hbDxJbmxpbmVDb250ZW50QnJlYWtlcjo6UGFydGlhbFJ1bj4gSW5s
aW5lQ29udGVudEJyZWFrZXI6OnRyeUJyZWFraW4KICAgICAgICAgICAgICAgICAvLyBGYXN0IHBh
dGggZm9yIGNhc2VzIHdoZW4gdGhlcmUncyBubyByb29tIGF0IGFsbC4gVGhlIGNvbnRlbnQgaXMg
YnJlYWthYmxlIGJ1dCB3ZSBkb24ndCBoYXZlIHNwYWNlIGZvciBpdC4KICAgICAgICAgICAgICAg
ICByZXR1cm4geyB9OwogICAgICAgICAgICAgfQotICAgICAgICAgICAgYXV0byBtaWRXb3JrZEJy
ZWFrID0gVGV4dFV0aWw6Om1pZFdvcmtkQnJlYWsoaW5saW5lVGV4dEl0ZW0sIG92ZXJmbG93aW5n
UnVuLmxvZ2ljYWxXaWR0aCwgKmF2YWlsYWJsZVdpZHRoLCBsb2dpY2FsTGVmdCk7Ci0gICAgICAg
ICAgICByZXR1cm4geyBtaWRXb3JrZEJyZWFrLmxlbmd0aCwgbWlkV29ya2RCcmVhay5sb2dpY2Fs
V2lkdGggfTsKKyAgICAgICAgICAgIGF1dG8gbWlkV29yZEJyZWFrID0gVGV4dFV0aWw6Om1pZFdv
cmRCcmVhayhpbmxpbmVUZXh0SXRlbSwgb3ZlcmZsb3dpbmdSdW4ubG9naWNhbFdpZHRoLCAqYXZh
aWxhYmxlV2lkdGgsIGxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgIHJldHVybiB7IG1pZFdvcmRC
cmVhay5sZW5ndGgsIG1pZFdvcmRCcmVhay5sb2dpY2FsV2lkdGggfTsKICAgICAgICAgfTsKICAg
ICAgICAgLy8gV2l0aCBhcmJpdHJhcnkgYnJlYWtpbmcgdGhlcmUncyBhbHdheXMgYSB2YWxpZCBi
cmVha2luZyBwb3NpdGlvbiAoZXZlbiBpZiBpdCBpcyBiZWZvcmUgdGhlIGZpcnN0IHBvc2l0aW9u
KS4KICAgICAgICAgcmV0dXJuIHRyeUJyZWFraW5nQXRBcmJpdHJhcnlQb3NpdGlvbigpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv
dGV4dC9UZXh0VXRpbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl
eHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcAppbmRleCA2ZGQyZDIwZGE2ZjguLjE1ZGRhMTgz
OWUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0
cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv
cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAKQEAgLTg0LDcgKzg0LDcg
QEAgSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYg
aW5saW5lVGV4dEJveCwgdW5zaWduZWQgZnIKICAgICByZXR1cm4gc3RkOjppc25hbih3aWR0aCkg
PyAwLjBmIDogc3RkOjppc2luZih3aWR0aCkgPyBtYXhJbmxpbmVMYXlvdXRVbml0KCkgOiB3aWR0
aDsKIH0KIAotVGV4dFV0aWw6Ok1pZFdvcmtkQnJlYWsgVGV4dFV0aWw6Om1pZFdvcmtkQnJlYWso
Y29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRVbml0IHRl
eHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSW5saW5lTGF5b3V0VW5p
dCBjb250ZW50TG9naWNhbExlZnQpCitUZXh0VXRpbDo6TWlkV29yZEJyZWFrIFRleHRVdGlsOjpt
aWRXb3JkQnJlYWsoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVM
YXlvdXRVbml0IHRleHRXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSW5s
aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7CiAgICAgQVNTRVJUKGF2YWlsYWJs
ZVdpZHRoID49IDApOwogICAgIGF1dG8gc3RhcnRQb3NpdGlvbiA9IGlubGluZVRleHRJdGVtLnN0
YXJ0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl
eHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0
dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmgKaW5kZXggYjRiNDFkMDM1ZDgwLi42
YmFiNzNlM2UwNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n
Q29udGV4dHMvaW5saW5lL3RleHQvVGV4dFV0aWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv
dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmgKQEAgLTQ2LDEyICs0
NiwxMiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgd2lkdGgoY29uc3Qg
SW5saW5lVGV4dEl0ZW0mLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0
VW5pdCBjb250ZW50TG9naWNhbExlZnQpOwogICAgIHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IHdp
ZHRoKGNvbnN0IElubGluZVRleHRCb3gmLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5s
aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpOwogCi0gICAgc3RydWN0IE1pZFdvcmtk
QnJlYWsgeworICAgIHN0cnVjdCBNaWRXb3JkQnJlYWsgewogICAgICAgICBzaXplX3Qgc3RhcnQg
eyAwIH07CiAgICAgICAgIHNpemVfdCBsZW5ndGggeyAwIH07CiAgICAgICAgIElubGluZUxheW91
dFVuaXQgbG9naWNhbFdpZHRoIHsgMCB9OwogICAgIH07Ci0gICAgc3RhdGljIE1pZFdvcmtkQnJl
YWsgbWlkV29ya2RCcmVhayhjb25zdCBJbmxpbmVUZXh0SXRlbSYsIElubGluZUxheW91dFVuaXQg
dGV4dFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBJbmxpbmVMYXlvdXRV
bml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgc3RhdGljIE1pZFdvcmRCcmVhayBtaWRXb3Jk
QnJlYWsoY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IHRleHRXaWR0aCwg
SW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50
TG9naWNhbExlZnQpOwogCiAgICAgc3RhdGljIHVuc2lnbmVkIGZpbmROZXh0QnJlYWthYmxlUG9z
aXRpb24oTGF6eUxpbmVCcmVha0l0ZXJhdG9yJiwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgY29u
c3QgUmVuZGVyU3R5bGUmKTsKICAgICBzdGF0aWMgTGluZUJyZWFrSXRlcmF0b3JNb2RlIGxpbmVC
cmVha0l0ZXJhdG9yTW9kZShMaW5lQnJlYWspOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>