<?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>226778</bug_id>
          
          <creation_ts>2021-06-08 13:35:26 -0700</creation_ts>
          <short_desc>[Flexbox] FlexItem stays invisible after initial layout</short_desc>
          <delta_ts>2021-06-09 07:48:06 -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>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1767887</commentid>
    <comment_count>0</comment_count>
    <who name="alan">zalan</who>
    <bug_when>2021-06-08 13:35:26 -0700</bug_when>
    <thetext>and it needs force repaint (e.g. resize) to render.

&lt;rdar://78838040&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1767893</commentid>
    <comment_count>1</comment_count>
      <attachid>430886</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-06-08 13:48:33 -0700</bug_when>
    <thetext>Created attachment 430886
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1767943</commentid>
    <comment_count>2</comment_count>
      <attachid>430905</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-06-08 15:58:49 -0700</bug_when>
    <thetext>Created attachment 430905
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768021</commentid>
    <comment_count>3</comment_count>
      <attachid>430933</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-06-08 18:52:34 -0700</bug_when>
    <thetext>Created attachment 430933
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768152</commentid>
    <comment_count>4</comment_count>
      <attachid>430958</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-06-09 06:17:06 -0700</bug_when>
    <thetext>Created attachment 430958
[fast-cq] Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768173</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-09 07:48:03 -0700</bug_when>
    <thetext>Committed r278659 (238641@main): &lt;https://commits.webkit.org/238641@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 430958.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430886</attachid>
            <date>2021-06-08 13:48:33 -0700</date>
            <delta_ts>2021-06-08 15:58:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226778-20210608134832.patch</filename>
            <type>text/plain</type>
            <size>8452</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk4Mjk3ZTdlMzM4ZjEx
YTY2OTRjMWI0M2Y3Zjc1NDA4ZDE0ZTc3MS4uNGRkMjI4YzFlZWZkYWU1MDdlYTUyM2VjOTAwNzIw
N2JiYzFjMDgzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA2LTA4ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbRmxleGJveF0gRmxleEl0ZW0g
c3RheXMgaW52aXNpYmxlIGFmdGVyIGluaXRpYWwgbGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzgKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5k
UGxhY2VDaGlsZHJlbigpIGluaXRpYXRlcyByZXBhaW50KCkgb24gbmV3bHkgY29uc3RydWN0ZWQg
ZmxleCBpdGVtcyBieSBjaGVja2luZyB0aGVpciBldmVySGFkTGF5b3V0IGJpdC4KKyAgICAgICAg
VGhpcyBpcyBzaW1pbGFyIHRvIHdoYXQgd2UgZG8gZm9yIHJlZ3VsYXIgYmxvY2sgbGF5b3V0IHdo
ZW4gYmxvY2sgbGV2ZWwgYm94ZXMgYXBwZWFyLgorICAgICAgICBIb3dldmVyIGZsZXhpdGVtcyBh
cmUgbGFpZCBvdXQgbXVsdGlwbGUgdGltZXMsIGZpcnN0IHJpZ2h0IGFmdGVyIHRoZXkgYXJlIGNv
bnN0cnVjdGVkIGluIGNvbnN0cnVjdEZsZXhJdGVtLiBUaGlzIGluaXRpYWwgbGF5b3V0CisgICAg
ICAgIHNldHMgZXZlckhhZExheW91dCBiaXQgdG8gdHJ1ZSB3aGljaCBtYWtlcyB0aGUgY2hlY2sg
aW4gbGF5b3V0QW5kUGxhY2VDaGlsZHJlbiBzb21ld2hhdCBsYXRlLgorCisgICAgICAgIFRlc3Q6
IGZhc3QvZmxleGJveC9yZXBhaW50LWlzc3VlLXdoZW4tZmxleC1pdGVtLWFwcGVhcnMuaHRtbAor
CisgICAgICAgICogcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OkZsZXhJdGVtOjpGbGV4SXRlbSk6CisgICAgICAgICogcmVuZGVyaW5nL0ZsZXhp
YmxlQm94QWxnb3JpdGhtLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4
SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5kUGxh
Y2VDaGlsZHJlbik6CisKIDIwMjEtMDYtMDggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t
PgogCiAgICAgICAgIFtMRkNdW1RGQ10gQWRkIGluaXRpYWwgcGVyY2VudCB2YWx1ZSBzdXBwb3J0
IGZvciBjb2x1bW5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGli
bGVCb3hBbGdvcml0aG0uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94
QWxnb3JpdGhtLmNwcAppbmRleCA4NDQ2NjcyYzI4NjdmOWZjMTQzZTk1NjJkZDZkZWNmOWNmZTYz
ODM4Li4yZWNkNTk0MDBhOWI0MGQ4MTMwMjE4YTEzNDJkNzRiY2EyNTE4MjFhIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHAKQEAgLTM1
LDEzICszNSwxMyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUZsZXhJdGVtOjpGbGV4SXRl
bShSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRV
bml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRl
ckFuZFBhZGRpbmcsIExheW91dFVuaXQgbWFpbkF4aXNNYXJnaW4pCitGbGV4SXRlbTo6RmxleEl0
ZW0oUmVuZGVyQm94JiBib3gsIExheW91dFVuaXQgZmxleEJhc2VDb250ZW50U2l6ZSwgTGF5b3V0
VW5pdCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUsIExheW91dFVuaXQgbWFpbkF4aXNCb3Jk
ZXJBbmRQYWRkaW5nLCBMYXlvdXRVbml0IG1haW5BeGlzTWFyZ2luLCBib29sIGV2ZXJIYWRMYXlv
dXQpCiAgICAgOiBib3goYm94KQogICAgICwgZmxleEJhc2VDb250ZW50U2l6ZShmbGV4QmFzZUNv
bnRlbnRTaXplKQogICAgICwgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplKGh5cG90aGV0aWNh
bE1haW5Db250ZW50U2l6ZSkKICAgICAsIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZyhtYWluQXhp
c0JvcmRlckFuZFBhZGRpbmcpCiAgICAgLCBtYWluQXhpc01hcmdpbihtYWluQXhpc01hcmdpbikK
LSAgICAsIGZyb3plbihmYWxzZSkKKyAgICAsIGV2ZXJIYWRMYXlvdXQoZXZlckhhZExheW91dCkK
IHsKICAgICBBU1NFUlQoIWJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CiB9CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uaCBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5oCmluZGV4IDQwMGFm
YzkzMDVkMGNjMTRiMTk1NzAzNzBjMGMyMTM0OTA2NjViMzkuLjBiYjg2MDU4ZDkxNjJjNDRlZTY3
NmI0MGU1MWM4Zjk2MTY4NTg4ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9GbGV4aWJsZUJveEFsZ29yaXRobS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9G
bGV4aWJsZUJveEFsZ29yaXRobS5oCkBAIC00MSw3ICs0MSw3IEBAIGNsYXNzIFJlbmRlckJveDsK
IAogY2xhc3MgRmxleEl0ZW0gewogcHVibGljOgotICAgIEZsZXhJdGVtKFJlbmRlckJveCYsIExh
eW91dFVuaXQgZmxleEJhc2VDb250ZW50U2l6ZSwgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWlu
Q29udGVudFNpemUsIExheW91dFVuaXQgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nLCBMYXlvdXRV
bml0IG1haW5BeGlzTWFyZ2luKTsKKyAgICBGbGV4SXRlbShSZW5kZXJCb3gmLCBMYXlvdXRVbml0
IGZsZXhCYXNlQ29udGVudFNpemUsIExheW91dFVuaXQgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRT
aXplLCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZywgTGF5b3V0VW5pdCBtYWlu
QXhpc01hcmdpbiwgYm9vbCBldmVySGFkTGF5b3V0KTsKIAogICAgIExheW91dFVuaXQgaHlwb3Ro
ZXRpY2FsTWFpbkF4aXNNYXJnaW5Cb3hTaXplKCkgY29uc3QKICAgICB7CkBAIC02NCw3ICs2NCw4
IEBAIHB1YmxpYzoKICAgICBjb25zdCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGlu
ZzsKICAgICBjb25zdCBMYXlvdXRVbml0IG1haW5BeGlzTWFyZ2luOwogICAgIExheW91dFVuaXQg
ZmxleGVkQ29udGVudFNpemU7Ci0gICAgYm9vbCBmcm96ZW47CisgICAgYm9vbCBmcm96ZW4geyBm
YWxzZSB9OworICAgIGJvb2wgZXZlckhhZExheW91dCB7IGZhbHNlIH07CiB9OwogCiBjbGFzcyBG
bGV4TGF5b3V0QWxnb3JpdGhtIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCmluZGV4IGM5ZGZiZGNjMmVmODYwNTUzNDYxMzYyMzVmZDZhOGEwZWFh
ZGI1M2IuLjU3MDhiMzFhMWQ4NDA1YzY4NzkxMTBhY2E3YmE2ZDc5Njk5NTY3MmUgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMTMwOCw2
ICsxMzA4LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXpl
Rm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY28KIAogRmxleEl0ZW0gUmVuZGVyRmxl
eGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtKFJlbmRlckJveCYgY2hpbGQsIGJvb2wgcmVsYXlv
dXRDaGlsZHJlbikKIHsKKyAgICBhdXRvIGNoaWxkSGFkTGF5b3V0ID0gY2hpbGQuZXZlckhhZExh
eW91dCgpOwogICAgIGNoaWxkLmNsZWFyT3ZlcnJpZGluZ0NvbnRlbnRTaXplKCk7CiAgICAgaWYg
KGNoaWxkSGFzSW50cmluc2ljTWFpbkF4aXNTaXplKGNoaWxkKSkgewogICAgICAgICAvLyBJZiB0
aGlzIGNvbmRpdGlvbiBpcyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxk
IHdpbGwgY2FsbApAQCAtMTMzNSw3ICsxMzM2LDcgQEAgRmxleEl0ZW0gUmVuZGVyRmxleGlibGVC
b3g6OmNvbnN0cnVjdEZsZXhJdGVtKFJlbmRlckJveCYgY2hpbGQsIGJvb2wgcmVsYXlvdXRDaGkK
ICAgICBMYXlvdXRVbml0IGNoaWxkSW5uZXJGbGV4QmFzZVNpemUgPSBjb21wdXRlSW5uZXJGbGV4
QmFzZVNpemVGb3JDaGlsZChjaGlsZCwgYm9yZGVyQW5kUGFkZGluZyk7CiAgICAgTGF5b3V0VW5p
dCBjaGlsZE1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCA9IGFkanVzdENoaWxkU2l6ZUZvck1p
bkFuZE1heChjaGlsZCwgY2hpbGRJbm5lckZsZXhCYXNlU2l6ZSk7CiAgICAgTGF5b3V0VW5pdCBt
YXJnaW4gPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9udGFsTWFyZ2luRXh0ZW50
KCkgOiBjaGlsZC52ZXJ0aWNhbE1hcmdpbkV4dGVudCgpOwotICAgIHJldHVybiBGbGV4SXRlbShj
aGlsZCwgY2hpbGRJbm5lckZsZXhCYXNlU2l6ZSwgY2hpbGRNaW5NYXhBcHBsaWVkTWFpbkF4aXNF
eHRlbnQsIGJvcmRlckFuZFBhZGRpbmcsIG1hcmdpbik7CisgICAgcmV0dXJuIEZsZXhJdGVtKGNo
aWxkLCBjaGlsZElubmVyRmxleEJhc2VTaXplLCBjaGlsZE1pbk1heEFwcGxpZWRNYWluQXhpc0V4
dGVudCwgYm9yZGVyQW5kUGFkZGluZywgbWFyZ2luLCBjaGlsZEhhZExheW91dCk7CiB9CiAgICAg
CiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVlemVWaW9sYXRpb25zKFZlY3RvcjxGbGV4SXRl
bSo+JiB2aW9sYXRpb25zLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIGRvdWJsZSYg
dG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZsZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWln
aHRlZEZsZXhTaHJpbmspCkBAIC0xNzM3LDcgKzE3MzgsNiBAQCB2b2lkIFJlbmRlckZsZXhpYmxl
Qm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKExheW91dFVuaXQmIGNyb3NzQXhpc09mZnNldCwg
VmVjdAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsK
ICAgICAgICAgY29uc3QgYXV0byYgZmxleEl0ZW0gPSBjaGlsZHJlbltpXTsKICAgICAgICAgYXV0
byYgY2hpbGQgPSBmbGV4SXRlbS5ib3g7Ci0gICAgICAgIGJvb2wgY2hpbGRIYWRMYXlvdXQgPSBj
aGlsZC5ldmVySGFkTGF5b3V0KCk7CiAKICAgICAgICAgQVNTRVJUKCFmbGV4SXRlbS5ib3guaXNP
dXRPZkZsb3dQb3NpdGlvbmVkKCkpOwogCkBAIC0xNzY4LDcgKzE3NjgsNyBAQCB2b2lkIFJlbmRl
ckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKExheW91dFVuaXQmIGNyb3NzQXhp
c09mZnNldCwgVmVjdAogICAgICAgICBpZiAoY2hpbGQubmVlZHNMYXlvdXQoKSkKICAgICAgICAg
ICAgIG1fcmVsYWlkT3V0Q2hpbGRyZW4uYWRkKCZjaGlsZCk7CiAgICAgICAgIGNoaWxkLmxheW91
dElmTmVlZGVkKCk7Ci0gICAgICAgIGlmICghY2hpbGRIYWRMYXlvdXQgJiYgY2hpbGQuY2hlY2tG
b3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpIHsKKyAgICAgICAgaWYgKCFmbGV4SXRlbS5ldmVySGFk
TGF5b3V0ICYmIGNoaWxkLmNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKSB7CiAgICAgICAg
ICAgICBjaGlsZC5yZXBhaW50KCk7CiAgICAgICAgICAgICBjaGlsZC5yZXBhaW50T3Zlcmhhbmdp
bmdGbG9hdHModHJ1ZSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMjQ5MzBkODE0MzRjZDBkN2M4YWU5
ZDYzOTFhMDk2MjY0YjVkZDVkLi5kODU1YjI0ZDUxZmY2ZDYxMTM0MjBmNzdkOWE4NjU1YjgzODBj
NzAzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDYtMDggIEFsYW4gQnVqdGFzICA8emFs
YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtGbGV4Ym94XSBGbGV4SXRlbSBzdGF5cyBpbnZpc2li
bGUgYWZ0ZXIgaW5pdGlhbCBsYXlvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyNjc3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgICogZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0
ZW0tYXBwZWFycy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC9y
ZXBhaW50LWlzc3VlLXdoZW4tZmxleC1pdGVtLWFwcGVhcnMuaHRtbDogQWRkZWQuCisKIDIwMjEt
MDYtMDggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RG
Q10gQWRkIGluaXRpYWwgcGVyY2VudCB2YWx1ZSBzdXBwb3J0IGZvciBjb2x1bW5zCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRl
bS1hcHBlYXJzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9yZXBhaW50
LWlzc3VlLXdoZW4tZmxleC1pdGVtLWFwcGVhcnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ4
OTMyOTU1NzdiYjE1MTZlZWE1MmE1YWEzMTAxMWIyNjlhN2ZjZWIKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1h
cHBlYXJzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK1BBU1MgaWYgdGhlIGdyZWVuIGJv
eCBpcyB2aXNpYmxlIGJlbG93Lgorc29tZSBjb250ZW50IGhlcmUKKyhyZXBhaW50IHJlY3RzCisg
IChyZWN0IDggMjYgNTAwIDE4KQorKQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zs
ZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLmh0bWwgYi9MYXlvdXRU
ZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLmh0
bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uYmM4ODQyNGU2NDM4YzRiMmZhMDhlODMwNWZmYTg4M2IyMzM5Y2FhOAot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9yZXBhaW50LWlzc3Vl
LXdoZW4tZmxleC1pdGVtLWFwcGVhcnMuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8c3R5bGU+Cisu
ZmxleGNvbnRhaW5lciB7IAorICBkaXNwbGF5OiBmbGV4OworICBmbGV4LWRpcmVjdGlvbjogY29s
dW1uOyAKKyAgaGVpZ2h0OiAxMDAlOyAKK30KKworI2ZsZXhpdGVtIHsgCisgIGRpc3BsYXk6IG5v
bmU7CisgIG92ZXJmbG93OiBoaWRkZW47IAorCisgIHdpZHRoOiA1MDBweDsKKyAgYmFja2dyb3Vu
ZC1jb2xvcjogZ3JlZW47CisgIGNvbG9yOiBncmVlbjsKK30KKworPC9zdHlsZT4KK1BBU1MgaWYg
dGhlIGdyZWVuIGJveCBpcyB2aXNpYmxlIGJlbG93LgorPGRpdiBjbGFzcz1mbGV4Y29udGFpbmVy
PgorICA8ZGl2IGlkPWZsZXhpdGVtPgorICAgPGRpdj5zb21lIGNvbnRlbnQgaGVyZTwvZGl2Pgor
PC9kaXY+Cis8cHJlIGlkPXJlc3VsdD48L3ByZT4KKzxzY3JpcHQ+Citkb2N1bWVudC5ib2R5Lm9m
ZnNldEhlaWdodDsKKworaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgIHRlc3RSdW5uZXIud2Fp
dFVudGlsRG9uZSgpOworICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKK30KKworc2V0VGltZW91
dChmdW5jdGlvbigpIHsKKyAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICB3aW5kb3cuaW50
ZXJuYWxzLnN0YXJ0VHJhY2tpbmdSZXBhaW50cygpOworCisgIGZsZXhpdGVtLnN0eWxlLmRpc3Bs
YXkgPSAiYmxvY2siOworICBkb2N1bWVudC5ib2R5Lm9mZnNldEhlaWdodDsKKworICBpZiAod2lu
ZG93LmludGVybmFscykgeworICAgIGxldCByZXBhaW50UmVjdHMgPSB3aW5kb3cuaW50ZXJuYWxz
LnJlcGFpbnRSZWN0c0FzVGV4dCgpOworICAgIHdpbmRvdy5pbnRlcm5hbHMuc3RvcFRyYWNraW5n
UmVwYWludHMoKTsKKyAgICByZXN1bHQuaW5uZXJUZXh0ID0gcmVwYWludFJlY3RzOworICB9Cisg
IGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKK30s
IDApOworPC9zY3JpcHQ+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430905</attachid>
            <date>2021-06-08 15:58:49 -0700</date>
            <delta_ts>2021-06-08 18:52:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226778-20210608155849.patch</filename>
            <type>text/plain</type>
            <size>9143</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk4Mjk3ZTdlMzM4ZjEx
YTY2OTRjMWI0M2Y3Zjc1NDA4ZDE0ZTc3MS4uODJlNjg1ODE1YzI2ZTk1NThiODhmZTUxM2VhZWYx
YTUxOWE1OGRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA2LTA4ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbRmxleGJveF0gRmxleEl0ZW0g
c3RheXMgaW52aXNpYmxlIGFmdGVyIGluaXRpYWwgbGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzgKKworICAgICAgICBSZXZpZXdlZCBi
eSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBs
YWNlQ2hpbGRyZW4oKSBpbml0aWF0ZXMgcmVwYWludCgpIG9uIG5ld2x5IGNvbnN0cnVjdGVkIGZs
ZXggaXRlbXMgYnkgY2hlY2tpbmcgdGhlaXIgZXZlckhhZExheW91dCBiaXQuCisgICAgICAgIFRo
aXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGZvciByZWd1bGFyIGJsb2NrIGxheW91dCB3aGVu
IGJsb2NrIGxldmVsIGJveGVzIGFwcGVhci4KKyAgICAgICAgSG93ZXZlciBmbGV4aXRlbXMgYXJl
IGxhaWQgb3V0IG11bHRpcGxlIHRpbWVzLCBmaXJzdCByaWdodCBhZnRlciB0aGV5IGFyZSBjb25z
dHJ1Y3RlZCBpbiBjb25zdHJ1Y3RGbGV4SXRlbS4gVGhpcyBpbml0aWFsIGxheW91dAorICAgICAg
ICBzZXRzIGV2ZXJIYWRMYXlvdXQgYml0IHRvIHRydWUgd2hpY2ggbWFrZXMgdGhlIGNoZWNrIGlu
IGxheW91dEFuZFBsYWNlQ2hpbGRyZW4gc29tZXdoYXQgbGF0ZS4KKworICAgICAgICBUZXN0OiBm
YXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLmh0bWwKKwor
ICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpGbGV4SXRlbTo6RmxleEl0ZW0pOgorICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJs
ZUJveEFsZ29yaXRobS5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0
ZW0pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNl
Q2hpbGRyZW4pOgorCiAyMDIxLTA2LTA4ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K
IAogICAgICAgICBbTEZDXVtURkNdIEFkZCBpbml0aWFsIHBlcmNlbnQgdmFsdWUgc3VwcG9ydCBm
b3IgY29sdW1ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2Ev
UGFzc0tpdFNQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29jb2EvUGFzc0tpdFNQ
SS5oCmluZGV4IDFlMGEyMTExMDBmZTlhMzU3MjZlZmQwYmY2ZDdmYjZlZjBhM2IwMjQuLjIyNDc4
NWVmYWQ3YzEyMmY0NDAzYTVhOTI3MDgyNzNkM2Q5NDY3YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL1BBTC9wYWwvc3BpL2NvY29hL1Bhc3NLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9QQUwvcGFsL3NwaS9jb2NvYS9QYXNzS2l0U1BJLmgKQEAgLTQwLDcgKzQwLDcgQEAgV1RGX0VY
VEVSTl9DX0VORAogI2ltcG9ydCA8UGFzc0tpdC9QS0NvbnRhY3QuaD4KICNpbXBvcnQgPFBhc3NL
aXQvUEtFcnJvcl9Qcml2YXRlLmg+CiAjaW1wb3J0IDxQYXNzS2l0L1BLUGFzc0xpYnJhcnkuaD4K
LSNpbXBvcnQgPFBhc3NLaXQvUEtQYXltZW50Lmg+CisjaW1wb3J0IDxQYXNzS2l0Q29yZS9QS1Bh
eW1lbnQuaD4KICNpbXBvcnQgPFBhc3NLaXQvUEtQYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250
cm9sbGVyX1ByaXZhdGUuaD4KICNpbXBvcnQgPFBhc3NLaXQvUEtQYXltZW50TWV0aG9kLmg+CiAj
aW1wb3J0IDxQYXNzS2l0L1BLUGF5bWVudFBhc3MuaD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uY3BwCmluZGV4IDg0NDY2NzJjMjg2N2Y5ZmMx
NDNlOTU2MmRkNmRlY2Y5Y2ZlNjM4MzguLjJlY2Q1OTQwMGE5YjQwZDgxMzAyMThhMTM0MmQ3NGJj
YTI1MTgyMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJsZUJv
eEFsZ29yaXRobS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94
QWxnb3JpdGhtLmNwcApAQCAtMzUsMTMgKzM1LDEzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK
IAotRmxleEl0ZW06OkZsZXhJdGVtKFJlbmRlckJveCYgYm94LCBMYXlvdXRVbml0IGZsZXhCYXNl
Q29udGVudFNpemUsIExheW91dFVuaXQgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplLCBMYXlv
dXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZywgTGF5b3V0VW5pdCBtYWluQXhpc01hcmdp
bikKK0ZsZXhJdGVtOjpGbGV4SXRlbShSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCBmbGV4QmFz
ZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZSwgTGF5
b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91dFVuaXQgbWFpbkF4aXNNYXJn
aW4sIGJvb2wgZXZlckhhZExheW91dCkKICAgICA6IGJveChib3gpCiAgICAgLCBmbGV4QmFzZUNv
bnRlbnRTaXplKGZsZXhCYXNlQ29udGVudFNpemUpCiAgICAgLCBoeXBvdGhldGljYWxNYWluQ29u
dGVudFNpemUoaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplKQogICAgICwgbWFpbkF4aXNCb3Jk
ZXJBbmRQYWRkaW5nKG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZykKICAgICAsIG1haW5BeGlzTWFy
Z2luKG1haW5BeGlzTWFyZ2luKQotICAgICwgZnJvemVuKGZhbHNlKQorICAgICwgZXZlckhhZExh
eW91dChldmVySGFkTGF5b3V0KQogewogICAgIEFTU0VSVCghYm94LmlzT3V0T2ZGbG93UG9zaXRp
b25lZCgpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJs
ZUJveEFsZ29yaXRobS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxn
b3JpdGhtLmgKaW5kZXggNDAwYWZjOTMwNWQwY2MxNGIxOTU3MDM3MGMwYzIxMzQ5MDY2NWIzOS4u
MGJiODYwNThkOTE2MmM0NGVlNjc2YjQwZTUxYzhmOTYxNjg1ODhmNCAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgKQEAgLTQxLDcgKzQxLDcg
QEAgY2xhc3MgUmVuZGVyQm94OwogCiBjbGFzcyBGbGV4SXRlbSB7CiBwdWJsaWM6Ci0gICAgRmxl
eEl0ZW0oUmVuZGVyQm94JiwgTGF5b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRV
bml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRl
ckFuZFBhZGRpbmcsIExheW91dFVuaXQgbWFpbkF4aXNNYXJnaW4pOworICAgIEZsZXhJdGVtKFJl
bmRlckJveCYsIExheW91dFVuaXQgZmxleEJhc2VDb250ZW50U2l6ZSwgTGF5b3V0VW5pdCBoeXBv
dGhldGljYWxNYWluQ29udGVudFNpemUsIExheW91dFVuaXQgbWFpbkF4aXNCb3JkZXJBbmRQYWRk
aW5nLCBMYXlvdXRVbml0IG1haW5BeGlzTWFyZ2luLCBib29sIGV2ZXJIYWRMYXlvdXQpOwogCiAg
ICAgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQXhpc01hcmdpbkJveFNpemUoKSBjb25zdAog
ICAgIHsKQEAgLTY0LDcgKzY0LDggQEAgcHVibGljOgogICAgIGNvbnN0IExheW91dFVuaXQgbWFp
bkF4aXNCb3JkZXJBbmRQYWRkaW5nOwogICAgIGNvbnN0IExheW91dFVuaXQgbWFpbkF4aXNNYXJn
aW47CiAgICAgTGF5b3V0VW5pdCBmbGV4ZWRDb250ZW50U2l6ZTsKLSAgICBib29sIGZyb3plbjsK
KyAgICBib29sIGZyb3plbiB7IGZhbHNlIH07CisgICAgYm9vbCBldmVySGFkTGF5b3V0IHsgZmFs
c2UgfTsKIH07CiAKIGNsYXNzIEZsZXhMYXlvdXRBbGdvcml0aG0gewpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggYzlkZmJkY2MyZWY4NjA1
NTM0NjEzNjIzNWZkNmE4YTBlYWFkYjUzYi4uNTcwOGIzMWExZDg0MDVjNjg3OTExMGFjYTdiYTZk
Nzk2OTk1NjcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guY3BwCkBAIC0xMzA4LDYgKzEzMDgsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl
Qm94OjphZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjbwog
CiBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0oUmVuZGVyQm94
JiBjaGlsZCwgYm9vbCByZWxheW91dENoaWxkcmVuKQogeworICAgIGF1dG8gY2hpbGRIYWRMYXlv
dXQgPSBjaGlsZC5ldmVySGFkTGF5b3V0KCk7CiAgICAgY2hpbGQuY2xlYXJPdmVycmlkaW5nQ29u
dGVudFNpemUoKTsKICAgICBpZiAoY2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1NpemUoY2hpbGQp
KSB7CiAgICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlzIHRydWUsIHRoZW4gY29tcHV0ZU1h
aW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCkBAIC0xMzM1LDcgKzEzMzYsNyBAQCBGbGV4
SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0oUmVuZGVyQm94JiBjaGls
ZCwgYm9vbCByZWxheW91dENoaQogICAgIExheW91dFVuaXQgY2hpbGRJbm5lckZsZXhCYXNlU2l6
ZSA9IGNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKGNoaWxkLCBib3JkZXJBbmRQYWRk
aW5nKTsKICAgICBMYXlvdXRVbml0IGNoaWxkTWluTWF4QXBwbGllZE1haW5BeGlzRXh0ZW50ID0g
YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNoaWxkLCBjaGlsZElubmVyRmxleEJhc2VTaXpl
KTsKICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmhv
cml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGNoaWxkLnZlcnRpY2FsTWFyZ2luRXh0ZW50KCk7Ci0g
ICAgcmV0dXJuIEZsZXhJdGVtKGNoaWxkLCBjaGlsZElubmVyRmxleEJhc2VTaXplLCBjaGlsZE1p
bk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCwgYm9yZGVyQW5kUGFkZGluZywgbWFyZ2luKTsKKyAg
ICByZXR1cm4gRmxleEl0ZW0oY2hpbGQsIGNoaWxkSW5uZXJGbGV4QmFzZVNpemUsIGNoaWxkTWlu
TWF4QXBwbGllZE1haW5BeGlzRXh0ZW50LCBib3JkZXJBbmRQYWRkaW5nLCBtYXJnaW4sIGNoaWxk
SGFkTGF5b3V0KTsKIH0KICAgICAKIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmZyZWV6ZVZpb2xh
dGlvbnMoVmVjdG9yPEZsZXhJdGVtKj4mIHZpb2xhdGlvbnMsIExheW91dFVuaXQmIGF2YWlsYWJs
ZUZyZWVTcGFjZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93LCBkb3VibGUmIHRvdGFsRmxleFNocmlu
aywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaykKQEAgLTE3MzcsNyArMTczOCw2IEBA
IHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4oTGF5b3V0VW5p
dCYgY3Jvc3NBeGlzT2Zmc2V0LCBWZWN0CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjaGls
ZHJlbi5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBhdXRvJiBmbGV4SXRlbSA9IGNoaWxk
cmVuW2ldOwogICAgICAgICBhdXRvJiBjaGlsZCA9IGZsZXhJdGVtLmJveDsKLSAgICAgICAgYm9v
bCBjaGlsZEhhZExheW91dCA9IGNoaWxkLmV2ZXJIYWRMYXlvdXQoKTsKIAogICAgICAgICBBU1NF
UlQoIWZsZXhJdGVtLmJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CiAKQEAgLTE3NjgsNyAr
MTc2OCw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4o
TGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBWZWN0CiAgICAgICAgIGlmIChjaGlsZC5uZWVk
c0xheW91dCgpKQogICAgICAgICAgICAgbV9yZWxhaWRPdXRDaGlsZHJlbi5hZGQoJmNoaWxkKTsK
ICAgICAgICAgY2hpbGQubGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgaWYgKCFjaGlsZEhhZExh
eW91dCAmJiBjaGlsZC5jaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQoKSkgeworICAgICAgICBp
ZiAoIWZsZXhJdGVtLmV2ZXJIYWRMYXlvdXQgJiYgY2hpbGQuY2hlY2tGb3JSZXBhaW50RHVyaW5n
TGF5b3V0KCkpIHsKICAgICAgICAgICAgIGNoaWxkLnJlcGFpbnQoKTsKICAgICAgICAgICAgIGNo
aWxkLnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyh0cnVlKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGMy
NDkzMGQ4MTQzNGNkMGQ3YzhhZTlkNjM5MWEwOTYyNjRiNWRkNWQuLjc4NDNlNjlhN2ZmZDk4ODY0
MzE3YjVlYTViOWEwZmE3ZDFiNTBhMjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNi0w
OCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZsZXhib3hdIEZs
ZXhJdGVtIHN0YXlzIGludmlzaWJsZSBhZnRlciBpbml0aWFsIGxheW91dAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Nzc4CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICogZmFzdC9mbGV4Ym94L3JlcGFpbnQt
aXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg
ICAqIGZhc3QvZmxleGJveC9yZXBhaW50LWlzc3VlLXdoZW4tZmxleC1pdGVtLWFwcGVhcnMuaHRt
bDogQWRkZWQuCisKIDIwMjEtMDYtMDggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog
CiAgICAgICAgIFtMRkNdW1RGQ10gQWRkIGluaXRpYWwgcGVyY2VudCB2YWx1ZSBzdXBwb3J0IGZv
ciBjb2x1bW5zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1p
c3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh
c3QvZmxleGJveC9yZXBhaW50LWlzc3VlLXdoZW4tZmxleC1pdGVtLWFwcGVhcnMtZXhwZWN0ZWQu
dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAuLmE2OTdmOTE1ZmY2NTA3NmIzMTZkNjgxNTRjYmEzMGE4MDRlNTZjZTYK
LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1
ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK1BB
U1MgaWYgdGhlIGdyZWVuIGJveCBpcyB2aXNpYmxlIGJlbG93Lgorc29tZSBjb250ZW50IGhlcmUK
KyhyZXBhaW50IHJlY3RzCisgIChyZWN0IDggMjYgNTAwIDIwKQorKQorCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBl
YXJzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZs
ZXgtaXRlbS1hcHBlYXJzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWQ2NDkzZGYwMGRlOWM2ZmQ2ZmFhM2Jj
Njc3MzJjMTUwZDVhNGIwNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxl
eGJveC9yZXBhaW50LWlzc3VlLXdoZW4tZmxleC1pdGVtLWFwcGVhcnMuaHRtbApAQCAtMCwwICsx
LDUwIEBACis8c3R5bGU+CisuZmxleGNvbnRhaW5lciB7IAorICBkaXNwbGF5OiBmbGV4OworICBm
bGV4LWRpcmVjdGlvbjogY29sdW1uOyAKKyAgaGVpZ2h0OiAxMDAlOyAKK30KKworI2ZsZXhpdGVt
IHsgCisgIGRpc3BsYXk6IG5vbmU7CisgIG92ZXJmbG93OiBoaWRkZW47IAorCisgIHdpZHRoOiA1
MDBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgIGNvbG9yOiBncmVlbjsKKyAgCisg
IGZvbnQtc2l6ZTogMjBweDsKKyAgZm9udC1mYW1pbHk6IEFoZW07Cit9CisKKzwvc3R5bGU+CitQ
QVNTIGlmIHRoZSBncmVlbiBib3ggaXMgdmlzaWJsZSBiZWxvdy4KKzxkaXYgY2xhc3M9ZmxleGNv
bnRhaW5lcj4KKyAgPGRpdiBpZD1mbGV4aXRlbT4KKyAgIDxkaXY+c29tZSBjb250ZW50IGhlcmU8
L2Rpdj4KKzwvZGl2PgorPHByZSBpZD1yZXN1bHQ+PC9wcmU+Cis8c2NyaXB0PgorZG9jdW1lbnQu
Ym9keS5vZmZzZXRIZWlnaHQ7CisKK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICB0ZXN0UnVu
bmVyLndhaXRVbnRpbERvbmUoKTsKKyAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Cit9CisKK3Nl
dFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgd2lu
ZG93LmludGVybmFscy5zdGFydFRyYWNraW5nUmVwYWludHMoKTsKKworICBmbGV4aXRlbS5zdHls
ZS5kaXNwbGF5ID0gImJsb2NrIjsKKyAgZG9jdW1lbnQuYm9keS5vZmZzZXRIZWlnaHQ7CisKKyAg
aWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICBsZXQgcmVwYWludFJlY3RzID0gd2luZG93Lmlu
dGVybmFscy5yZXBhaW50UmVjdHNBc1RleHQoKTsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnN0b3BU
cmFja2luZ1JlcGFpbnRzKCk7CisgICAgcmVzdWx0LmlubmVyVGV4dCA9IHJlcGFpbnRSZWN0czsK
KyAgfQorICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25l
KCk7Cit9LCAwKTsKKzwvc2NyaXB0Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430933</attachid>
            <date>2021-06-08 18:52:34 -0700</date>
            <delta_ts>2021-06-09 06:17:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226778-20210608185233.patch</filename>
            <type>text/plain</type>
            <size>8553</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI2ZDJkMmIzOTQ1MmVl
YjBhNzI1NTMwNWY4YWM5YTU3ZjhkOWY1OS4uNWVmODM1NDNiZTMzMmI2ZTc4NTAxNzMxMjlhNjNh
Yzg2ZDhmZDhmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA2LTA4ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbRmxleGJveF0gRmxleEl0ZW0g
c3RheXMgaW52aXNpYmxlIGFmdGVyIGluaXRpYWwgbGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzgKKworICAgICAgICBSZXZpZXdlZCBi
eSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBs
YWNlQ2hpbGRyZW4oKSBpbml0aWF0ZXMgcmVwYWludCgpIG9uIG5ld2x5IGNvbnN0cnVjdGVkIGZs
ZXggaXRlbXMgYnkgY2hlY2tpbmcgdGhlaXIgZXZlckhhZExheW91dCBiaXQuCisgICAgICAgIFRo
aXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGZvciByZWd1bGFyIGJsb2NrIGxheW91dCB3aGVu
IGJsb2NrIGxldmVsIGJveGVzIGFwcGVhci4KKyAgICAgICAgSG93ZXZlciBmbGV4aXRlbXMgYXJl
IGxhaWQgb3V0IG11bHRpcGxlIHRpbWVzLCBmaXJzdCByaWdodCBhZnRlciB0aGV5IGFyZSBjb25z
dHJ1Y3RlZCBpbiBjb25zdHJ1Y3RGbGV4SXRlbS4gVGhpcyBpbml0aWFsIGxheW91dAorICAgICAg
ICBzZXRzIGV2ZXJIYWRMYXlvdXQgYml0IHRvIHRydWUgd2hpY2ggbWFrZXMgdGhlIGNoZWNrIGlu
IGxheW91dEFuZFBsYWNlQ2hpbGRyZW4gc29tZXdoYXQgbGF0ZS4KKworICAgICAgICBUZXN0OiBm
YXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLmh0bWwKKwor
ICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpGbGV4SXRlbTo6RmxleEl0ZW0pOgorICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJs
ZUJveEFsZ29yaXRobS5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0
ZW0pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNl
Q2hpbGRyZW4pOgorCiAyMDIxLTA2LTA4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv
bT4KIAogICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSB1cHN0cmVhbSBuZXcgZmVhdHVyZXMKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uY3BwCmlu
ZGV4IDg0NDY2NzJjMjg2N2Y5ZmMxNDNlOTU2MmRkNmRlY2Y5Y2ZlNjM4MzguLjJlY2Q1OTQwMGE5
YjQwZDgxMzAyMThhMTM0MmQ3NGJjYTI1MTgyMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcApAQCAtMzUsMTMgKzM1LDEzIEBACiAK
IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotRmxleEl0ZW06OkZsZXhJdGVtKFJlbmRlckJveCYgYm94
LCBMYXlvdXRVbml0IGZsZXhCYXNlQ29udGVudFNpemUsIExheW91dFVuaXQgaHlwb3RoZXRpY2Fs
TWFpbkNvbnRlbnRTaXplLCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZywgTGF5
b3V0VW5pdCBtYWluQXhpc01hcmdpbikKK0ZsZXhJdGVtOjpGbGV4SXRlbShSZW5kZXJCb3gmIGJv
eCwgTGF5b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNh
bE1haW5Db250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExh
eW91dFVuaXQgbWFpbkF4aXNNYXJnaW4sIGJvb2wgZXZlckhhZExheW91dCkKICAgICA6IGJveChi
b3gpCiAgICAgLCBmbGV4QmFzZUNvbnRlbnRTaXplKGZsZXhCYXNlQ29udGVudFNpemUpCiAgICAg
LCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUoaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXpl
KQogICAgICwgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nKG1haW5BeGlzQm9yZGVyQW5kUGFkZGlu
ZykKICAgICAsIG1haW5BeGlzTWFyZ2luKG1haW5BeGlzTWFyZ2luKQotICAgICwgZnJvemVuKGZh
bHNlKQorICAgICwgZXZlckhhZExheW91dChldmVySGFkTGF5b3V0KQogewogICAgIEFTU0VSVCgh
Ym94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5oIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgKaW5kZXggNDAwYWZjOTMwNWQwY2MxNGIxOTU3
MDM3MGMwYzIxMzQ5MDY2NWIzOS4uMGJiODYwNThkOTE2MmM0NGVlNjc2YjQwZTUxYzhmOTYxNjg1
ODhmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxn
b3JpdGhtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3Jp
dGhtLmgKQEAgLTQxLDcgKzQxLDcgQEAgY2xhc3MgUmVuZGVyQm94OwogCiBjbGFzcyBGbGV4SXRl
bSB7CiBwdWJsaWM6Ci0gICAgRmxleEl0ZW0oUmVuZGVyQm94JiwgTGF5b3V0VW5pdCBmbGV4QmFz
ZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZSwgTGF5
b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91dFVuaXQgbWFpbkF4aXNNYXJn
aW4pOworICAgIEZsZXhJdGVtKFJlbmRlckJveCYsIExheW91dFVuaXQgZmxleEJhc2VDb250ZW50
U2l6ZSwgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUsIExheW91dFVuaXQg
bWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nLCBMYXlvdXRVbml0IG1haW5BeGlzTWFyZ2luLCBib29s
IGV2ZXJIYWRMYXlvdXQpOwogCiAgICAgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQXhpc01h
cmdpbkJveFNpemUoKSBjb25zdAogICAgIHsKQEAgLTY0LDcgKzY0LDggQEAgcHVibGljOgogICAg
IGNvbnN0IExheW91dFVuaXQgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nOwogICAgIGNvbnN0IExh
eW91dFVuaXQgbWFpbkF4aXNNYXJnaW47CiAgICAgTGF5b3V0VW5pdCBmbGV4ZWRDb250ZW50U2l6
ZTsKLSAgICBib29sIGZyb3plbjsKKyAgICBib29sIGZyb3plbiB7IGZhbHNlIH07CisgICAgYm9v
bCBldmVySGFkTGF5b3V0IHsgZmFsc2UgfTsKIH07CiAKIGNsYXNzIEZsZXhMYXlvdXRBbGdvcml0
aG0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
aW5kZXggYzlkZmJkY2MyZWY4NjA1NTM0NjEzNjIzNWZkNmE4YTBlYWFkYjUzYi4uNTcwOGIzMWEx
ZDg0MDVjNjg3OTExMGFjYTdiYTZkNzk2OTk1NjcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0xMzA4LDYgKzEzMDgsNyBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Ny
b3NzQXhpc01pbkFuZE1heChjbwogCiBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3Ry
dWN0RmxleEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9vbCByZWxheW91dENoaWxkcmVuKQogewor
ICAgIGF1dG8gY2hpbGRIYWRMYXlvdXQgPSBjaGlsZC5ldmVySGFkTGF5b3V0KCk7CiAgICAgY2hp
bGQuY2xlYXJPdmVycmlkaW5nQ29udGVudFNpemUoKTsKICAgICBpZiAoY2hpbGRIYXNJbnRyaW5z
aWNNYWluQXhpc1NpemUoY2hpbGQpKSB7CiAgICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlz
IHRydWUsIHRoZW4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCkBAIC0x
MzM1LDcgKzEzMzYsNyBAQCBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0Rmxl
eEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9vbCByZWxheW91dENoaQogICAgIExheW91dFVuaXQg
Y2hpbGRJbm5lckZsZXhCYXNlU2l6ZSA9IGNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxk
KGNoaWxkLCBib3JkZXJBbmRQYWRkaW5nKTsKICAgICBMYXlvdXRVbml0IGNoaWxkTWluTWF4QXBw
bGllZE1haW5BeGlzRXh0ZW50ID0gYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNoaWxkLCBj
aGlsZElubmVyRmxleEJhc2VTaXplKTsKICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IGlzSG9yaXpv
bnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGNoaWxkLnZlcnRp
Y2FsTWFyZ2luRXh0ZW50KCk7Ci0gICAgcmV0dXJuIEZsZXhJdGVtKGNoaWxkLCBjaGlsZElubmVy
RmxleEJhc2VTaXplLCBjaGlsZE1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCwgYm9yZGVyQW5k
UGFkZGluZywgbWFyZ2luKTsKKyAgICByZXR1cm4gRmxleEl0ZW0oY2hpbGQsIGNoaWxkSW5uZXJG
bGV4QmFzZVNpemUsIGNoaWxkTWluTWF4QXBwbGllZE1haW5BeGlzRXh0ZW50LCBib3JkZXJBbmRQ
YWRkaW5nLCBtYXJnaW4sIGNoaWxkSGFkTGF5b3V0KTsKIH0KICAgICAKIHZvaWQgUmVuZGVyRmxl
eGlibGVCb3g6OmZyZWV6ZVZpb2xhdGlvbnMoVmVjdG9yPEZsZXhJdGVtKj4mIHZpb2xhdGlvbnMs
IExheW91dFVuaXQmIGF2YWlsYWJsZUZyZWVTcGFjZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93LCBk
b3VibGUmIHRvdGFsRmxleFNocmluaywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaykK
QEAgLTE3MzcsNyArMTczOCw2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBs
YWNlQ2hpbGRyZW4oTGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBWZWN0CiAgICAgZm9yIChz
aXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbi5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBh
dXRvJiBmbGV4SXRlbSA9IGNoaWxkcmVuW2ldOwogICAgICAgICBhdXRvJiBjaGlsZCA9IGZsZXhJ
dGVtLmJveDsKLSAgICAgICAgYm9vbCBjaGlsZEhhZExheW91dCA9IGNoaWxkLmV2ZXJIYWRMYXlv
dXQoKTsKIAogICAgICAgICBBU1NFUlQoIWZsZXhJdGVtLmJveC5pc091dE9mRmxvd1Bvc2l0aW9u
ZWQoKSk7CiAKQEAgLTE3NjgsNyArMTc2OCw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6Omxh
eW91dEFuZFBsYWNlQ2hpbGRyZW4oTGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBWZWN0CiAg
ICAgICAgIGlmIChjaGlsZC5uZWVkc0xheW91dCgpKQogICAgICAgICAgICAgbV9yZWxhaWRPdXRD
aGlsZHJlbi5hZGQoJmNoaWxkKTsKICAgICAgICAgY2hpbGQubGF5b3V0SWZOZWVkZWQoKTsKLSAg
ICAgICAgaWYgKCFjaGlsZEhhZExheW91dCAmJiBjaGlsZC5jaGVja0ZvclJlcGFpbnREdXJpbmdM
YXlvdXQoKSkgeworICAgICAgICBpZiAoIWZsZXhJdGVtLmV2ZXJIYWRMYXlvdXQgJiYgY2hpbGQu
Y2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpIHsKICAgICAgICAgICAgIGNoaWxkLnJlcGFp
bnQoKTsKICAgICAgICAgICAgIGNoaWxkLnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyh0cnVlKTsK
ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCmluZGV4IDA4NGYyMWQ3ZTM3ZWVmNTBhYjMyODIwMTY3ZDkyYWU2ZWIwYmQw
YzguLmZkYzhkNDBhNzlmNjczNDIyMzY0YmNmZGYzOGM1YWFkZjYzOGY2Y2QgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxMyBAQAorMjAyMS0wNi0wOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisK
KyAgICAgICAgW0ZsZXhib3hdIEZsZXhJdGVtIHN0YXlzIGludmlzaWJsZSBhZnRlciBpbml0aWFs
IGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjI2Nzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICog
ZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1leHBlY3Rl
ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC9yZXBhaW50LWlzc3VlLXdoZW4t
ZmxleC1pdGVtLWFwcGVhcnMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDYtMDggIERpZWdvIFBpbm8g
R2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBSZW1vdmUgb2Jzb2xldGUgR1RLIGJhc2VsaW5lIGZvciBXUFQgdGVzdCAn
Y3JlYXRlSW1hZ2VCaXRtYXAtc2VyaWFsaXphYmxlLmh0bWwnLgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1l
eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVu
LWZsZXgtaXRlbS1hcHBlYXJzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl
eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NzljZjgxNWUxNzJk
MTdjZGNjOGNjOGU2ODAwYTEyOTEyMjE4YTUzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz
dHMvZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1leHBl
Y3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitQQVNTIGlmIHRoZSBncmVlbiBib3ggaXMgdmlzaWJs
ZSBiZWxvdy4KK3NvbWUgY29udGVudCBoZXJlCisocmVwYWludCByZWN0cworICAocmVjdCA4IDQ4
IDUwMCAyMCkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3JlcGFp
bnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9m
bGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy5odG1sCm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLjRlOTY5OTg4NmNjZDYxZjhiYjdmYzZlOWZlYTIzMGE0ZmM2ZmY2NzAKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgt
aXRlbS1hcHBlYXJzLmh0bWwKQEAgLTAsMCArMSw1MiBAQAorPHN0eWxlPgorYm9keSB7CisgIGZv
bnQtZmFtaWx5OiBBaGVtOworICBmb250LXNpemU6IDIwcHg7Cit9CisKKy5mbGV4Y29udGFpbmVy
IHsgCisgIGRpc3BsYXk6IGZsZXg7CisgIGZsZXgtZGlyZWN0aW9uOiBjb2x1bW47IAorICBoZWln
aHQ6IDEwMCU7IAorfQorCisjZmxleGl0ZW0geyAKKyAgZGlzcGxheTogbm9uZTsKKyAgb3ZlcmZs
b3c6IGhpZGRlbjsgCisKKyAgd2lkdGg6IDUwMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVl
bjsKKyAgY29sb3I6IGdyZWVuOworfQorCis8L3N0eWxlPgorUEFTUyBpZiB0aGUgZ3JlZW4gYm94
IGlzIHZpc2libGUgYmVsb3cuCis8ZGl2IGNsYXNzPWZsZXhjb250YWluZXI+CisgIDxkaXYgaWQ9
ZmxleGl0ZW0+CisgICA8ZGl2PnNvbWUgY29udGVudCBoZXJlPC9kaXY+Cis8L2Rpdj4KKzxwcmUg
aWQ9cmVzdWx0PjwvcHJlPgorPHNjcmlwdD4KK2RvY3VtZW50LmJvZHkub2Zmc2V0SGVpZ2h0Owor
CitpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7
CisgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworfQorCitzZXRUaW1lb3V0KGZ1bmN0aW9uKCkg
eworICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc3RhcnRU
cmFja2luZ1JlcGFpbnRzKCk7CisKKyAgZmxleGl0ZW0uc3R5bGUuZGlzcGxheSA9ICJibG9jayI7
CisgIGRvY3VtZW50LmJvZHkub2Zmc2V0SGVpZ2h0OworCisgIGlmICh3aW5kb3cuaW50ZXJuYWxz
KSB7CisgICAgbGV0IHJlcGFpbnRSZWN0cyA9IHdpbmRvdy5pbnRlcm5hbHMucmVwYWludFJlY3Rz
QXNUZXh0KCk7CisgICAgd2luZG93LmludGVybmFscy5zdG9wVHJhY2tpbmdSZXBhaW50cygpOwor
ICAgIHJlc3VsdC5pbm5lclRleHQgPSByZXBhaW50UmVjdHM7CisgIH0KKyAgaWYgKHdpbmRvdy50
ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworfSwgMCk7Cis8L3Njcmlw
dD4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>430958</attachid>
            <date>2021-06-09 06:17:06 -0700</date>
            <delta_ts>2021-06-09 07:48:05 -0700</delta_ts>
            <desc>[fast-cq] Patch</desc>
            <filename>bug-226778-20210609061705.patch</filename>
            <type>text/plain</type>
            <size>8571</size>
            <attacher name="alan">zalan</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTI2ZDJkMmIzOTQ1MmVl
YjBhNzI1NTMwNWY4YWM5YTU3ZjhkOWY1OS4uNWVmODM1NDNiZTMzMmI2ZTc4NTAxNzMxMjlhNjNh
Yzg2ZDhmZDhmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA2LTA4ICBBbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbRmxleGJveF0gRmxleEl0ZW0g
c3RheXMgaW52aXNpYmxlIGFmdGVyIGluaXRpYWwgbGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY3NzgKKworICAgICAgICBSZXZpZXdlZCBi
eSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBs
YWNlQ2hpbGRyZW4oKSBpbml0aWF0ZXMgcmVwYWludCgpIG9uIG5ld2x5IGNvbnN0cnVjdGVkIGZs
ZXggaXRlbXMgYnkgY2hlY2tpbmcgdGhlaXIgZXZlckhhZExheW91dCBiaXQuCisgICAgICAgIFRo
aXMgaXMgc2ltaWxhciB0byB3aGF0IHdlIGRvIGZvciByZWd1bGFyIGJsb2NrIGxheW91dCB3aGVu
IGJsb2NrIGxldmVsIGJveGVzIGFwcGVhci4KKyAgICAgICAgSG93ZXZlciBmbGV4aXRlbXMgYXJl
IGxhaWQgb3V0IG11bHRpcGxlIHRpbWVzLCBmaXJzdCByaWdodCBhZnRlciB0aGV5IGFyZSBjb25z
dHJ1Y3RlZCBpbiBjb25zdHJ1Y3RGbGV4SXRlbS4gVGhpcyBpbml0aWFsIGxheW91dAorICAgICAg
ICBzZXRzIGV2ZXJIYWRMYXlvdXQgYml0IHRvIHRydWUgd2hpY2ggbWFrZXMgdGhlIGNoZWNrIGlu
IGxheW91dEFuZFBsYWNlQ2hpbGRyZW4gc29tZXdoYXQgbGF0ZS4KKworICAgICAgICBUZXN0OiBm
YXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgtaXRlbS1hcHBlYXJzLmh0bWwKKwor
ICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpGbGV4SXRlbTo6RmxleEl0ZW0pOgorICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJs
ZUJveEFsZ29yaXRobS5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0
ZW0pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNl
Q2hpbGRyZW4pOgorCiAyMDIxLTA2LTA4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv
bT4KIAogICAgICAgICBbUGF5bWVudCBSZXF1ZXN0XSB1cHN0cmVhbSBuZXcgZmVhdHVyZXMKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5j
cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uY3BwCmlu
ZGV4IDg0NDY2NzJjMjg2N2Y5ZmMxNDNlOTU2MmRkNmRlY2Y5Y2ZlNjM4MzguLjJlY2Q1OTQwMGE5
YjQwZDgxMzAyMThhMTM0MmQ3NGJjYTI1MTgyMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcApAQCAtMzUsMTMgKzM1LDEzIEBACiAK
IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotRmxleEl0ZW06OkZsZXhJdGVtKFJlbmRlckJveCYgYm94
LCBMYXlvdXRVbml0IGZsZXhCYXNlQ29udGVudFNpemUsIExheW91dFVuaXQgaHlwb3RoZXRpY2Fs
TWFpbkNvbnRlbnRTaXplLCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZywgTGF5
b3V0VW5pdCBtYWluQXhpc01hcmdpbikKK0ZsZXhJdGVtOjpGbGV4SXRlbShSZW5kZXJCb3gmIGJv
eCwgTGF5b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNh
bE1haW5Db250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExh
eW91dFVuaXQgbWFpbkF4aXNNYXJnaW4sIGJvb2wgZXZlckhhZExheW91dCkKICAgICA6IGJveChi
b3gpCiAgICAgLCBmbGV4QmFzZUNvbnRlbnRTaXplKGZsZXhCYXNlQ29udGVudFNpemUpCiAgICAg
LCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUoaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXpl
KQogICAgICwgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nKG1haW5BeGlzQm9yZGVyQW5kUGFkZGlu
ZykKICAgICAsIG1haW5BeGlzTWFyZ2luKG1haW5BeGlzTWFyZ2luKQotICAgICwgZnJvemVuKGZh
bHNlKQorICAgICwgZXZlckhhZExheW91dChldmVySGFkTGF5b3V0KQogewogICAgIEFTU0VSVCgh
Ym94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5oIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgKaW5kZXggNDAwYWZjOTMwNWQwY2MxNGIxOTU3
MDM3MGMwYzIxMzQ5MDY2NWIzOS4uMGJiODYwNThkOTE2MmM0NGVlNjc2YjQwZTUxYzhmOTYxNjg1
ODhmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxn
b3JpdGhtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3Jp
dGhtLmgKQEAgLTQxLDcgKzQxLDcgQEAgY2xhc3MgUmVuZGVyQm94OwogCiBjbGFzcyBGbGV4SXRl
bSB7CiBwdWJsaWM6Ci0gICAgRmxleEl0ZW0oUmVuZGVyQm94JiwgTGF5b3V0VW5pdCBmbGV4QmFz
ZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZSwgTGF5
b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91dFVuaXQgbWFpbkF4aXNNYXJn
aW4pOworICAgIEZsZXhJdGVtKFJlbmRlckJveCYsIExheW91dFVuaXQgZmxleEJhc2VDb250ZW50
U2l6ZSwgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUsIExheW91dFVuaXQg
bWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nLCBMYXlvdXRVbml0IG1haW5BeGlzTWFyZ2luLCBib29s
IGV2ZXJIYWRMYXlvdXQpOwogCiAgICAgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQXhpc01h
cmdpbkJveFNpemUoKSBjb25zdAogICAgIHsKQEAgLTY0LDcgKzY0LDggQEAgcHVibGljOgogICAg
IGNvbnN0IExheW91dFVuaXQgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nOwogICAgIGNvbnN0IExh
eW91dFVuaXQgbWFpbkF4aXNNYXJnaW47CiAgICAgTGF5b3V0VW5pdCBmbGV4ZWRDb250ZW50U2l6
ZTsKLSAgICBib29sIGZyb3plbjsKKyAgICBib29sIGZyb3plbiB7IGZhbHNlIH07CisgICAgYm9v
bCBldmVySGFkTGF5b3V0IHsgZmFsc2UgfTsKIH07CiAKIGNsYXNzIEZsZXhMYXlvdXRBbGdvcml0
aG0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
aW5kZXggYzlkZmJkY2MyZWY4NjA1NTM0NjEzNjIzNWZkNmE4YTBlYWFkYjUzYi4uNTcwOGIzMWEx
ZDg0MDVjNjg3OTExMGFjYTdiYTZkNzk2OTk1NjcyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0xMzA4LDYgKzEzMDgsNyBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Ny
b3NzQXhpc01pbkFuZE1heChjbwogCiBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3Ry
dWN0RmxleEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9vbCByZWxheW91dENoaWxkcmVuKQogewor
ICAgIGF1dG8gY2hpbGRIYWRMYXlvdXQgPSBjaGlsZC5ldmVySGFkTGF5b3V0KCk7CiAgICAgY2hp
bGQuY2xlYXJPdmVycmlkaW5nQ29udGVudFNpemUoKTsKICAgICBpZiAoY2hpbGRIYXNJbnRyaW5z
aWNNYWluQXhpc1NpemUoY2hpbGQpKSB7CiAgICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlz
IHRydWUsIHRoZW4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCkBAIC0x
MzM1LDcgKzEzMzYsNyBAQCBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0Rmxl
eEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9vbCByZWxheW91dENoaQogICAgIExheW91dFVuaXQg
Y2hpbGRJbm5lckZsZXhCYXNlU2l6ZSA9IGNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxk
KGNoaWxkLCBib3JkZXJBbmRQYWRkaW5nKTsKICAgICBMYXlvdXRVbml0IGNoaWxkTWluTWF4QXBw
bGllZE1haW5BeGlzRXh0ZW50ID0gYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNoaWxkLCBj
aGlsZElubmVyRmxleEJhc2VTaXplKTsKICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IGlzSG9yaXpv
bnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSA6IGNoaWxkLnZlcnRp
Y2FsTWFyZ2luRXh0ZW50KCk7Ci0gICAgcmV0dXJuIEZsZXhJdGVtKGNoaWxkLCBjaGlsZElubmVy
RmxleEJhc2VTaXplLCBjaGlsZE1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCwgYm9yZGVyQW5k
UGFkZGluZywgbWFyZ2luKTsKKyAgICByZXR1cm4gRmxleEl0ZW0oY2hpbGQsIGNoaWxkSW5uZXJG
bGV4QmFzZVNpemUsIGNoaWxkTWluTWF4QXBwbGllZE1haW5BeGlzRXh0ZW50LCBib3JkZXJBbmRQ
YWRkaW5nLCBtYXJnaW4sIGNoaWxkSGFkTGF5b3V0KTsKIH0KICAgICAKIHZvaWQgUmVuZGVyRmxl
eGlibGVCb3g6OmZyZWV6ZVZpb2xhdGlvbnMoVmVjdG9yPEZsZXhJdGVtKj4mIHZpb2xhdGlvbnMs
IExheW91dFVuaXQmIGF2YWlsYWJsZUZyZWVTcGFjZSwgZG91YmxlJiB0b3RhbEZsZXhHcm93LCBk
b3VibGUmIHRvdGFsRmxleFNocmluaywgZG91YmxlJiB0b3RhbFdlaWdodGVkRmxleFNocmluaykK
QEAgLTE3MzcsNyArMTczOCw2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBs
YWNlQ2hpbGRyZW4oTGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBWZWN0CiAgICAgZm9yIChz
aXplX3QgaSA9IDA7IGkgPCBjaGlsZHJlbi5zaXplKCk7ICsraSkgewogICAgICAgICBjb25zdCBh
dXRvJiBmbGV4SXRlbSA9IGNoaWxkcmVuW2ldOwogICAgICAgICBhdXRvJiBjaGlsZCA9IGZsZXhJ
dGVtLmJveDsKLSAgICAgICAgYm9vbCBjaGlsZEhhZExheW91dCA9IGNoaWxkLmV2ZXJIYWRMYXlv
dXQoKTsKIAogICAgICAgICBBU1NFUlQoIWZsZXhJdGVtLmJveC5pc091dE9mRmxvd1Bvc2l0aW9u
ZWQoKSk7CiAKQEAgLTE3NjgsNyArMTc2OCw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6Omxh
eW91dEFuZFBsYWNlQ2hpbGRyZW4oTGF5b3V0VW5pdCYgY3Jvc3NBeGlzT2Zmc2V0LCBWZWN0CiAg
ICAgICAgIGlmIChjaGlsZC5uZWVkc0xheW91dCgpKQogICAgICAgICAgICAgbV9yZWxhaWRPdXRD
aGlsZHJlbi5hZGQoJmNoaWxkKTsKICAgICAgICAgY2hpbGQubGF5b3V0SWZOZWVkZWQoKTsKLSAg
ICAgICAgaWYgKCFjaGlsZEhhZExheW91dCAmJiBjaGlsZC5jaGVja0ZvclJlcGFpbnREdXJpbmdM
YXlvdXQoKSkgeworICAgICAgICBpZiAoIWZsZXhJdGVtLmV2ZXJIYWRMYXlvdXQgJiYgY2hpbGQu
Y2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpIHsKICAgICAgICAgICAgIGNoaWxkLnJlcGFp
bnQoKTsKICAgICAgICAgICAgIGNoaWxkLnJlcGFpbnRPdmVyaGFuZ2luZ0Zsb2F0cyh0cnVlKTsK
ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCmluZGV4IDA4NGYyMWQ3ZTM3ZWVmNTBhYjMyODIwMTY3ZDkyYWU2ZWIwYmQw
YzguLmZkYzhkNDBhNzlmNjczNDIyMzY0YmNmZGYzOGM1YWFkZjYzOGY2Y2QgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxMyBAQAorMjAyMS0wNi0wOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisK
KyAgICAgICAgW0ZsZXhib3hdIEZsZXhJdGVtIHN0YXlzIGludmlzaWJsZSBhZnRlciBpbml0aWFs
IGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjI2Nzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgICog
ZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1leHBlY3Rl
ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC9yZXBhaW50LWlzc3VlLXdoZW4t
ZmxleC1pdGVtLWFwcGVhcnMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDYtMDggIERpZWdvIFBpbm8g
R2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBVbnJldmlld2VkIHRl
c3QgZ2FyZGVuaW5nLiBSZW1vdmUgb2Jzb2xldGUgR1RLIGJhc2VsaW5lIGZvciBXUFQgdGVzdCAn
Y3JlYXRlSW1hZ2VCaXRtYXAtc2VyaWFsaXphYmxlLmh0bWwnLgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1l
eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVu
LWZsZXgtaXRlbS1hcHBlYXJzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl
eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yOTViZmYyYmUxMjlj
OGYxMTIzMzhkMDFmYjlmZTQzM2QwODU2ZDdlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz
dHMvZmFzdC9mbGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy1leHBl
Y3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitQQVNTIGlmIHRoZSBncmVlbiBib3ggaXMgdmlzaWJs
ZSBiZWxvdy4KK3NvbWUgY29udGVudCBoZXJlCisocmVwYWludCByZWN0cworICAocmVjdCA4IDI4
IDUwMCAyMCkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L3JlcGFp
bnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9m
bGV4Ym94L3JlcGFpbnQtaXNzdWUtd2hlbi1mbGV4LWl0ZW0tYXBwZWFycy5odG1sCm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLjk2NGIwMTNkMzI1NjdjNDFhMDBjYzM3ZjdiNjMwZGJhNjQ3YTQzNzAKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvcmVwYWludC1pc3N1ZS13aGVuLWZsZXgt
aXRlbS1hcHBlYXJzLmh0bWwKQEAgLTAsMCArMSw1MyBAQAorPHN0eWxlPgorYm9keSB7CisgIHdp
ZHRoOiAxMDAwcHg7CisgIGZvbnQtZmFtaWx5OiBBaGVtOworICBmb250LXNpemU6IDIwcHg7Cit9
CisKKy5mbGV4Y29udGFpbmVyIHsgCisgIGRpc3BsYXk6IGZsZXg7CisgIGZsZXgtZGlyZWN0aW9u
OiBjb2x1bW47IAorICBoZWlnaHQ6IDEwMCU7IAorfQorCisjZmxleGl0ZW0geyAKKyAgZGlzcGxh
eTogbm9uZTsKKyAgb3ZlcmZsb3c6IGhpZGRlbjsgCisKKyAgd2lkdGg6IDUwMHB4OworICBiYWNr
Z3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgY29sb3I6IGdyZWVuOworfQorCis8L3N0eWxlPgorUEFT
UyBpZiB0aGUgZ3JlZW4gYm94IGlzIHZpc2libGUgYmVsb3cuCis8ZGl2IGNsYXNzPWZsZXhjb250
YWluZXI+CisgIDxkaXYgaWQ9ZmxleGl0ZW0+CisgICA8ZGl2PnNvbWUgY29udGVudCBoZXJlPC9k
aXY+Cis8L2Rpdj4KKzxwcmUgaWQ9cmVzdWx0PjwvcHJlPgorPHNjcmlwdD4KK2RvY3VtZW50LmJv
ZHkub2Zmc2V0SGVpZ2h0OworCitpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgdGVzdFJ1bm5l
ci53YWl0VW50aWxEb25lKCk7CisgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworfQorCitzZXRU
aW1lb3V0KGZ1bmN0aW9uKCkgeworICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgIHdpbmRv
dy5pbnRlcm5hbHMuc3RhcnRUcmFja2luZ1JlcGFpbnRzKCk7CisKKyAgZmxleGl0ZW0uc3R5bGUu
ZGlzcGxheSA9ICJibG9jayI7CisgIGRvY3VtZW50LmJvZHkub2Zmc2V0SGVpZ2h0OworCisgIGlm
ICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgbGV0IHJlcGFpbnRSZWN0cyA9IHdpbmRvdy5pbnRl
cm5hbHMucmVwYWludFJlY3RzQXNUZXh0KCk7CisgICAgd2luZG93LmludGVybmFscy5zdG9wVHJh
Y2tpbmdSZXBhaW50cygpOworICAgIHJlc3VsdC5pbm5lclRleHQgPSByZXBhaW50UmVjdHM7Cisg
IH0KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgp
OworfSwgMCk7Cis8L3NjcmlwdD4K
</data>

          </attachment>
      

    </bug>

</bugzilla>