<?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>230542</bug_id>
          
          <creation_ts>2021-09-21 02:57:30 -0700</creation_ts>
          <short_desc>[LFC][Integration] Enable markers and highlights</short_desc>
          <delta_ts>2021-09-21 06:48:32 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>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="Antti Koivisto">koivisto</reporter>
          <assigned_to name="Antti Koivisto">koivisto</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>kangil.han</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>mifenton</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1795493</commentid>
    <comment_count>0</comment_count>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-09-21 02:57:30 -0700</bug_when>
    <thetext>Paint highlights and markers with LFC layout</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1795498</commentid>
    <comment_count>1</comment_count>
      <attachid>438800</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-09-21 03:12:04 -0700</bug_when>
    <thetext>Created attachment 438800
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1795516</commentid>
    <comment_count>2</comment_count>
      <attachid>438807</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-09-21 05:05:52 -0700</bug_when>
    <thetext>Created attachment 438807
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1795522</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-09-21 06:46:23 -0700</bug_when>
    <thetext>Committed r282811 (241943@main): &lt;https://commits.webkit.org/241943@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 438807.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1795523</commentid>
    <comment_count>4</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-09-21 06:48:32 -0700</bug_when>
    <thetext>&lt;rdar://problem/83350262&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>438800</attachid>
            <date>2021-09-21 03:12:04 -0700</date>
            <delta_ts>2021-09-21 05:05:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-230542-20210921131202.patch</filename>
            <type>text/plain</type>
            <size>9561</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE1MTI3NWU4YTU5YTk2
OTRjNjcwM2ZjNzNjNzIxYzgyMzNkYTIxYS4uZWNlYTQxMzNkZWY5ODE4NGI2NzM5Y2JhOGJhZDNk
YWI0NDQwNWMwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA5LTIxICBBbnR0
aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv
bl0gRW5hYmxlIG1hcmtlcnMgYW5kIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDU0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIExheW91dCBhbmQgcGFpbnQgaGlnaGxpZ2h0cyBhbmQg
bWFya2VycyB3aXRob3V0IHN3aXRjaGluZyB0byBsZWdhY3kgbGluZSBsYXlvdXQuCisKKyAgICAg
ICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9IaWdobGlnaHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
cmVwYWludFJhbmdlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6YWRkTWFya2Vy
KToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0
b3I6OnNldENvbXBvc2l0aW9uKToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0
SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh
dGlvbjo6cHJpbnRSZWFzb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246
OmNhblVzZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpj
YW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJlYXNvbik6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0
aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaDoKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdy
YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpwYWludCk6CisKIDIwMjEtMDktMjAgIENo
cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wIHJlbWFpbmluZyB1
c2VzIG9mIG1ha2VSZWZQdHIoKSBpbiBXZWJDb3JlLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvSGlnaGxpZ2h0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvaGlnaGxpZ2h0L0hpZ2hsaWdodC5jcHAKaW5kZXggMTM0ZjNhOWIyYmNmOWRiZjFjODI0ZDlh
MjczNTI3OTQwZDNlNjE0OC4uMWY4YmM5MWFjYWEyN2ExN2Q1MDBhYjI1NWM0ZTkyODdkMzY1NTQx
OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvSGlnaGxpZ2h0
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9IaWdobGlnaHQuY3Bw
CkBAIC02NywxMyArNjcsOCBAQCBzdGF0aWMgdm9pZCByZXBhaW50UmFuZ2UoY29uc3QgU2ltcGxl
UmFuZ2UmIHJhbmdlKQogICAgIGlmIChpc19ndCh0cmVlT3JkZXI8Q29tcG9zZWRUcmVlPihyYW5n
ZS5zdGFydCwgcmFuZ2UuZW5kKSkpCiAgICAgICAgIHN0ZDo6c3dhcChzb3J0ZWRSYW5nZS5zdGFy
dCwgc29ydGVkUmFuZ2UuZW5kKTsKICAgICBmb3IgKGF1dG8mIG5vZGUgOiBpbnRlcnNlY3RpbmdO
b2Rlcyhzb3J0ZWRSYW5nZSkpIHsKLSAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBub2RlLnJl
bmRlcmVyKCkpIHsKLSNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAgICAg
ICAgICAgIGlmIChhdXRvIGxpbmVMYXlvdXQgPSBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91
dDo6Y29udGFpbmluZygqcmVuZGVyZXIpKQotICAgICAgICAgICAgICAgIGxpbmVMYXlvdXQtPmZs
b3coKS5lbnN1cmVMaW5lQm94ZXMoKTsKLSNlbmRpZgorICAgICAgICBpZiAoYXV0byByZW5kZXJl
ciA9IG5vZGUucmVuZGVyZXIoKSkKICAgICAgICAgICAgIHJlbmRlcmVyLT5yZXBhaW50KCk7Ci0g
ICAgICAgIH0KICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1
bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFy
a2VyQ29udHJvbGxlci5jcHAKaW5kZXggM2Y2NDRmMDFiNzUyNjA0YWNmN2M3MGI2MjJmMzNmZjI0
OTJiOGRhYi4uMDdlYWVhZTdjZTc1MjM2ZjkzMmNmMzcyOWVjYWYyMWJhNzhiZTUwMiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50TWFya2VyQ29udHJvbGxlci5jcHAKQEAgLTI1
MywxNCArMjUzLDYgQEAgdm9pZCBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6OmFkZE1hcmtlcihO
b2RlJiBub2RlLCBEb2N1bWVudE1hcmtlciYmIG5ld01hcmtlcikKICAgICBpZiAobmV3TWFya2Vy
LmVuZE9mZnNldCgpID09IG5ld01hcmtlci5zdGFydE9mZnNldCgpKQogICAgICAgICByZXR1cm47
CiAKLSNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAgICBpZiAoYXV0byog
cmVuZGVyZXIgPSBub2RlLnJlbmRlcmVyKCkpIHsKLSAgICAgICAgLy8gRklYTUU6IEZhY3RvciB0
aGUgbWFya2VyIHBhaW50aW5nIGNvZGUgb3V0IG9mIExlZ2FjeUlubGluZVRleHRCb3ggYW5kIHRl
YWNoIHNpbXBsZSBsaW5lIGxheW91dCB0byB1c2UgaXQuCi0gICAgICAgIGlmIChhdXRvKiBsaW5l
TGF5b3V0ID0gTGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OmNvbnRhaW5pbmcoKnJlbmRl
cmVyKSkKLSAgICAgICAgICAgIGxpbmVMYXlvdXQtPmZsb3coKS5lbnN1cmVMaW5lQm94ZXMoKTsK
LSAgICB9Ci0jZW5kaWYKLQogICAgIG1fcG9zc2libHlFeGlzdGluZ01hcmtlclR5cGVzLmFkZChu
ZXdNYXJrZXIudHlwZSgpKTsKIAogICAgIGF1dG8mIGxpc3QgPSBtX21hcmtlcnMuYWRkKCZub2Rl
LCBudWxscHRyKS5pdGVyYXRvci0+dmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l
ZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKaW5k
ZXggMmZlYzNkZmUwMTVhMmM5ZDEwOWQ3MTA0MDlmZGRhYWE4YzlmMWIyMS4uYmZlYzQ3ZDIxOWE5
YTcxNzcyYjNkM2NhNmE4MGRhMmRmNGI1ZmE0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
ZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw
cApAQCAtMjE1NywxMyArMjE1Nyw4IEBAIHZvaWQgRWRpdG9yOjpzZXRDb21wb3NpdGlvbihjb25z
dCBTdHJpbmcmIHRleHQsIGNvbnN0IFZlY3RvcjxDb21wb3NpdGlvblVuZGVybGluCiAgICAgICAg
ICAgICAgICAgaGlnaGxpZ2h0LmVuZE9mZnNldCArPSBiYXNlT2Zmc2V0OwogICAgICAgICAgICAg
fQogCi0gICAgICAgICAgICBpZiAoYXV0byByZW5kZXJlciA9IGJhc2VOb2RlLT5yZW5kZXJlcigp
KSB7Ci0jaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgICAgICAgICAg
ICAgaWYgKGF1dG8gbGluZUxheW91dCA9IExheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojpj
b250YWluaW5nKCpyZW5kZXJlcikpCi0gICAgICAgICAgICAgICAgICAgIGxpbmVMYXlvdXQtPmZs
b3coKS5lbnN1cmVMaW5lQm94ZXMoKTsKLSNlbmRpZgorICAgICAgICAgICAgaWYgKGF1dG8gcmVu
ZGVyZXIgPSBiYXNlTm9kZS0+cmVuZGVyZXIoKSkKICAgICAgICAgICAgICAgICByZW5kZXJlci0+
cmVwYWludCgpOwotICAgICAgICAgICAgfQogCiAgICAgICAgICAgICB1bnNpZ25lZCBzdGFydCA9
IHN0ZDo6bWluKGJhc2VPZmZzZXQgKyBzZWxlY3Rpb25TdGFydCwgZXh0ZW50T2Zmc2V0KTsKICAg
ICAgICAgICAgIHVuc2lnbmVkIGVuZCA9IHN0ZDo6bWluKHN0ZDo6bWF4KHN0YXJ0LCBiYXNlT2Zm
c2V0ICsgc2VsZWN0aW9uRW5kKSwgZXh0ZW50T2Zmc2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBi
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVy
YWdlLmNwcAppbmRleCAwYWFlZjkxYmVhZjA5MTc4ZjI2ZDQxNWEwZWVjZDA5MDBhMWZhZWMyLi40
OTk1NTA2ZWJlZWNmMDZiZDA4NjU0NmQ5MGMxMTg1OWQyNGVjMTgxIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0
aW9uQ292ZXJhZ2UuY3BwCkBAIC0yNiw5ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj
aW5jbHVkZSAiTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oIgogCi0jaW5jbHVkZSAiRG9jdW1l
bnRNYXJrZXJDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l
bnQuaCIKLSNpbmNsdWRlICJIaWdobGlnaHRSZWdpc3Rlci5oIgogI2luY2x1ZGUgIklubGluZUl0
ZXJhdG9yLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlJlbmRlckJsb2NrRmxv
dy5oIgpAQCAtMjA3LDEyICsyMDUsNiBAQCBzdGF0aWMgdm9pZCBwcmludFJlYXNvbihBdm9pZGFu
Y2VSZWFzb24gcmVhc29uLCBUZXh0U3RyZWFtJiBzdHJlYW0pCiAgICAgY2FzZSBBdm9pZGFuY2VS
ZWFzb246Ok11bHRpQ29sdW1uRmxvd0lzRmxvYXRpbmc6CiAgICAgICAgIHN0cmVhbSA8PCAiY29s
dW1uIHdpdGggZmxvYXRpbmcgb2JqZWN0cyI7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQXZv
aWRhbmNlUmVhc29uOjpGbG93SW5jbHVkZXNEb2N1bWVudE1hcmtlcnM6Ci0gICAgICAgIHN0cmVh
bSA8PCAidGV4dCBpbmNsdWRlcyBkb2N1bWVudCBtYXJrZXJzIjsKLSAgICAgICAgYnJlYWs7Ci0g
ICAgY2FzZSBBdm9pZGFuY2VSZWFzb246OkZsb3dJbmNsdWRlc0hpZ2hsaWdodHM6Ci0gICAgICAg
IHN0cmVhbSA8PCAidGV4dCBpbmNsdWRlcyBoaWdobGlnaHRzIjsKLSAgICAgICAgYnJlYWs7CiAg
ICAgY2FzZSBBdm9pZGFuY2VSZWFzb246OkZsb3dIYXNKdXN0aWZpZWROb25CcmVha2luZ1NwYWNl
OgogICAgICAgICBzdHJlYW0gPDwgImp1c3RpZmllZCB0ZXh0IGhhcyBub24tYnJlYWtpbmctc3Bh
Y2UgY2hhcmFjdGVyIjsKICAgICAgICAgYnJlYWs7CkBAIC01MTcsMTUgKzUwOSwxNCBAQCBzdGF0
aWMgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yU3R5bGUoY29uc3QgUmVuZGVy
U3R5bGUmIHN0eWxlLCBJbmNsdQogc3RhdGljIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNh
blVzZUZvckNoaWxkKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgUmVuZGVyT2Jq
ZWN0JiBjaGlsZCwgSW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCiB7CiAgICAgT3B0aW9u
U2V0PEF2b2lkYW5jZVJlYXNvbj4gcmVhc29uczsKLSAgICBpZiAoaXM8UmVuZGVyQ291bnRlcj4o
Y2hpbGQpKQotICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dUZXh0
SXNSZW5kZXJDb3VudGVyLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CisKICAgICBpZiAoaXM8
UmVuZGVyVGV4dD4oY2hpbGQpKSB7Ci0gICAgICAgIGNvbnN0IGF1dG8mIHJlbmRlclRleHQgPSBk
b3duY2FzdDxSZW5kZXJUZXh0PihjaGlsZCk7Ci0gICAgICAgIGlmIChyZW5kZXJUZXh0LnRleHRO
b2RlKCkgJiYgIXJlbmRlclRleHQuZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0ZvcigqcmVu
ZGVyVGV4dC50ZXh0Tm9kZSgpKS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBTRVRfUkVBU09OX0FO
RF9SRVRVUk5fSUZfTkVFREVEKEZsb3dJbmNsdWRlc0RvY3VtZW50TWFya2VycywgcmVhc29ucywg
aW5jbHVkZVJlYXNvbnMpOworICAgICAgICBpZiAoaXM8UmVuZGVyQ291bnRlcj4oY2hpbGQpKQor
ICAgICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93VGV4dElzUmVu
ZGVyQ291bnRlciwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOworCiAgICAgICAgIHJldHVybiBy
ZWFzb25zOwogICAgIH0KLSAgICAKKwogICAgIGlmIChmbG93LmNvbnRhaW5zRmxvYXRzKCkpIHsK
ICAgICAgICAgLy8gTm9uLXRleHQgY29udGVudCBtYXkgc3RyZXRjaCB0aGUgbGluZSBhbmQgd2Ug
ZG9uJ3QgeWV0IGhhdmUgc3VwcG9ydCBmb3IgZHluYW1pYyBmbG9hdCBhdm9pZGluZyAoYXMgdGhl
IGxpbmUgZ3Jvd3MpLgogICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZs
b3dIYXNVbnN1cHBvcnRlZEZsb2F0LCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CkBAIC02ODgs
MTIgKzY3OSw2IEBAIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckxpbmVMYXlv
dXRXaXRoUmVhc29uKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYKICAgICAvLyBQcmludGluZyBkb2Vz
IHBhZ2luYXRpb24gd2l0aG91dCBhIGZsb3cgdGhyZWFkLgogICAgIGlmIChmbG93LmRvY3VtZW50
KCkucGFnaW5hdGVkKCkpCiAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQo
Rmxvd0lzUGFnaW5hdGVkLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7Ci0gICAgaWYgKGZsb3cu
ZG9jdW1lbnQoKS5oaWdobGlnaHRSZWdpc3RlcklmRXhpc3RzKCkgJiYgIWZsb3cuZG9jdW1lbnQo
KS5oaWdobGlnaHRSZWdpc3RlcklmRXhpc3RzKCktPm1hcCgpLmlzRW1wdHkoKSkKLSAgICAgICAg
U0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SW5jbHVkZXNIaWdobGlnaHRzLCBy
ZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7Ci0jaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQotICAg
IGlmIChmbG93LmRvY3VtZW50KCkuYXBwSGlnaGxpZ2h0UmVnaXN0ZXJJZkV4aXN0cygpICYmICFm
bG93LmRvY3VtZW50KCkuYXBwSGlnaGxpZ2h0UmVnaXN0ZXJJZkV4aXN0cygpLT5tYXAoKS5pc0Vt
cHR5KCkpCi0gICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0luY2x1
ZGVzSGlnaGxpZ2h0cywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwotI2VuZGlmCiAgICAgaWYg
KGZsb3cuZmlyc3RMaW5lQmxvY2soKSkKICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lG
X05FRURFRChGbG93SGFzUHNldWRvRmlyc3RMaW5lLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7
CiAgICAgaWYgKGZsb3cuaXNBbm9ueW1vdXNCbG9jaygpICYmIGZsb3cucGFyZW50KCktPnN0eWxl
KCkudGV4dE92ZXJmbG93KCkgPT0gVGV4dE92ZXJmbG93OjpFbGxpcHNpcykKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVy
YWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp
b25Db3ZlcmFnZS5oCmluZGV4IDc0MjliMzE1Nzg0NmE5NDlmM2ExMzVhOTg4ZjkwY2FjNjIwYjZl
YjguLjc2ZTJhNjlmMjMzZDg3MDE5YjA4ODU0NGM3NmU1Y2FjNzEyNThkMmQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVy
YWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVn
cmF0aW9uQ292ZXJhZ2UuaApAQCAtODgsOCArODgsOCBAQCBlbnVtIGNsYXNzIEF2b2lkYW5jZVJl
YXNvbiA6IHVpbnQ2NF90IHsKICAgICBNdWx0aUNvbHVtbkZsb3dIYXNDb2x1bW5TcGFubmVyICAg
ICAgICAgICAgICA9IDFMTFUgIDw8IDQ4LAogICAgIE11bHRpQ29sdW1uRmxvd1ZlcnRpY2FsQWxp
Z24gICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgNDksCiAgICAgTXVsdGlDb2x1bW5GbG93SXNG
bG9hdGluZyAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCA1MCwKLSAgICBGbG93SW5jbHVk
ZXNEb2N1bWVudE1hcmtlcnMgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDUxLAotICAgIEZs
b3dJbmNsdWRlc0hpZ2hsaWdodHMgICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgNTIs
CisgICAgLy8gVW51c2VkICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxTExV
ICA8PCA1MSwKKyAgICAvLyBVbnVzZWQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICA9IDFMTFUgIDw8IDUyLAogICAgIEZsb3dIYXNKdXN0aWZpZWROb25CcmVha2luZ1NwYWNlICAg
ICAgICAgICAgID0gMUxMVSAgPDwgNTMsCiAgICAgVW5zdXBwb3J0ZWRGaWVsZHNldCAgICAgICAg
ICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCA1NCwKICAgICBDaGlsZEJveElzRmxvYXRpbmdP
clBvc2l0aW9uZWQgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDU1LApkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91
dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp
b25MaW5lTGF5b3V0LmNwcAppbmRleCA5MmRmMGVjYWMzM2IxMTdkMmUzNzQ0YzE2ODEwYTdiMTRj
ODJkNDlmLi4xMGM1ZTE1MDFjMjAyZDlkYmE2NGYyYWYyMGRhZjQyMzkwZmNkMjdhIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M
aW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5
b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtNDkyLDcgKzQ5Miw3IEBAIHZvaWQgTGlu
ZUxheW91dDo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBw
YWludE9mZnNldCkKICAgICBpZiAoIW1faW5saW5lQ29udGVudCkKICAgICAgICAgcmV0dXJuOwog
Ci0gICAgaWYgKHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpGb3JlZ3JvdW5kICYmIHBh
aW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpFdmVudFJlZ2lvbiAmJiBwYWludEluZm8ucGhh
c2UgIT0gUGFpbnRQaGFzZTo6VGV4dENsaXApCisgICAgaWYgKHBhaW50SW5mby5waGFzZSAhPSBQ
YWludFBoYXNlOjpGb3JlZ3JvdW5kICYmIHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpF
dmVudFJlZ2lvbiAmJiBwYWludEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6VGV4dENsaXAgJiYg
cGFpbnRJbmZvLnBoYXNlICE9IFBhaW50UGhhc2U6OlNlbGVjdGlvbikKICAgICAgICAgcmV0dXJu
OwogCiAgICAgYXV0byBwYWludFJlY3QgPSBwYWludEluZm8ucmVjdDsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>438807</attachid>
            <date>2021-09-21 05:05:52 -0700</date>
            <delta_ts>2021-09-21 06:46:25 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-230542-20210921150550.patch</filename>
            <type>text/plain</type>
            <size>12086</size>
            <attacher name="Antti Koivisto">koivisto</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE1MTI3NWU4YTU5YTk2
OTRjNjcwM2ZjNzNjNzIxYzgyMzNkYTIxYS4uZWNlYTQxMzNkZWY5ODE4NGI2NzM5Y2JhOGJhZDNk
YWI0NDQwNWMwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA5LTIxICBBbnR0
aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlv
bl0gRW5hYmxlIG1hcmtlcnMgYW5kIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDU0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIExheW91dCBhbmQgcGFpbnQgaGlnaGxpZ2h0cyBhbmQg
bWFya2VycyB3aXRob3V0IHN3aXRjaGluZyB0byBsZWdhY3kgbGluZSBsYXlvdXQuCisKKyAgICAg
ICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9IaWdobGlnaHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
cmVwYWludFJhbmdlKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6YWRkTWFya2Vy
KToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0
b3I6OnNldENvbXBvc2l0aW9uKToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0
SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh
dGlvbjo6cHJpbnRSZWFzb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246
OmNhblVzZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpj
YW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJlYXNvbik6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0
aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaDoKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdy
YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpwYWludCk6CisKIDIwMjEtMDktMjAgIENo
cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wIHJlbWFpbmluZyB1
c2VzIG9mIG1ha2VSZWZQdHIoKSBpbiBXZWJDb3JlLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvTW9kdWxlcy9oaWdobGlnaHQvSGlnaGxpZ2h0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvaGlnaGxpZ2h0L0hpZ2hsaWdodC5jcHAKaW5kZXggMTM0ZjNhOWIyYmNmOWRiZjFjODI0ZDlh
MjczNTI3OTQwZDNlNjE0OC4uZjQ3YmY0NjI0OThiNjkyMzMwZTZjZTJhN2YxYzYyNGJmMzc3NTgx
OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvSGlnaGxpZ2h0
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9IaWdobGlnaHQuY3Bw
CkBAIC0zNywxMCArMzcsNiBAQAogI2luY2x1ZGUgIlN0eWxlUHJvcGVydGllcy5oIgogI2luY2x1
ZGUgPHd0Zi9SZWYuaD4KIAotI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQot
I2luY2x1ZGUgIkxheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIgotI2VuZGlmCi0KIG5hbWVz
cGFjZSBXZWJDb3JlIHsKIAogSGlnaGxpZ2h0OjpIaWdobGlnaHQoUmVmPFN0YXRpY1JhbmdlPiYm
IHJhbmdlKQpAQCAtNjcsMTMgKzYzLDggQEAgc3RhdGljIHZvaWQgcmVwYWludFJhbmdlKGNvbnN0
IFNpbXBsZVJhbmdlJiByYW5nZSkKICAgICBpZiAoaXNfZ3QodHJlZU9yZGVyPENvbXBvc2VkVHJl
ZT4ocmFuZ2Uuc3RhcnQsIHJhbmdlLmVuZCkpKQogICAgICAgICBzdGQ6OnN3YXAoc29ydGVkUmFu
Z2Uuc3RhcnQsIHNvcnRlZFJhbmdlLmVuZCk7CiAgICAgZm9yIChhdXRvJiBub2RlIDogaW50ZXJz
ZWN0aW5nTm9kZXMoc29ydGVkUmFuZ2UpKSB7Ci0gICAgICAgIGlmIChhdXRvIHJlbmRlcmVyID0g
bm9kZS5yZW5kZXJlcigpKSB7Ci0jaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQp
Ci0gICAgICAgICAgICBpZiAoYXV0byBsaW5lTGF5b3V0ID0gTGF5b3V0SW50ZWdyYXRpb246Okxp
bmVMYXlvdXQ6OmNvbnRhaW5pbmcoKnJlbmRlcmVyKSkKLSAgICAgICAgICAgICAgICBsaW5lTGF5
b3V0LT5mbG93KCkuZW5zdXJlTGluZUJveGVzKCk7Ci0jZW5kaWYKKyAgICAgICAgaWYgKGF1dG8g
cmVuZGVyZXIgPSBub2RlLnJlbmRlcmVyKCkpCiAgICAgICAgICAgICByZW5kZXJlci0+cmVwYWlu
dCgpOwotICAgICAgICB9CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1
bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwCmluZGV4IDNmNjQ0ZjAxYjc1MjYwNGFjZjdjNzBiNjIy
ZjMzZmYyNDkyYjhkYWIuLmQ2YTQ5M2Y2MTYwODM1ZGM5OTVjMzFhM2M5NmVjMjMyNDcwYTViMjQg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuY3Bw
CkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSAiQ2hyb21lLmgiCiAjaW5jbHVkZSAiQ2hyb21l
Q2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKLSNpbmNsdWRlICJMYXlvdXRJbnRlZ3JhdGlv
bkxpbmVMYXlvdXQuaCIKICNpbmNsdWRlICJOb2RlVHJhdmVyc2FsLmgiCiAjaW5jbHVkZSAiUGFn
ZS5oIgogI2luY2x1ZGUgIlJlbmRlckJsb2NrRmxvdy5oIgpAQCAtMjUzLDE0ICsyNTIsNiBAQCB2
b2lkIERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6YWRkTWFya2VyKE5vZGUmIG5vZGUsIERvY3Vt
ZW50TWFya2VyJiYgbmV3TWFya2VyKQogICAgIGlmIChuZXdNYXJrZXIuZW5kT2Zmc2V0KCkgPT0g
bmV3TWFya2VyLnN0YXJ0T2Zmc2V0KCkpCiAgICAgICAgIHJldHVybjsKIAotI2lmIEVOQUJMRShM
QVlPVVRfRk9STUFUVElOR19DT05URVhUKQotICAgIGlmIChhdXRvKiByZW5kZXJlciA9IG5vZGUu
cmVuZGVyZXIoKSkgewotICAgICAgICAvLyBGSVhNRTogRmFjdG9yIHRoZSBtYXJrZXIgcGFpbnRp
bmcgY29kZSBvdXQgb2YgTGVnYWN5SW5saW5lVGV4dEJveCBhbmQgdGVhY2ggc2ltcGxlIGxpbmUg
bGF5b3V0IHRvIHVzZSBpdC4KLSAgICAgICAgaWYgKGF1dG8qIGxpbmVMYXlvdXQgPSBMYXlvdXRJ
bnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29udGFpbmluZygqcmVuZGVyZXIpKQotICAgICAgICAg
ICAgbGluZUxheW91dC0+ZmxvdygpLmVuc3VyZUxpbmVCb3hlcygpOwotICAgIH0KLSNlbmRpZgot
CiAgICAgbV9wb3NzaWJseUV4aXN0aW5nTWFya2VyVHlwZXMuYWRkKG5ld01hcmtlci50eXBlKCkp
OwogCiAgICAgYXV0byYgbGlzdCA9IG1fbWFya2Vycy5hZGQoJm5vZGUsIG51bGxwdHIpLml0ZXJh
dG9yLT52YWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw
cCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAppbmRleCAyZmVjM2RmZTAxNWEy
YzlkMTA5ZDcxMDQwOWZkZGFhYThjOWYxYjIxLi4yNzhiMmU5MjRlN2EzNzBmOTFhOWZiOTdmYmY0
NzMzNDY0MGM4Yzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCkBAIC0xMzMsMTAgKzEz
Myw2IEBACiAjaW5jbHVkZSAiUHJvbWlzZWRBdHRhY2htZW50SW5mby5oIgogI2VuZGlmCiAKLSNp
ZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSNpbmNsdWRlICJMYXlvdXRJbnRl
Z3JhdGlvbkxpbmVMYXlvdXQuaCIKLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0
YXRpYyBib29sIGRpc3BhdGNoQmVmb3JlSW5wdXRFdmVudChFbGVtZW50JiBlbGVtZW50LCBjb25z
dCBBdG9tU3RyaW5nJiBpbnB1dFR5cGUsIGNvbnN0IFN0cmluZyYgZGF0YSA9IHsgfSwgUmVmUHRy
PERhdGFUcmFuc2Zlcj4mJiBkYXRhVHJhbnNmZXIgPSBudWxscHRyLCBjb25zdCBWZWN0b3I8UmVm
UHRyPFN0YXRpY1JhbmdlPj4mIHRhcmdldFJhbmdlcyA9IHsgfSwgRXZlbnQ6OklzQ2FuY2VsYWJs
ZSBjYW5jZWxhYmxlID0gRXZlbnQ6OklzQ2FuY2VsYWJsZTo6WWVzKQpAQCAtMjE1NywxMyArMjE1
Myw4IEBAIHZvaWQgRWRpdG9yOjpzZXRDb21wb3NpdGlvbihjb25zdCBTdHJpbmcmIHRleHQsIGNv
bnN0IFZlY3RvcjxDb21wb3NpdGlvblVuZGVybGluCiAgICAgICAgICAgICAgICAgaGlnaGxpZ2h0
LmVuZE9mZnNldCArPSBiYXNlT2Zmc2V0OwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBp
ZiAoYXV0byByZW5kZXJlciA9IGJhc2VOb2RlLT5yZW5kZXJlcigpKSB7Ci0jaWYgRU5BQkxFKExB
WU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgICAgICAgICAgICAgaWYgKGF1dG8gbGluZUxh
eW91dCA9IExheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojpjb250YWluaW5nKCpyZW5kZXJl
cikpCi0gICAgICAgICAgICAgICAgICAgIGxpbmVMYXlvdXQtPmZsb3coKS5lbnN1cmVMaW5lQm94
ZXMoKTsKLSNlbmRpZgorICAgICAgICAgICAgaWYgKGF1dG8gcmVuZGVyZXIgPSBiYXNlTm9kZS0+
cmVuZGVyZXIoKSkKICAgICAgICAgICAgICAgICByZW5kZXJlci0+cmVwYWludCgpOwotICAgICAg
ICAgICAgfQogCiAgICAgICAgICAgICB1bnNpZ25lZCBzdGFydCA9IHN0ZDo6bWluKGJhc2VPZmZz
ZXQgKyBzZWxlY3Rpb25TdGFydCwgZXh0ZW50T2Zmc2V0KTsKICAgICAgICAgICAgIHVuc2lnbmVk
IGVuZCA9IHN0ZDo6bWluKHN0ZDo6bWF4KHN0YXJ0LCBiYXNlT2Zmc2V0ICsgc2VsZWN0aW9uRW5k
KSwgZXh0ZW50T2Zmc2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl
Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh
eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAppbmRleCAwYWFl
ZjkxYmVhZjA5MTc4ZjI2ZDQxNWEwZWVjZDA5MDBhMWZhZWMyLi40OTk1NTA2ZWJlZWNmMDZiZDA4
NjU0NmQ5MGMxMTg1OWQyNGVjMTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv
aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCkBA
IC0yNiw5ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiTGF5b3V0SW50
ZWdyYXRpb25Db3ZlcmFnZS5oIgogCi0jaW5jbHVkZSAiRG9jdW1lbnRNYXJrZXJDb250cm9sbGVy
LmgiCiAjaW5jbHVkZSAiSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuaCIKLSNpbmNsdWRlICJI
aWdobGlnaHRSZWdpc3Rlci5oIgogI2luY2x1ZGUgIklubGluZUl0ZXJhdG9yLmgiCiAjaW5jbHVk
ZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlJlbmRlckJsb2NrRmxvdy5oIgpAQCAtMjA3LDEyICsy
MDUsNiBAQCBzdGF0aWMgdm9pZCBwcmludFJlYXNvbihBdm9pZGFuY2VSZWFzb24gcmVhc29uLCBU
ZXh0U3RyZWFtJiBzdHJlYW0pCiAgICAgY2FzZSBBdm9pZGFuY2VSZWFzb246Ok11bHRpQ29sdW1u
Rmxvd0lzRmxvYXRpbmc6CiAgICAgICAgIHN0cmVhbSA8PCAiY29sdW1uIHdpdGggZmxvYXRpbmcg
b2JqZWN0cyI7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQXZvaWRhbmNlUmVhc29uOjpGbG93
SW5jbHVkZXNEb2N1bWVudE1hcmtlcnM6Ci0gICAgICAgIHN0cmVhbSA8PCAidGV4dCBpbmNsdWRl
cyBkb2N1bWVudCBtYXJrZXJzIjsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBdm9pZGFuY2VS
ZWFzb246OkZsb3dJbmNsdWRlc0hpZ2hsaWdodHM6Ci0gICAgICAgIHN0cmVhbSA8PCAidGV4dCBp
bmNsdWRlcyBoaWdobGlnaHRzIjsKLSAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBdm9pZGFuY2VS
ZWFzb246OkZsb3dIYXNKdXN0aWZpZWROb25CcmVha2luZ1NwYWNlOgogICAgICAgICBzdHJlYW0g
PDwgImp1c3RpZmllZCB0ZXh0IGhhcyBub24tYnJlYWtpbmctc3BhY2UgY2hhcmFjdGVyIjsKICAg
ICAgICAgYnJlYWs7CkBAIC01MTcsMTUgKzUwOSwxNCBAQCBzdGF0aWMgT3B0aW9uU2V0PEF2b2lk
YW5jZVJlYXNvbj4gY2FuVXNlRm9yU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmNs
dQogc3RhdGljIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckNoaWxkKGNvbnN0
IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgUmVuZGVyT2JqZWN0JiBjaGlsZCwgSW5jbHVk
ZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCiB7CiAgICAgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNv
bj4gcmVhc29uczsKLSAgICBpZiAoaXM8UmVuZGVyQ291bnRlcj4oY2hpbGQpKQotICAgICAgICBT
RVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dUZXh0SXNSZW5kZXJDb3VudGVyLCBy
ZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CisKICAgICBpZiAoaXM8UmVuZGVyVGV4dD4oY2hpbGQp
KSB7Ci0gICAgICAgIGNvbnN0IGF1dG8mIHJlbmRlclRleHQgPSBkb3duY2FzdDxSZW5kZXJUZXh0
PihjaGlsZCk7Ci0gICAgICAgIGlmIChyZW5kZXJUZXh0LnRleHROb2RlKCkgJiYgIXJlbmRlclRl
eHQuZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0ZvcigqcmVuZGVyVGV4dC50ZXh0Tm9kZSgp
KS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVE
KEZsb3dJbmNsdWRlc0RvY3VtZW50TWFya2VycywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwor
ICAgICAgICBpZiAoaXM8UmVuZGVyQ291bnRlcj4oY2hpbGQpKQorICAgICAgICAgICAgU0VUX1JF
QVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93VGV4dElzUmVuZGVyQ291bnRlciwgcmVhc29u
cywgaW5jbHVkZVJlYXNvbnMpOworCiAgICAgICAgIHJldHVybiByZWFzb25zOwogICAgIH0KLSAg
ICAKKwogICAgIGlmIChmbG93LmNvbnRhaW5zRmxvYXRzKCkpIHsKICAgICAgICAgLy8gTm9uLXRl
eHQgY29udGVudCBtYXkgc3RyZXRjaCB0aGUgbGluZSBhbmQgd2UgZG9uJ3QgeWV0IGhhdmUgc3Vw
cG9ydCBmb3IgZHluYW1pYyBmbG9hdCBhdm9pZGluZyAoYXMgdGhlIGxpbmUgZ3Jvd3MpLgogICAg
ICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNVbnN1cHBvcnRlZEZs
b2F0LCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CkBAIC02ODgsMTIgKzY3OSw2IEBAIE9wdGlv
blNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckxpbmVMYXlvdXRXaXRoUmVhc29uKGNvbnN0
IFJlbmRlckJsb2NrRmxvdyYKICAgICAvLyBQcmludGluZyBkb2VzIHBhZ2luYXRpb24gd2l0aG91
dCBhIGZsb3cgdGhyZWFkLgogICAgIGlmIChmbG93LmRvY3VtZW50KCkucGFnaW5hdGVkKCkpCiAg
ICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0lzUGFnaW5hdGVkLCBy
ZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7Ci0gICAgaWYgKGZsb3cuZG9jdW1lbnQoKS5oaWdobGln
aHRSZWdpc3RlcklmRXhpc3RzKCkgJiYgIWZsb3cuZG9jdW1lbnQoKS5oaWdobGlnaHRSZWdpc3Rl
cklmRXhpc3RzKCktPm1hcCgpLmlzRW1wdHkoKSkKLSAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVU
VVJOX0lGX05FRURFRChGbG93SW5jbHVkZXNIaWdobGlnaHRzLCByZWFzb25zLCBpbmNsdWRlUmVh
c29ucyk7Ci0jaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQotICAgIGlmIChmbG93LmRvY3VtZW50
KCkuYXBwSGlnaGxpZ2h0UmVnaXN0ZXJJZkV4aXN0cygpICYmICFmbG93LmRvY3VtZW50KCkuYXBw
SGlnaGxpZ2h0UmVnaXN0ZXJJZkV4aXN0cygpLT5tYXAoKS5pc0VtcHR5KCkpCi0gICAgICAgIFNF
VF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0luY2x1ZGVzSGlnaGxpZ2h0cywgcmVh
c29ucywgaW5jbHVkZVJlYXNvbnMpOwotI2VuZGlmCiAgICAgaWYgKGZsb3cuZmlyc3RMaW5lQmxv
Y2soKSkKICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFzUHNl
dWRvRmlyc3RMaW5lLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CiAgICAgaWYgKGZsb3cuaXNB
bm9ueW1vdXNCbG9jaygpICYmIGZsb3cucGFyZW50KCktPnN0eWxlKCkudGV4dE92ZXJmbG93KCkg
PT0gVGV4dE92ZXJmbG93OjpFbGxpcHNpcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh
eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmggYi9Tb3VyY2UvV2Vi
Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oCmluZGV4
IDc0MjliMzE1Nzg0NmE5NDlmM2ExMzVhOTg4ZjkwY2FjNjIwYjZlYjguLjc2ZTJhNjlmMjMzZDg3
MDE5YjA4ODU0NGM3NmU1Y2FjNzEyNThkMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh
eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaApA
QCAtODgsOCArODgsOCBAQCBlbnVtIGNsYXNzIEF2b2lkYW5jZVJlYXNvbiA6IHVpbnQ2NF90IHsK
ICAgICBNdWx0aUNvbHVtbkZsb3dIYXNDb2x1bW5TcGFubmVyICAgICAgICAgICAgICA9IDFMTFUg
IDw8IDQ4LAogICAgIE11bHRpQ29sdW1uRmxvd1ZlcnRpY2FsQWxpZ24gICAgICAgICAgICAgICAg
ID0gMUxMVSAgPDwgNDksCiAgICAgTXVsdGlDb2x1bW5GbG93SXNGbG9hdGluZyAgICAgICAgICAg
ICAgICAgICAgPSAxTExVICA8PCA1MCwKLSAgICBGbG93SW5jbHVkZXNEb2N1bWVudE1hcmtlcnMg
ICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDUxLAotICAgIEZsb3dJbmNsdWRlc0hpZ2hsaWdo
dHMgICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgNTIsCisgICAgLy8gVW51c2VkICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCA1MSwKKyAgICAvLyBV
bnVzZWQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDUyLAog
ICAgIEZsb3dIYXNKdXN0aWZpZWROb25CcmVha2luZ1NwYWNlICAgICAgICAgICAgID0gMUxMVSAg
PDwgNTMsCiAgICAgVW5zdXBwb3J0ZWRGaWVsZHNldCAgICAgICAgICAgICAgICAgICAgICAgICAg
PSAxTExVICA8PCA1NCwKICAgICBDaGlsZEJveElzRmxvYXRpbmdPclBvc2l0aW9uZWQgICAgICAg
ICAgICAgICA9IDFMTFUgIDw8IDU1LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0
L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApp
bmRleCA5MmRmMGVjYWMzM2IxMTdkMmUzNzQ0YzE2ODEwYTdiMTRjODJkNDlmLi4xMGM1ZTE1MDFj
MjAyZDlkYmE2NGYyYWYyMGRhZjQyMzkwZmNkMjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l
TGF5b3V0LmNwcApAQCAtNDkyLDcgKzQ5Miw3IEBAIHZvaWQgTGluZUxheW91dDo6cGFpbnQoUGFp
bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKICAgICBp
ZiAoIW1faW5saW5lQ29udGVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHBhaW50SW5m
by5waGFzZSAhPSBQYWludFBoYXNlOjpGb3JlZ3JvdW5kICYmIHBhaW50SW5mby5waGFzZSAhPSBQ
YWludFBoYXNlOjpFdmVudFJlZ2lvbiAmJiBwYWludEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6
VGV4dENsaXApCisgICAgaWYgKHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpGb3JlZ3Jv
dW5kICYmIHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNlOjpFdmVudFJlZ2lvbiAmJiBwYWlu
dEluZm8ucGhhc2UgIT0gUGFpbnRQaGFzZTo6VGV4dENsaXAgJiYgcGFpbnRJbmZvLnBoYXNlICE9
IFBhaW50UGhhc2U6OlNlbGVjdGlvbikKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBwYWlu
dFJlY3QgPSBwYWludEluZm8ucmVjdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4YjBiZWU4MjVhNDYwMjUyYzVkNWYzNTk1
NDE1YjMzYmIyODEwZjMxLi45YzQzNGU0MWU0ZmMwM2Y2M2RkODE4ZmI3Mzk0NTBiMjMxYjEwZGZh
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDktMjEgIEFudHRpIEtvaXZpc3RvICA8YW50
dGlAYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBFbmFibGUgbWFya2Vy
cyBhbmQgaGlnaGxpZ2h0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjMwNTQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvZWRpdGluZy9tYWMvc3BlbGxpbmcvZGVsZXRlLWF1dG9j
b3JyZWN0ZWQtd29yZC0yLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0wOS0yMCAgS2ltbW8gS2lubnVu
ZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFOR0xFIE1ldGFsOiBzaW5nbGUt
Y29tcG9uZW50IHN3aXp6bGVzIGRvIG5vdCBjb21waWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9tYWMvc3BlbGxpbmcvZGVsZXRlLWF1dG9jb3JyZWN0ZWQt
d29yZC0yLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL21h
Yy9zcGVsbGluZy9kZWxldGUtYXV0b2NvcnJlY3RlZC13b3JkLTItZXhwZWN0ZWQudHh0CmluZGV4
IGRhODYyZTQ2ZTg2MjQ4OGNjNzFhNmJjNTQ3ODYwMDQ2YWFjZGZmZmQuLjNjYzJiZDQ1MTM2NTEx
OTdhYzU0MGRhN2EwMWY5ZmQ2ZjBhMDY0MGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm
b3JtL21hYy9lZGl0aW5nL21hYy9zcGVsbGluZy9kZWxldGUtYXV0b2NvcnJlY3RlZC13b3JkLTIt
ZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL21hYy9z
cGVsbGluZy9kZWxldGUtYXV0b2NvcnJlY3RlZC13b3JkLTItZXhwZWN0ZWQudHh0CkBAIC02OSw2
ICs2OSw1IEBAIGxheWVyIGF0ICgxMCwxMzIpIHNpemUgNTgxeDEzNiBjbGlwIGF0ICgxMSwxMzMp
IHNpemUgNTc5eDEzNAogICBSZW5kZXJUZXh0Q29udHJvbCB7VEVYVEFSRUF9IGF0ICgyLDIpIHNp
emUgNTgxeDEzNiBbYmdjb2xvcj0jRkZGRkZGXSBbYm9yZGVyOiAoMXB4IHNvbGlkICMwMDAwMDAp
XQogICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgzLDMpIHNpemUgNTc1eDEzCiAgICAgICBSZW5k
ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA2NXgxMwotICAgICAgICB0ZXh0IHJ1biBhdCAo
MCwwKSB3aWR0aCA2MjogInRoZSBtZXNhZ2UiCi0gICAgICAgIHRleHQgcnVuIGF0ICg2MSwwKSB3
aWR0aCA0OiAiICIKKyAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNjU6ICJ0aGUgbWVz
YWdlICIKIGNhcmV0OiBwb3NpdGlvbiAxMSBvZiBjaGlsZCAwIHsjdGV4dH0gb2YgY2hpbGQgMCB7
RElWfSBvZiB7I2RvY3VtZW50LWZyYWdtZW50fSBvZiBjaGlsZCA1IHtURVhUQVJFQX0gb2YgYm9k
eQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>