<?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>220977</bug_id>
          
          <creation_ts>2021-01-26 06:04:24 -0800</creation_ts>
          <short_desc>Support aspect-ratio on grid items</short_desc>
          <delta_ts>2021-02-03 05:06:00 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CSS</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>
          
          <blocked>47738</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jfernandez</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>rego</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1722483</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-26 06:04:24 -0800</bug_when>
    <thetext>Support aspect-ratio on grid items.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1722484</commentid>
    <comment_count>1</comment_count>
      <attachid>418408</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-26 06:08:01 -0800</bug_when>
    <thetext>Created attachment 418408
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1722837</commentid>
    <comment_count>2</comment_count>
      <attachid>418510</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-26 22:07:16 -0800</bug_when>
    <thetext>Created attachment 418510
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1722980</commentid>
    <comment_count>3</comment_count>
      <attachid>418547</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-27 07:35:59 -0800</bug_when>
    <thetext>Created attachment 418547
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723658</commentid>
    <comment_count>4</comment_count>
      <attachid>418712</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-29 01:39:32 -0800</bug_when>
    <thetext>Created attachment 418712
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723680</commentid>
    <comment_count>5</comment_count>
      <attachid>418715</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-29 03:18:31 -0800</bug_when>
    <thetext>Created attachment 418715
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723684</commentid>
    <comment_count>6</comment_count>
      <attachid>418717</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-29 04:33:51 -0800</bug_when>
    <thetext>Created attachment 418717
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723710</commentid>
    <comment_count>7</comment_count>
      <attachid>418717</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-29 08:21:05 -0800</bug_when>
    <thetext>Comment on attachment 418717
Patch

Clearing review flag for now since fixing https://bugs.webkit.org/show_bug.cgi?id=204578 first would make this patch smaller and easier to review.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1724566</commentid>
    <comment_count>8</comment_count>
      <attachid>418972</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-02 01:21:36 -0800</bug_when>
    <thetext>Created attachment 418972
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1724632</commentid>
    <comment_count>9</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-02-02 06:05:16 -0800</bug_when>
    <thetext>&lt;rdar://problem/73877205&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1725063</commentid>
    <comment_count>10</comment_count>
      <attachid>419114</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-03 01:44:57 -0800</bug_when>
    <thetext>Created attachment 419114
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1725074</commentid>
    <comment_count>11</comment_count>
      <attachid>419114</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-02-03 03:22:39 -0800</bug_when>
    <thetext>Comment on attachment 419114
Patch

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

r=me

&gt; Source/WebCore/rendering/RenderGrid.cpp:1866
&gt; +            // A non-auto inline size means the same for block size

Nit: no need to wrap comments here

&gt; Source/WebCore/rendering/RenderGrid.cpp:1883
&gt; +            // A non-auto block size means the same for inline size

Ditto</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1725080</commentid>
    <comment_count>12</comment_count>
      <attachid>419121</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-03 04:14:07 -0800</bug_when>
    <thetext>Created attachment 419121
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1725084</commentid>
    <comment_count>13</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-02-03 05:05:58 -0800</bug_when>
    <thetext>Committed r272307: &lt;https://trac.webkit.org/changeset/272307&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 419121.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418408</attachid>
            <date>2021-01-26 06:08:01 -0800</date>
            <delta_ts>2021-01-26 22:07:08 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210126150800.patch</filename>
            <type>text/plain</type>
            <size>4352</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFhMTVhMDkxODU0NGVj
ZjNhYjNjNTllYzI4ZTg2ZjBkOTlhNWNkMC4uMDc5Y2UxODAyMmIwNzg2OWI1NTFjMjM4MWQ1ODk3
ZTM5YzVlMTNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAxLTI2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMgY29uc3QpOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMgY29uc3Qp
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMjEtMDEtMjUgIFJ5b3N1
a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0
aW5nIHIyNzE1MTQgYW5kIHIyNzE1NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk
LmNwcAppbmRleCBhOWM4YTg4ZGU1Nzc4ZTQxMGRjNDEzNDFhNDQ5MzkyMGVjYzA0Y2RlLi5iNDNl
OGVhMTBiMDVhYjg2MmNhMWY3YzVjNjA0NzViMDY0Nzk2MjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC0xODU5LDQgKzE4NTksMzggQEAgY29uc3QgY2hhciog
UmVuZGVyR3JpZDo6cmVuZGVyTmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuICJSZW5kZXJHcmlkIjsK
IH0KIAorYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5k
ZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJh
dGlvKCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQu
aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgeworICAgICAgICAgICAgLy8gSWYgdGhlIHVzZWQg
aW5saW5lIHNpemUgaXMgbm9uLWF1dG8sIHdlIGRvIGhhdmUgYSBub24gYXV0byBibG9jayBzaXpl
CisgICAgICAgICAgICAvLyAoY29sdW1uIGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0
IHJhdGlvLgorICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlz
QXV0bygpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIHsK
KyAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCku
bG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgp
IHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLmNvbXB1
dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChMZW5ndGgoMCwgUGVyY2VudCkpKSkKKyAgICAgICAg
ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGlzSG9y
aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpIDog
Y2hpbGQuc3R5bGUoKS53aWR0aCgpLmlzQXV0bygpOworfQorCitib29sIFJlbmRlckdyaWQ6Omhh
c0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAg
aWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgICAgICBpZiAoaXNIb3Jp
em9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7
CisgICAgICAgICAgICAvLyBJZiB0aGUgdXNlZCBibG9jayBzaXplIGlzIG5vbi1hdXRvLCB3ZSBk
byBoYXZlIGEgbm9uIGF1dG8gaW5saW5lIHNpemUKKyAgICAgICAgICAgIC8vIChyb3cgYXhpcyBz
aXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCisgICAgICAgICAgICBjb25zdCBMZW5n
dGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKKyAgICAg
ICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0LmlzRml4ZWQoKSB8fCAobG9naWNhbEhlaWdodC5pc1Bl
cmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBjaGlsZC5jb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWln
aHQoTGVuZ3RoKDAsIFBlcmNlbnQpKSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor
ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxX
aWR0aCgpLmlzQXV0bygpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg
fQorICAgIH0KKyAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0
eWxlKCkud2lkdGgoKS5pc0F1dG8oKSA6IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCk7
Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
R3JpZC5oCmluZGV4IDM3NTc2ZWZhNTM1ODBjYzAyNTZjNmE4MTRiZDU1ZjgwYTE3ZjliMmYuLjdj
YmQ4ZGRlNjRmZWRmZTI4NTU4YThiMzM0NjQ4MDRmYzJhMGZhMGMgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtMTU5LDggKzE1OSw4IEBAIHByaXZhdGU6CiAgICAgU3R5
bGVTZWxmQWxpZ25tZW50RGF0YSBqdXN0aWZ5U2VsZkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYs
IGNvbnN0IFJlbmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIFN0eWxlU2VsZkFsaWdu
bWVudERhdGEgYWxpZ25TZWxmRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgUmVuZGVy
U3R5bGUqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgdm9pZCBhcHBseVN0cmV0Y2hBbGlnbm1lbnRU
b0NoaWxkSWZOZWVkZWQoUmVuZGVyQm94Jik7Ci0gICAgYm9vbCBoYXNBdXRvU2l6ZUluQ29sdW1u
QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBpc0hvcml6b250YWxX
cml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSA6IGNoaWxkLnN0
eWxlKCkud2lkdGgoKS5pc0F1dG8oKTsgfQotICAgIGJvb2wgaGFzQXV0b1NpemVJblJvd0F4aXMo
Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGlu
Z01vZGUoKSA/IGNoaWxkLnN0eWxlKCkud2lkdGgoKS5pc0F1dG8oKSA6IGNoaWxkLnN0eWxlKCku
aGVpZ2h0KCkuaXNBdXRvKCk7IH0KKyAgICBib29sIGhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OworICAgIGJvb2wgaGFzQXV0b1NpemVJblJvd0F4
aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgYm9vbCBhbGxvd2VkVG9TdHJl
dGNoQ2hpbGRBbG9uZ0NvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyBy
ZXR1cm4gYWxpZ25TZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9u
OjpTdHJldGNoICYmIGhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNoaWxkKSAmJiAhaGFzQXV0b01h
cmdpbnNJbkNvbHVtbkF4aXMoY2hpbGQpOyB9CiAgICAgYm9vbCBhbGxvd2VkVG9TdHJldGNoQ2hp
bGRBbG9uZ1Jvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyByZXR1cm4ganVz
dGlmeVNlbGZGb3JDaGlsZChjaGlsZCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0
Y2ggJiYgaGFzQXV0b1NpemVJblJvd0F4aXMoY2hpbGQpICYmICFoYXNBdXRvTWFyZ2luc0luUm93
QXhpcyhjaGlsZCk7IH0KICAgICBib29sIGhhc0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNvbnN0
IFJlbmRlckJveCYpIGNvbnN0Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418510</attachid>
            <date>2021-01-26 22:07:16 -0800</date>
            <delta_ts>2021-01-27 07:35:55 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210127070713.patch</filename>
            <type>text/plain</type>
            <size>4345</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJhYTcxZTMyM2JjYzJk
MmE5MGMyZjA5MzMwN2I2ZTdkMTc1NDdmNi4uMWU3Yzc3NjVhZDllZTMyZTFiZTIwNTEwOGE5NDUy
OTkxMGQyNGVkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAxLTI2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMgY29uc3QpOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMgY29uc3Qp
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMjEtMDEtMjYgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZWZhY3RvciBjb21wdXRlUHJlZmVy
cmVkTG9naWNhbFdpZHRocwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmlu
ZGV4IGE5YzhhODhkZTU3NzhlNDEwZGM0MTM0MWE0NDkzOTIwZWNjMDRjZGUuLmI0M2U4ZWExMGIw
NWFiODYyY2ExZjdjNWM2MDQ3NWIwNjQ3OTYyNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyR3JpZC5jcHAKQEAgLTE4NTksNCArMTg1OSwzOCBAQCBjb25zdCBjaGFyKiBSZW5kZXJH
cmlkOjpyZW5kZXJOYW1lKCkgY29uc3QKICAgICByZXR1cm4gIlJlbmRlckdyaWQiOwogfQogCiti
b29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpIGNvbnN0Cit7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkg
eworICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6
b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICAvLyBJZiB0aGUgdXNlZCBpbmxpbmUg
c2l6ZSBpcyBub24tYXV0bywgd2UgZG8gaGF2ZSBhIG5vbiBhdXRvIGJsb2NrIHNpemUKKyAgICAg
ICAgICAgIC8vIChjb2x1bW4gYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8u
CisgICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkp
CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9IGVsc2UgeworICAgICAg
ICAgICAgY29uc3QgTGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2Fs
SGVpZ2h0KCk7CisgICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxv
Z2ljYWxIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQuY29tcHV0ZVBlcmNl
bnRhZ2VMb2dpY2FsSGVpZ2h0KExlbmd0aCgwLCBQZXJjZW50KSkpKQorICAgICAgICAgICAgICAg
IHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gaXNIb3Jpem9udGFs
V3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGlsZC5z
dHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7Cit9CisKK2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1Np
emVJblJvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAoY2hp
bGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxX
cml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAg
ICAgICAgIC8vIElmIHRoZSB1c2VkIGJsb2NrIHNpemUgaXMgbm9uLWF1dG8sIHdlIGRvIGhhdmUg
YSBub24gYXV0byBpbmxpbmUgc2l6ZQorICAgICAgICAgICAgLy8gKHJvdyBheGlzIHNpemUpIGJl
Y2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KKyAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9n
aWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAg
aWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9y
Q2FsY3VsYXRlZCgpICYmIGNoaWxkLmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChMZW5n
dGgoMCwgUGVyY2VudCkpKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg
IH0gZWxzZSB7CisgICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCku
aXNBdXRvKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAg
fQorICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS53
aWR0aCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKTsKK30KKwog
fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgK
aW5kZXggMzc1NzZlZmE1MzU4MGNjMDI1NmM2YTgxNGJkNTVmODBhMTdmOWIyZi4uN2NiZDhkZGU2
NGZlZGZlMjg1NThhOGIzMzQ2NDgwNGZjMmEwZmEwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyR3JpZC5oCkBAIC0xNTksOCArMTU5LDggQEAgcHJpdmF0ZToKICAgICBTdHlsZVNlbGZB
bGlnbm1lbnREYXRhIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiwgY29uc3Qg
UmVuZGVyU3R5bGUqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0
YSBhbGlnblNlbGZGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSog
PSBudWxscHRyKSBjb25zdDsKICAgICB2b2lkIGFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGRJ
Zk5lZWRlZChSZW5kZXJCb3gmKTsKLSAgICBib29sIGhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdN
b2RlKCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS53
aWR0aCgpLmlzQXV0bygpOyB9Ci0gICAgYm9vbCBoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBS
ZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgp
ID8gY2hpbGQuc3R5bGUoKS53aWR0aCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS5oZWlnaHQo
KS5pc0F1dG8oKTsgfQorICAgIGJvb2wgaGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVu
ZGVyQm94JiBjaGlsZCkgY29uc3Q7CisgICAgYm9vbCBoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25z
dCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIGFsbG93ZWRUb1N0cmV0Y2hDaGls
ZEFsb25nQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBh
bGlnblNlbGZGb3JDaGlsZChjaGlsZCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0
Y2ggJiYgaGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY2hpbGQpICYmICFoYXNBdXRvTWFyZ2luc0lu
Q29sdW1uQXhpcyhjaGlsZCk7IH0KICAgICBib29sIGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFsb25n
Um93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBqdXN0aWZ5U2Vs
ZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiBo
YXNBdXRvU2l6ZUluUm93QXhpcyhjaGlsZCkgJiYgIWhhc0F1dG9NYXJnaW5zSW5Sb3dBeGlzKGNo
aWxkKTsgfQogICAgIGJvb2wgaGFzQXV0b01hcmdpbnNJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVy
Qm94JikgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418547</attachid>
            <date>2021-01-27 07:35:59 -0800</date>
            <delta_ts>2021-01-29 01:39:27 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210127163558.patch</filename>
            <type>text/plain</type>
            <size>6522</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRkYzY4YWRkZGNkZTIz
MTViYTg0Yjc2MzlmNTA4NjhkM2NiNmE3ZC4uMDBiMjgyZGNjNWUwYjdmYjVhYWYyYmIzODM5NDkz
ZDM3MWNiYjlmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAxLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMgY29uc3QpOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMgY29uc3Qp
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMjEtMDEtMjcgIFphbGFu
IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIEV4cGFuZCAi
ZW1wdHkgbGluZSIgZmFzdCBwYXRoIHN1cHBvcnQgZm9yIG11bHRpbGluZSBpbmxpbmUgYm94ZXMK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCBhOWM4YTg4ZGU1Nzc4
ZTQxMGRjNDEzNDFhNDQ5MzkyMGVjYzA0Y2RlLi44NzhlYzhjNTc0MWNhN2JhMmU2NDNmMDUyOTA3
ZTE1YjkxYWExMjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
R3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBA
IC0xODU5LDQgKzE4NTksMzggQEAgY29uc3QgY2hhciogUmVuZGVyR3JpZDo6cmVuZGVyTmFtZSgp
IGNvbnN0CiAgICAgcmV0dXJuICJSZW5kZXJHcmlkIjsKIH0KIAorYm9vbCBSZW5kZXJHcmlkOjpo
YXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAorewor
ICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgaWYgKGlz
SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo
KSkgeworICAgICAgICAgICAgLy8gSWYgdGhlIHVzZWQgaW5saW5lIHNpemUgaXMgbm9uLWF1dG8s
IHdlIGRvIGhhdmUgYSBub24gYXV0byBibG9jayBzaXplCisgICAgICAgICAgICAvLyAoY29sdW1u
IGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgorICAgICAgICAgICAgaWYg
KCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKQorICAgICAgICAgICAgICAg
IHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGNvbnN0IExlbmd0
aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAg
ICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVy
Y2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNv
bHZhYmxlKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAg
IH0KKyAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCku
aGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7Cit9CisK
K2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkgY29uc3QKK3sKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7
CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpv
bnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgIC8vIElmIHRoZSB1c2VkIGJsb2NrIHNp
emUgaXMgbm9uLWF1dG8sIHdlIGRvIGhhdmUgYSBub24gYXV0byBpbmxpbmUgc2l6ZQorICAgICAg
ICAgICAgLy8gKHJvdyBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KKyAg
ICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9n
aWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8
IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRh
Z2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBm
YWxzZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUoKS5s
b2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg
ICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBj
aGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlz
QXV0bygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckdyaWQuaAppbmRleCAzNzU3NmVmYTUzNTgwY2MwMjU2YzZhODE0YmQ1NWY4MGExN2Y5
YjJmLi43Y2JkOGRkZTY0ZmVkZmUyODU1OGE4YjMzNDY0ODA0ZmMyYTBmYTBjIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTE1OSw4ICsxNTksOCBAQCBwcml2YXRlOgog
ICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEganVzdGlmeVNlbGZGb3JDaGlsZChjb25zdCBSZW5k
ZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKICAgICBTdHlsZVNl
bGZBbGlnbm1lbnREYXRhIGFsaWduU2VsZkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0
IFJlbmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlTdHJldGNoQWxp
Z25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYpOwotICAgIGJvb2wgaGFzQXV0b1NpemVJ
bkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gaXNIb3Jp
em9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBj
aGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7IH0KLSAgICBib29sIGhhc0F1dG9TaXplSW5S
b3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRh
bFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5z
dHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOyB9CisgICAgYm9vbCBoYXNBdXRvU2l6ZUluQ29sdW1u
QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29sIGhhc0F1dG9TaXpl
SW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dl
ZFRvU3RyZXRjaENoaWxkQWxvbmdDb2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv
bnN0IHsgcmV0dXJuIGFsaWduU2VsZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Q
b3NpdGlvbjo6U3RyZXRjaCAmJiBoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjaGlsZCkgJiYgIWhh
c0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNoaWxkKTsgfQogICAgIGJvb2wgYWxsb3dlZFRvU3Ry
ZXRjaENoaWxkQWxvbmdSb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0
dXJuIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9u
OjpTdHJldGNoICYmIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNoaWxkKSAmJiAhaGFzQXV0b01hcmdp
bnNJblJvd0F4aXMoY2hpbGQpOyB9CiAgICAgYm9vbCBoYXNBdXRvTWFyZ2luc0luQ29sdW1uQXhp
cyhjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmYjhlNTRjNTJkMTYwNTJkM2VmN2Q5
ZWYyMGFjOGIyZTQ5OTUxYmJiLi44MzM3NmVhMTc0MWIyZDMzMTgxYzRhN2YyZmNjODJhYjI1ZWNm
NmQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDEtMjcgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBncmlkIGl0ZW1z
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NzcK
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RF
eHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMjcgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3
ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjcxOTQwLgpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKaW5kZXggZWVlMTZlNjI3MzY2ZGY3N2UzY2VkMDViNTk0MzdkM2VkYmI5NThj
NC4uYTljYWFhN2JkNDdjZWE5N2NmMGEzMTM3ZmFiNzlkYzBjY2IzYWYyNCAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCkBAIC00NDQwLDEwICs0NDQwLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8t
MDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp
ZC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418712</attachid>
            <date>2021-01-29 01:39:32 -0800</date>
            <delta_ts>2021-01-29 03:18:26 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210129103931.patch</filename>
            <type>text/plain</type>
            <size>7908</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY4MjQ4YTI2OTY4ZmQz
MjcyZjYzMGE3MWYzMWM1MzFiNDMzNWNhYy4uZWZmMzZmYWM4NTA3YzQ5MGM5NTgwNDA1YmI0OGFh
YWVkMzQwYjAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gZm9yIGdyaWQgaXRlbXMgYnkgY29ycmVjdGluZwor
ICAgICAgICB0aGUgYXV0by1zaXplIGRldGVybWluYXRpb24gZm9yIHJvdy9jb2x1bW5zLWF4aXMK
KyAgICAgICAgd2hlbiB0aGUgY2hpbGQgaGFzIGFzcGVjdC1yYXRpbyBzZXQuCisKKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk
OjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5n
L1JlbmRlckdyaWQuaDoKKwogMjAyMS0wMS0yOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t
PgogCiAgICAgICAgIEZpeCBsb2dpYyBlcnJvciBpbiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdo
dEZyb21Bc3BlY3RSYXRpbwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmlu
ZGV4IGE5YzhhODhkZTU3NzhlNDEwZGM0MTM0MWE0NDkzOTIwZWNjMDRjZGUuLjhhZDk2MzcyMTk5
MGQyZTkwZWJjYjE1OWE0ZDIzMmVhYTUyYmIwOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyR3JpZC5jcHAKQEAgLTE5MSw5ICsxOTEsMTUgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlv
dXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgICAgIGJlZ2lu
VXBkYXRlU2Nyb2xsSW5mb0FmdGVyTGF5b3V0VHJhbnNhY3Rpb24oKTsKIAogICAgICAgICBMYXlv
dXRTaXplIHByZXZpb3VzU2l6ZSA9IHNpemUoKTsKLSAgICAgICAgLy8gRklYTUU6IFdlIHNob3Vs
ZCB1c2UgUmVuZGVyQmxvY2s6Omhhc0RlZmluaXRlTG9naWNhbEhlaWdodCgpIGJ1dCBpdCBkb2Vz
IG5vdCB3b3JrIGZvciBwb3NpdGlvbmVkIHN0dWZmLgogICAgICAgICAvLyBGSVhNRTogQ29uc2lk
ZXIgY2FjaGluZyB0aGUgaGFzRGVmaW5pdGVMb2dpY2FsSGVpZ2h0IHZhbHVlIHRocm91Z2hvdXQg
dGhlIGxheW91dC4KLSAgICAgICAgYm9vbCBoYXNEZWZpbml0ZUxvZ2ljYWxIZWlnaHQgPSBoYXNP
dmVycmlkaW5nTG9naWNhbEhlaWdodCgpIHx8IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodChN
YWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKSwgV1RGOjpudWxsb3B0
KTsKKyAgICAgICAgYm9vbCBoYXNEZWZpbml0ZUxvZ2ljYWxIZWlnaHQgPSBoYXNPdmVycmlkaW5n
TG9naWNhbEhlaWdodCgpOworICAgICAgICBpZiAoIWhhc0RlZmluaXRlTG9naWNhbEhlaWdodCkg
eworICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgUmVuZGVyQmxvY2s6Omhhc0Rl
ZmluaXRlTG9naWNhbEhlaWdodCgpIGJ1dCBpdCBkb2VzIG5vdCB3b3JrIGZvciBwb3NpdGlvbmVk
IHN0dWZmLgorICAgICAgICAgICAgaWYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAg
ICAgICAgICAgIGhhc0RlZmluaXRlTG9naWNhbEhlaWdodCA9IGNvbXB1dGVDb250ZW50TG9naWNh
bEhlaWdodChNYWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKSwgV1RG
OjpudWxsb3B0KSAhPSBXVEY6Om51bGxvcHQ7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAg
ICAgICAgaGFzRGVmaW5pdGVMb2dpY2FsSGVpZ2h0ID0gUmVuZGVyQmxvY2s6Omhhc0RlZmluaXRl
TG9naWNhbEhlaWdodCgpOworICAgICAgICB9CiAKICAgICAgICAgbV9oYXNBbnlPcnRob2dvbmFs
SXRlbSA9IGZhbHNlOwogICAgICAgICBmb3IgKGF1dG8qIGNoaWxkID0gZmlyc3RDaGlsZEJveCgp
OyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewpAQCAtMTg1OSw0ICsx
ODY1LDM4IEBAIGNvbnN0IGNoYXIqIFJlbmRlckdyaWQ6OnJlbmRlck5hbWUoKSBjb25zdAogICAg
IHJldHVybiAiUmVuZGVyR3JpZCI7CiB9CiAKK2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJ
bkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAoY2hp
bGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxX
cml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAg
ICAgICAgIC8vIEEgbm9uLWF1dG8gaW5saW5lIHNpemUgbWVhbnMgdGhlIHNhbWUgZm9yIGJsb2Nr
IHNpemUKKyAgICAgICAgICAgIC8vIChjb2x1bW4gYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBh
c3BlY3QgcmF0aW8uCisgICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRo
KCkuaXNBdXRvKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9IGVs
c2UgeworICAgICAgICAgICAgY29uc3QgTGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5
bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0Zp
eGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQu
cGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSkpCisgICAgICAgICAgICAgICAg
cmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBpc0hvcml6b250YWxX
cml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSA6IGNoaWxkLnN0
eWxlKCkud2lkdGgoKS5pc0F1dG8oKTsKK30KKworYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6
ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIGlmIChjaGls
ZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdy
aXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgeworICAgICAg
ICAgICAgLy8gQSBub24tYXV0byBibG9jayBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBpbmxpbmUg
c2l6ZQorICAgICAgICAgICAgLy8gKHJvdyBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVj
dCByYXRpby4KKyAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxk
LnN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQu
aXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNo
aWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAg
ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmICghY2hp
bGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKKyAgICAgICAgICAgICAgICByZXR1
cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRp
bmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgp
LmhlaWdodCgpLmlzQXV0bygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCAzNzU3NmVmYTUzNTgwY2MwMjU2YzZhODE0
YmQ1NWY4MGExN2Y5YjJmLi43Y2JkOGRkZTY0ZmVkZmUyODU1OGE4YjMzNDY0ODA0ZmMyYTBmYTBj
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTE1OSw4ICsxNTksOCBA
QCBwcml2YXRlOgogICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEganVzdGlmeVNlbGZGb3JDaGls
ZChjb25zdCBSZW5kZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsK
ICAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIGFsaWduU2VsZkZvckNoaWxkKGNvbnN0IFJlbmRl
ckJveCYsIGNvbnN0IFJlbmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQgYXBw
bHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYpOwotICAgIGJvb2wg
aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyBy
ZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCku
aXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7IH0KLSAgICBib29sIGhh
c0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJu
IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRv
KCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOyB9CisgICAgYm9vbCBoYXNBdXRv
U2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29s
IGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAg
IGJvb2wgYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdDb2x1bW5BeGlzKGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGFsaWduU2VsZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlv
bigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiBoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhj
aGlsZCkgJiYgIWhhc0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNoaWxkKTsgfQogICAgIGJvb2wg
YWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdSb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp
IGNvbnN0IHsgcmV0dXJuIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgPT0g
SXRlbVBvc2l0aW9uOjpTdHJldGNoICYmIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNoaWxkKSAmJiAh
aGFzQXV0b01hcmdpbnNJblJvd0F4aXMoY2hpbGQpOyB9CiAgICAgYm9vbCBoYXNBdXRvTWFyZ2lu
c0luQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNDIxY2M3ZjUz
OTIzNjQwZDYwNzc1ZjFmZDViNGY4YTFhNDE0MDdkLi43MDc3N2JkYWFhMzIxY2QxZGUyMGJhODgy
OTllZGEwODBmMTZjNTJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMjkgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBv
biBncmlkIGl0ZW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjA5NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4
cGVjdGF0aW9uczoKKwogMjAyMS0wMS0yOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgog
CiAgICAgICAgIEZpeCBsb2dpYyBlcnJvciBpbiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy
b21Bc3BlY3RSYXRpbwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBi
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYjczNDRmYzJhMTQ5N2VkZDFmNzVh
NWJmYTVlYmJkOTFmNzg5ODdkYi4uYjQ4MjNkZjVlMzgxZjBkNTllM2E5NzYyODBjODBhYjA2MTJk
MTQzYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDQwLDEwICs0NDQwLDYgQEAgd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDA3Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0
aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
Z3JpZC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUt
MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50
cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418715</attachid>
            <date>2021-01-29 03:18:31 -0800</date>
            <delta_ts>2021-01-29 04:33:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210129121830.patch</filename>
            <type>text/plain</type>
            <size>7909</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY4MjQ4YTI2OTY4ZmQz
MjcyZjYzMGE3MWYzMWM1MzFiNDMzNWNhYy4uZWZmMzZmYWM4NTA3YzQ5MGM5NTgwNDA1YmI0OGFh
YWVkMzQwYjAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gZm9yIGdyaWQgaXRlbXMgYnkgY29ycmVjdGluZwor
ICAgICAgICB0aGUgYXV0by1zaXplIGRldGVybWluYXRpb24gZm9yIHJvdy9jb2x1bW5zLWF4aXMK
KyAgICAgICAgd2hlbiB0aGUgY2hpbGQgaGFzIGFzcGVjdC1yYXRpbyBzZXQuCisKKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk
OjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5n
L1JlbmRlckdyaWQuaDoKKwogMjAyMS0wMS0yOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t
PgogCiAgICAgICAgIEZpeCBsb2dpYyBlcnJvciBpbiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdo
dEZyb21Bc3BlY3RSYXRpbwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmlu
ZGV4IGE5YzhhODhkZTU3NzhlNDEwZGM0MTM0MWE0NDkzOTIwZWNjMDRjZGUuLjkwZTJjYzYzOTIy
NzZmZGRhMjlmNmMzYzQyNmE0NTdjN2I3YTE3NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyR3JpZC5jcHAKQEAgLTE5MSw5ICsxOTEsMTUgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlv
dXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgICAgIGJlZ2lu
VXBkYXRlU2Nyb2xsSW5mb0FmdGVyTGF5b3V0VHJhbnNhY3Rpb24oKTsKIAogICAgICAgICBMYXlv
dXRTaXplIHByZXZpb3VzU2l6ZSA9IHNpemUoKTsKLSAgICAgICAgLy8gRklYTUU6IFdlIHNob3Vs
ZCB1c2UgUmVuZGVyQmxvY2s6Omhhc0RlZmluaXRlTG9naWNhbEhlaWdodCgpIGJ1dCBpdCBkb2Vz
IG5vdCB3b3JrIGZvciBwb3NpdGlvbmVkIHN0dWZmLgogICAgICAgICAvLyBGSVhNRTogQ29uc2lk
ZXIgY2FjaGluZyB0aGUgaGFzRGVmaW5pdGVMb2dpY2FsSGVpZ2h0IHZhbHVlIHRocm91Z2hvdXQg
dGhlIGxheW91dC4KLSAgICAgICAgYm9vbCBoYXNEZWZpbml0ZUxvZ2ljYWxIZWlnaHQgPSBoYXNP
dmVycmlkaW5nTG9naWNhbEhlaWdodCgpIHx8IGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodChN
YWluT3JQcmVmZXJyZWRTaXplLCBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKSwgV1RGOjpudWxsb3B0
KTsKKyAgICAgICAgYm9vbCBoYXNEZWZpbml0ZUxvZ2ljYWxIZWlnaHQgPSBoYXNPdmVycmlkaW5n
TG9naWNhbEhlaWdodCgpOworICAgICAgICBpZiAoIWhhc0RlZmluaXRlTG9naWNhbEhlaWdodCkg
eworICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCB1c2UgUmVuZGVyQmxvY2s6Omhhc0Rl
ZmluaXRlTG9naWNhbEhlaWdodCgpIGJ1dCBpdCBkb2VzIG5vdCB3b3JrIGZvciBwb3NpdGlvbmVk
IHN0dWZmLgorICAgICAgICAgICAgaWYgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAg
ICAgICAgICAgICBoYXNEZWZpbml0ZUxvZ2ljYWxIZWlnaHQgPSBSZW5kZXJCbG9jazo6aGFzRGVm
aW5pdGVMb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg
aGFzRGVmaW5pdGVMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KE1h
aW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCkubG9naWNhbEhlaWdodCgpLCBXVEY6Om51bGxvcHQp
ICE9IFdURjo6bnVsbG9wdDsKKyAgICAgICAgfQogCiAgICAgICAgIG1faGFzQW55T3J0aG9nb25h
bEl0ZW0gPSBmYWxzZTsKICAgICAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGZpcnN0Q2hpbGRCb3go
KTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkpIHsKQEAgLTE4NTksNCAr
MTg2NSwzOCBAQCBjb25zdCBjaGFyKiBSZW5kZXJHcmlkOjpyZW5kZXJOYW1lKCkgY29uc3QKICAg
ICByZXR1cm4gIlJlbmRlckdyaWQiOwogfQogCitib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXpl
SW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAgaWYgKGNo
aWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgICAgICBpZiAoaXNIb3Jpem9udGFs
V3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAg
ICAgICAgICAvLyBBIG5vbi1hdXRvIGlubGluZSBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBibG9j
ayBzaXplCisgICAgICAgICAgICAvLyAoY29sdW1uIGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUg
YXNwZWN0IHJhdGlvLgorICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0
aCgpLmlzQXV0bygpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBl
bHNlIHsKKyAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0
eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNG
aXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxk
LnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAgICAg
IHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gaXNIb3Jpem9udGFs
V3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGlsZC5z
dHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7Cit9CisKK2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1Np
emVJblJvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAoY2hp
bGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxX
cml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAg
ICAgICAgIC8vIEEgbm9uLWF1dG8gYmxvY2sgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgaW5saW5l
IHNpemUKKyAgICAgICAgICAgIC8vIChyb3cgYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3Bl
Y3QgcmF0aW8uCisgICAgICAgICAgICBjb25zdCBMZW5ndGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGls
ZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0
LmlzRml4ZWQoKSB8fCAobG9naWNhbEhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBj
aGlsZC5wZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKSkKKyAgICAgICAgICAg
ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBpZiAoIWNo
aWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCisgICAgICAgICAgICAgICAgcmV0
dXJuIGZhbHNlOworICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBpc0hvcml6b250YWxXcml0
aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS53aWR0aCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUo
KS5oZWlnaHQoKS5pc0F1dG8oKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5kZXggMzc1NzZlZmE1MzU4MGNjMDI1NmM2YTgx
NGJkNTVmODBhMTdmOWIyZi4uN2NiZDhkZGU2NGZlZGZlMjg1NThhOGIzMzQ2NDgwNGZjMmEwZmEw
YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC0xNTksOCArMTU5LDgg
QEAgcHJpdmF0ZToKICAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIGp1c3RpZnlTZWxmRm9yQ2hp
bGQoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgUmVuZGVyU3R5bGUqID0gbnVsbHB0cikgY29uc3Q7
CiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBhbGlnblNlbGZGb3JDaGlsZChjb25zdCBSZW5k
ZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKICAgICB2b2lkIGFw
cGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGRJZk5lZWRlZChSZW5kZXJCb3gmKTsKLSAgICBib29s
IGhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsg
cmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgp
LmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS53aWR0aCgpLmlzQXV0bygpOyB9Ci0gICAgYm9vbCBo
YXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVy
biBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS53aWR0aCgpLmlzQXV0
bygpIDogY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKTsgfQorICAgIGJvb2wgaGFzQXV0
b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CisgICAgYm9v
bCBoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAg
ICBib29sIGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFsb25nQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJC
b3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBhbGlnblNlbGZGb3JDaGlsZChjaGlsZCkucG9zaXRp
b24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2ggJiYgaGFzQXV0b1NpemVJbkNvbHVtbkF4aXMo
Y2hpbGQpICYmICFoYXNBdXRvTWFyZ2luc0luQ29sdW1uQXhpcyhjaGlsZCk7IH0KICAgICBib29s
IGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFsb25nUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdCB7IHJldHVybiBqdXN0aWZ5U2VsZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlvbigpID09
IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiBoYXNBdXRvU2l6ZUluUm93QXhpcyhjaGlsZCkgJiYg
IWhhc0F1dG9NYXJnaW5zSW5Sb3dBeGlzKGNoaWxkKTsgfQogICAgIGJvb2wgaGFzQXV0b01hcmdp
bnNJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTQyMWNjN2Y1
MzkyMzY0MGQ2MDc3NWYxZmQ1YjRmOGExYTQxNDA3ZC4uNzA3NzdiZGFhYTMyMWNkMWRlMjBiYTg4
Mjk5ZWRhMDgwZjE2YzUyYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgRW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RF
eHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMjkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K
IAogICAgICAgICBGaXggbG9naWMgZXJyb3IgaW4gc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRG
cm9tQXNwZWN0UmF0aW8KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGI3MzQ0ZmMyYTE0OTdlZGQxZjc1
YTViZmE1ZWJiZDkxZjc4OTg3ZGIuLmI0ODIzZGY1ZTM4MWYwZDU5ZTNhOTc2MjgwYzgwYWIwNjEy
ZDE0M2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQ0MCwxMCArNDQ0MCw2IEBAIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAwNy5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJh
dGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2dyaWQtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXpl
LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2lu
dHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418717</attachid>
            <date>2021-01-29 04:33:51 -0800</date>
            <delta_ts>2021-02-02 01:21:30 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210129133350.patch</filename>
            <type>text/plain</type>
            <size>7698</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY4MjQ4YTI2OTY4ZmQz
MjcyZjYzMGE3MWYzMWM1MzFiNDMzNWNhYy4uZWZmMzZmYWM4NTA3YzQ5MGM5NTgwNDA1YmI0OGFh
YWVkMzQwYjAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gZm9yIGdyaWQgaXRlbXMgYnkgY29ycmVjdGluZwor
ICAgICAgICB0aGUgYXV0by1zaXplIGRldGVybWluYXRpb24gZm9yIHJvdy9jb2x1bW5zLWF4aXMK
KyAgICAgICAgd2hlbiB0aGUgY2hpbGQgaGFzIGFzcGVjdC1yYXRpbyBzZXQuCisKKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk
OjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5n
L1JlbmRlckdyaWQuaDoKKwogMjAyMS0wMS0yOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29t
PgogCiAgICAgICAgIEZpeCBsb2dpYyBlcnJvciBpbiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdo
dEZyb21Bc3BlY3RSYXRpbwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmlu
ZGV4IGE5YzhhODhkZTU3NzhlNDEwZGM0MTM0MWE0NDkzOTIwZWNjMDRjZGUuLjlhMjc0YjcxOTFh
YjBiOTdkY2M5MTY0OWViYWY4OGQzM2ZmNmJlNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyR3JpZC5jcHAKQEAgLTE5MSw5ICsxOTEsOSBAQCB2b2lkIFJlbmRlckdyaWQ6OmxheW91
dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICAgICAgYmVnaW5V
cGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXRUcmFuc2FjdGlvbigpOwogCiAgICAgICAgIExheW91
dFNpemUgcHJldmlvdXNTaXplID0gc2l6ZSgpOwotICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxk
IHVzZSBSZW5kZXJCbG9jazo6aGFzRGVmaW5pdGVMb2dpY2FsSGVpZ2h0KCkgYnV0IGl0IGRvZXMg
bm90IHdvcmsgZm9yIHBvc2l0aW9uZWQgc3R1ZmYuCisgICAgICAgICAgICAvLyBGSVhNRTogV2Ug
c2hvdWxkIHVzZSBSZW5kZXJCbG9jazo6aGFzRGVmaW5pdGVMb2dpY2FsSGVpZ2h0KCkgYnV0IGl0
IGRvZXMgbm90IHdvcmsgZm9yIHBvc2l0aW9uZWQgc3R1ZmYuCiAgICAgICAgIC8vIEZJWE1FOiBD
b25zaWRlciBjYWNoaW5nIHRoZSBoYXNEZWZpbml0ZUxvZ2ljYWxIZWlnaHQgdmFsdWUgdGhyb3Vn
aG91dCB0aGUgbGF5b3V0LgotICAgICAgICBib29sIGhhc0RlZmluaXRlTG9naWNhbEhlaWdodCA9
IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgfHwgY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVp
Z2h0KE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCkubG9naWNhbEhlaWdodCgpLCBXVEY6Om51
bGxvcHQpOworICAgICAgICBib29sIGhhc0RlZmluaXRlTG9naWNhbEhlaWdodCA9IGhhc092ZXJy
aWRpbmdMb2dpY2FsSGVpZ2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNw
ZWN0UmF0aW8oKSB8fCBjb21wdXRlQ29udGVudExvZ2ljYWxIZWlnaHQoTWFpbk9yUHJlZmVycmVk
U2l6ZSwgc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCksIFdURjo6bnVsbG9wdCk7CiAKICAgICAgICAg
bV9oYXNBbnlPcnRob2dvbmFsSXRlbSA9IGZhbHNlOwogICAgICAgICBmb3IgKGF1dG8qIGNoaWxk
ID0gZmlyc3RDaGlsZEJveCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3go
KSkgewpAQCAtMTg1OSw0ICsxODU5LDM4IEBAIGNvbnN0IGNoYXIqIFJlbmRlckdyaWQ6OnJlbmRl
ck5hbWUoKSBjb25zdAogICAgIHJldHVybiAiUmVuZGVyR3JpZCI7CiB9CiAKK2Jvb2wgUmVuZGVy
R3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29u
c3QKK3sKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgICAg
IGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRp
bmdNb2RlKCkpIHsKKyAgICAgICAgICAgIC8vIEEgbm9uLWF1dG8gaW5saW5lIHNpemUgbWVhbnMg
dGhlIHNhbWUgZm9yIGJsb2NrIHNpemUKKyAgICAgICAgICAgIC8vIChjb2x1bW4gYXhpcyBzaXpl
KSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCisgICAgICAgICAgICBpZiAoIWNoaWxkLnN0
eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZh
bHNlOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgY29uc3QgTGVuZ3RoJiBsb2dpY2Fs
SGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICBpZiAo
bG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQZXJjZW50T3JDYWxj
dWxhdGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSkp
CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgfQorICAgIHJl
dHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5p
c0F1dG8oKSA6IGNoaWxkLnN0eWxlKCkud2lkdGgoKS5pc0F1dG8oKTsKK30KKworYm9vbCBSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z
dAoreworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAg
aWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGlu
Z01vZGUoKSkgeworICAgICAgICAgICAgLy8gQSBub24tYXV0byBibG9jayBzaXplIG1lYW5zIHRo
ZSBzYW1lIGZvciBpbmxpbmUgc2l6ZQorICAgICAgICAgICAgLy8gKHJvdyBheGlzIHNpemUpIGJl
Y2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KKyAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9n
aWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAg
aWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9y
Q2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxl
KCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIHsKKyAg
ICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKKyAg
ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJu
IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRv
KCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOworfQorCiB9IC8vIG5hbWVzcGFj
ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp
ZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCAzNzU3NmVm
YTUzNTgwY2MwMjU2YzZhODE0YmQ1NWY4MGExN2Y5YjJmLi43Y2JkOGRkZTY0ZmVkZmUyODU1OGE4
YjMzNDY0ODA0ZmMyYTBmYTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgK
QEAgLTE1OSw4ICsxNTksOCBAQCBwcml2YXRlOgogICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEg
anVzdGlmeVNlbGZGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSog
PSBudWxscHRyKSBjb25zdDsKICAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIGFsaWduU2VsZkZv
ckNoaWxkKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFJlbmRlclN0eWxlKiA9IG51bGxwdHIpIGNv
bnN0OwogICAgIHZvaWQgYXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRl
ckJveCYpOwotICAgIGJvb2wgaGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxk
LnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRv
KCk7IH0KLSAgICBib29sIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hp
bGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHls
ZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOyB9
CisgICAgYm9vbCBoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdDsKKyAgICBib29sIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdDb2x1bW5B
eGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGFsaWduU2VsZkZvckNo
aWxkKGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiBoYXNBdXRv
U2l6ZUluQ29sdW1uQXhpcyhjaGlsZCkgJiYgIWhhc0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNo
aWxkKTsgfQogICAgIGJvb2wgYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdSb3dBeGlzKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hp
bGQpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoICYmIGhhc0F1dG9TaXplSW5S
b3dBeGlzKGNoaWxkKSAmJiAhaGFzQXV0b01hcmdpbnNJblJvd0F4aXMoY2hpbGQpOyB9CiAgICAg
Ym9vbCBoYXNBdXRvTWFyZ2luc0luQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCAxNDIxY2M3ZjUzOTIzNjQwZDYwNzc1ZjFmZDViNGY4YTFhNDE0MDdkLi43MDc3N2Jk
YWFhMzIxY2QxZGUyMGJhODgyOTllZGEwODBmMTZjNTJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK
KzIwMjEtMDEtMjkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBw
b3J0IGFzcGVjdC1yYXRpbyBvbiBncmlkIGl0ZW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr
aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93Lgor
CisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMS0yOSAgUm9iIEJ1aXMgIDxy
YnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEZpeCBsb2dpYyBlcnJvciBpbiBzaG91bGRDb21w
dXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYjcz
NDRmYzJhMTQ5N2VkZDFmNzVhNWJmYTVlYmJkOTFmNzg5ODdkYi4uYjQ4MjNkZjVlMzgxZjBkNTll
M2E5NzYyODBjODBhYjA2MTJkMTQzYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDQwLDEwICs0
NDQwLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3Qt
cmF0aW8tMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEyLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2lj
LXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vaW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418972</attachid>
            <date>2021-02-02 01:21:36 -0800</date>
            <delta_ts>2021-02-03 01:44:51 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210202102135.patch</filename>
            <type>text/plain</type>
            <size>6694</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjIzZWMzOWZjMWMyNWQ2
YTMzNzExMTIzYTI3YTA1Y2Q4NWI4MGEzZi4uMzY3MGVhYTM3ZjBjOTY0ZGVjMmE5NDhhMWIzZjhj
MTIxNTE4YTUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTAyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gZm9yIGdyaWQgaXRlbXMgYnkgY29ycmVjdGluZwor
ICAgICAgICB0aGUgYXV0by1zaXplIGRldGVybWluYXRpb24gZm9yIHJvdy9jb2x1bW5zLWF4aXMK
KyAgICAgICAgd2hlbiB0aGUgY2hpbGQgaGFzIGFzcGVjdC1yYXRpbyBzZXQuCisKKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk
OjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5n
L1JlbmRlckdyaWQuaDoKKwogMjAyMS0wMi0wMiAgQkogQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4K
IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBpbXBsZW1lbnQgdGhlIGJhc2ljcyBmb3Igc2hvd2lu
Zy9oaWRpbmcgZ3JpZCBvdmVybGF5cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu
Y3BwCmluZGV4IGE5YzhhODhkZTU3NzhlNDEwZGM0MTM0MWE0NDkzOTIwZWNjMDRjZGUuLmJlOGU4
NmE3ZjgzNTdhNWU0Mjc1Y2VjNTI3N2RkMGU2YzBkZTJlZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTE4NTksNCArMTg1OSwzOCBAQCBjb25zdCBjaGFyKiBS
ZW5kZXJHcmlkOjpyZW5kZXJOYW1lKCkgY29uc3QKICAgICByZXR1cm4gIlJlbmRlckdyaWQiOwog
fQogCitib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0
aW8oKSkgeworICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5p
c0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICAvLyBBIG5vbi1hdXRvIGlu
bGluZSBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBibG9jayBzaXplCisgICAgICAgICAgICAvLyAo
Y29sdW1uIGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgorICAgICAgICAg
ICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKQorICAgICAgICAg
ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGNvbnN0
IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpOwor
ICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0
LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0
SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg
fQorICAgIH0KKyAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0
eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7
Cit9CisKK2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMoY29uc3QgUmVuZGVy
Qm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRp
bygpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlz
SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgIC8vIEEgbm9uLWF1dG8gYmxv
Y2sgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgaW5saW5lIHNpemUKKyAgICAgICAgICAgIC8vIChy
b3cgYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCisgICAgICAgICAgICBj
b25zdCBMZW5ndGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQo
KTsKKyAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0LmlzRml4ZWQoKSB8fCAobG9naWNhbEhl
aWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBjaGlsZC5wZXJjZW50YWdlTG9naWNhbEhl
aWdodElzUmVzb2x2YWJsZSgpKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg
ICAgIH0gZWxzZSB7CisgICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRo
KCkuaXNBdXRvKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9Cisg
ICAgfQorICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUo
KS53aWR0aCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKTsKK30K
KwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk
LmgKaW5kZXggMzc1NzZlZmE1MzU4MGNjMDI1NmM2YTgxNGJkNTVmODBhMTdmOWIyZi4uN2NiZDhk
ZGU2NGZlZGZlMjg1NThhOGIzMzQ2NDgwNGZjMmEwZmEwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyR3JpZC5oCkBAIC0xNTksOCArMTU5LDggQEAgcHJpdmF0ZToKICAgICBTdHlsZVNl
bGZBbGlnbm1lbnREYXRhIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiwgY29u
c3QgUmVuZGVyU3R5bGUqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgU3R5bGVTZWxmQWxpZ25tZW50
RGF0YSBhbGlnblNlbGZGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmLCBjb25zdCBSZW5kZXJTdHls
ZSogPSBudWxscHRyKSBjb25zdDsKICAgICB2b2lkIGFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hp
bGRJZk5lZWRlZChSZW5kZXJCb3gmKTsKLSAgICBib29sIGhhc0F1dG9TaXplSW5Db2x1bW5BeGlz
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRp
bmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUo
KS53aWR0aCgpLmlzQXV0bygpOyB9Ci0gICAgYm9vbCBoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25z
dCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9k
ZSgpID8gY2hpbGQuc3R5bGUoKS53aWR0aCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS5oZWln
aHQoKS5pc0F1dG8oKTsgfQorICAgIGJvb2wgaGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3Qg
UmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CisgICAgYm9vbCBoYXNBdXRvU2l6ZUluUm93QXhpcyhj
b25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICBib29sIGFsbG93ZWRUb1N0cmV0Y2hD
aGlsZEFsb25nQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVy
biBhbGlnblNlbGZGb3JDaGlsZChjaGlsZCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0
cmV0Y2ggJiYgaGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY2hpbGQpICYmICFoYXNBdXRvTWFyZ2lu
c0luQ29sdW1uQXhpcyhjaGlsZCk7IH0KICAgICBib29sIGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFs
b25nUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVybiBqdXN0aWZ5
U2VsZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAm
JiBoYXNBdXRvU2l6ZUluUm93QXhpcyhjaGlsZCkgJiYgIWhhc0F1dG9NYXJnaW5zSW5Sb3dBeGlz
KGNoaWxkKTsgfQogICAgIGJvb2wgaGFzQXV0b01hcmdpbnNJbkNvbHVtbkF4aXMoY29uc3QgUmVu
ZGVyQm94JikgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNWMxODZmYjZlMzFlMzE0YzE3OGJmZTZmOWU3NThkZTRl
N2EzOWFhNy4uM2RiODQzMDAwYTQzMmRhZTliOWUzOWZiOWU3NzAzOTlkNjQ3MDc0NyAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA
QCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTAyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+
CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gZ3JpZCBpdGVtcworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTc3CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMg
dGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDIt
MDIgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog
aW1wbGVtZW50IHRoZSBiYXNpY3MgZm9yIHNob3dpbmcvaGlkaW5nIGdyaWQgb3ZlcmxheXMKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCmluZGV4IGM1NjZhOThmYTdlNDBhMWE5MzhmOGM2YzNkZmY0YjllZDk5OGUw
NzAuLjFmZDQ0OWQzN2IzODA0ODRlZjYyZGY0MjM4YWI5YjMwMzg4Zjc2MGQgMTAwNjQ0Ci0tLSBh
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucwpAQCAtNDQ0MCwxMCArNDQ0MCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAy
NS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlv
LTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dy
aWQtYXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNC5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419114</attachid>
            <date>2021-02-03 01:44:57 -0800</date>
            <delta_ts>2021-02-03 04:14:01 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210203104456.patch</filename>
            <type>text/plain</type>
            <size>6671</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWYxYTIwYzc1NmY3YThk
NTQ1M2YwNWFlZDExNWYzMTlmMjU3NmQ0NC4uZTVjZmJiOTNkN2E2MGJlZmIxOWYyYTY2M2RiZmY0
Nzc0NTMzNTIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gZm9yIGdyaWQgaXRlbXMgYnkgY29ycmVjdGluZwor
ICAgICAgICB0aGUgYXV0by1zaXplIGRldGVybWluYXRpb24gZm9yIHJvdy9jb2x1bW5zLWF4aXMK
KyAgICAgICAgd2hlbiB0aGUgY2hpbGQgaGFzIGFzcGVjdC1yYXRpbyBzZXQuCisKKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk
OjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5n
L1JlbmRlckdyaWQuaDoKKwogMjAyMS0wMi0wMyAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29t
PgogCiAgICAgICAgIFtjc3MtZ3JpZF0gV1BUIHRlc3QgY3NzL2Nzcy1ncmlkL2dyaWQtbW9kZWwv
Z3JpZC1ib3gtc2l6aW5nLTAwMS5odG1sIGZhaWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyR3JpZC5jcHAKaW5kZXggMDM1MmFkN2YxOWE1ZmVmOTkxNzA4NmIzYTA4MzIyNDIwYzYwNjdl
Mi4uODliMDJkNTgxOTI4YTE4N2NjNDM1YjU4NzBlYTUxY2M1ZDdlYjE0YSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMTg1OSw0ICsxODU5LDM4IEBAIGNvbnN0
IGNoYXIqIFJlbmRlckdyaWQ6OnJlbmRlck5hbWUoKSBjb25zdAogICAgIHJldHVybiAiUmVuZGVy
R3JpZCI7CiB9CiAKK2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29u
c3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNB
c3BlY3RSYXRpbygpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09
IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgIC8vIEEgbm9u
LWF1dG8gaW5saW5lIHNpemUgbWVhbnMgdGhlIHNhbWUgZm9yIGJsb2NrIHNpemUKKyAgICAgICAg
ICAgIC8vIChjb2x1bW4gYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCisg
ICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCisg
ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg
ICAgY29uc3QgTGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVp
Z2h0KCk7CisgICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2lj
YWxIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2lj
YWxIZWlnaHRJc1Jlc29sdmFibGUoKSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor
ICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8g
Y2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSA6IGNoaWxkLnN0eWxlKCkud2lkdGgoKS5p
c0F1dG8oKTsKK30KKworYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25z
dCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0Fz
cGVjdFJhdGlvKCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0g
Y2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgeworICAgICAgICAgICAgLy8gQSBub24t
YXV0byBibG9jayBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBpbmxpbmUgc2l6ZQorICAgICAgICAg
ICAgLy8gKHJvdyBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KKyAgICAg
ICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNh
bEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChs
b2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VM
b2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxz
ZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUoKS5sb2dp
Y2FsV2lkdGgoKS5pc0F1dG8oKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg
ICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGls
ZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0
bygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckdyaWQuaAppbmRleCAzNzU3NmVmYTUzNTgwY2MwMjU2YzZhODE0YmQ1NWY4MGExN2Y5YjJm
Li43Y2JkOGRkZTY0ZmVkZmUyODU1OGE4YjMzNDY0ODA0ZmMyYTBmYTBjIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTE1OSw4ICsxNTksOCBAQCBwcml2YXRlOgogICAg
IFN0eWxlU2VsZkFsaWdubWVudERhdGEganVzdGlmeVNlbGZGb3JDaGlsZChjb25zdCBSZW5kZXJC
b3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKICAgICBTdHlsZVNlbGZB
bGlnbm1lbnREYXRhIGFsaWduU2VsZkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFJl
bmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlTdHJldGNoQWxpZ25t
ZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYpOwotICAgIGJvb2wgaGFzQXV0b1NpemVJbkNv
bHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gaXNIb3Jpem9u
dGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGls
ZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7IH0KLSAgICBib29sIGhhc0F1dG9TaXplSW5Sb3dB
eGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdy
aXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHls
ZSgpLmhlaWdodCgpLmlzQXV0bygpOyB9CisgICAgYm9vbCBoYXNBdXRvU2l6ZUluQ29sdW1uQXhp
cyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29sIGhhc0F1dG9TaXplSW5S
b3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dlZFRv
U3RyZXRjaENoaWxkQWxvbmdDb2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0
IHsgcmV0dXJuIGFsaWduU2VsZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Qb3Np
dGlvbjo6U3RyZXRjaCAmJiBoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjaGlsZCkgJiYgIWhhc0F1
dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNoaWxkKTsgfQogICAgIGJvb2wgYWxsb3dlZFRvU3RyZXRj
aENoaWxkQWxvbmdSb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJu
IGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpT
dHJldGNoICYmIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNoaWxkKSAmJiAhaGFzQXV0b01hcmdpbnNJ
blJvd0F4aXMoY2hpbGQpOyB9CiAgICAgYm9vbCBoYXNBdXRvTWFyZ2luc0luQ29sdW1uQXhpcyhj
b25zdCBSZW5kZXJCb3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmOWI4OTllMDMwYzNkZDQ1MzUyNDQyY2Yy
NmNjYjcwNjEwNjUwM2I0Li40YTg1NzEwOGU4ZTQ3MDdmOGY5YmNhYWFlYTkxNDkyMDMxMjY0MThh
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMDMgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBncmlkIGl0ZW1zCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NzcKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc29t
ZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwog
MjAyMS0wMi0wMiAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb
R0xJQl0gR2FyZGVuaW5nIGRlYnVnIHRpbWVvdXRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBjNTY2
YTk4ZmE3ZTQwYTFhOTM4ZjhjNmMzZGZmNGI5ZWQ5OThlMDcwLi4xZmQ0NDlkMzdiMzgwNDg0ZWY2
MmRmNDIzOGFiOWIzMDM4OGY3NjBkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ0NDAsMTAgKzQ0
NDAsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y
YXRpby0wMDcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9ncmlkLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTEuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTIuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMt
c2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9pbnRyaW5zaWMtc2l6ZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419121</attachid>
            <date>2021-02-03 04:14:07 -0800</date>
            <delta_ts>2021-02-03 05:05:59 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220977-20210203131405.patch</filename>
            <type>text/plain</type>
            <size>6712</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk4Y2UxOGYxMTVlOGU5
OWM3NDY5YzlhNTRjYjBiNjc0OGZmZTkwMi4uNTNhZmE5MTE3MDA3OWFlNjQ3OThmZGRkZGUzNmY0
NTMyZTU5Nzk5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAyLTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZ3JpZCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwOTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmF2aWVyIEZlcm5hbmRlei4KKwor
ICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBmb3IgZ3JpZCBpdGVtcyBieSBjb3JyZWN0aW5n
CisgICAgICAgIHRoZSBhdXRvLXNpemUgZGV0ZXJtaW5hdGlvbiBmb3Igcm93L2NvbHVtbnMtYXhp
cworICAgICAgICB3aGVuIHRoZSBjaGlsZCBoYXMgYXNwZWN0LXJhdGlvIHNldC4KKworICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy
aWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl
bmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJp
bmcvUmVuZGVyR3JpZC5oOgorCiAyMDIxLTAyLTAxICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3
ZWJraXQub3JnPgogCiAgICAgICAgIEFuaW1hdGlvbiBvZiAicm90YXRlIiBvciAic2NhbGUiIHBy
b3BlcnR5IGRvZXMgbm90IGNvcnJlY3RseSBhY2NvdW50IGZvciBzdGF0aWMgInRyYW5zbGF0ZSIg
cHJvcGVydHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCAwMzUy
YWQ3ZjE5YTVmZWY5OTE3MDg2YjNhMDgzMjI0MjBjNjA2N2UyLi42MmVjZTNjYzA1NTBkZTNhYmE1
YjJhZGQxYmUzYzZhZDk0MzU1YWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdy
aWQuY3BwCkBAIC0xODU5LDQgKzE4NTksMzYgQEAgY29uc3QgY2hhciogUmVuZGVyR3JpZDo6cmVu
ZGVyTmFtZSgpIGNvbnN0CiAgICAgcmV0dXJuICJSZW5kZXJHcmlkIjsKIH0KIAorYm9vbCBSZW5k
ZXJHcmlkOjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj
b25zdAoreworICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICAg
ICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3Jp
dGluZ01vZGUoKSkgeworICAgICAgICAgICAgLy8gQSBub24tYXV0byBpbmxpbmUgc2l6ZSBtZWFu
cyB0aGUgc2FtZSBmb3IgYmxvY2sgc2l6ZSAoY29sdW1uIGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0
aGUgYXNwZWN0IHJhdGlvLgorICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxX
aWR0aCgpLmlzQXV0bygpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg
fSBlbHNlIHsKKyAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxk
LnN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQu
aXNGaXhlZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNo
aWxkLnBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAg
ICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gaXNIb3Jpem9u
dGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBjaGls
ZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7Cit9CisKK2Jvb2wgUmVuZGVyR3JpZDo6aGFzQXV0
b1NpemVJblJvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKK3sKKyAgICBpZiAo
Y2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250
YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAg
ICAgICAgICAgIC8vIEEgbm9uLWF1dG8gYmxvY2sgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgaW5s
aW5lIHNpemUgKHJvdyBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KKyAg
ICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9n
aWNhbEhlaWdodCgpOworICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8
IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRh
Z2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQorICAgICAgICAgICAgICAgIHJldHVybiBm
YWxzZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmICghY2hpbGQuc3R5bGUoKS5s
b2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Cisg
ICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBj
aGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlz
QXV0bygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckdyaWQuaAppbmRleCAzNzU3NmVmYTUzNTgwY2MwMjU2YzZhODE0YmQ1NWY4MGExN2Y5
YjJmLi43Y2JkOGRkZTY0ZmVkZmUyODU1OGE4YjMzNDY0ODA0ZmMyYTBmYTBjIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTE1OSw4ICsxNTksOCBAQCBwcml2YXRlOgog
ICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEganVzdGlmeVNlbGZGb3JDaGlsZChjb25zdCBSZW5k
ZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKICAgICBTdHlsZVNl
bGZBbGlnbm1lbnREYXRhIGFsaWduU2VsZkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYsIGNvbnN0
IFJlbmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlTdHJldGNoQWxp
Z25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYpOwotICAgIGJvb2wgaGFzQXV0b1NpemVJ
bkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gaXNIb3Jp
em9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgOiBj
aGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7IH0KLSAgICBib29sIGhhc0F1dG9TaXplSW5S
b3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRh
bFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5z
dHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOyB9CisgICAgYm9vbCBoYXNBdXRvU2l6ZUluQ29sdW1u
QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKKyAgICBib29sIGhhc0F1dG9TaXpl
SW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dl
ZFRvU3RyZXRjaENoaWxkQWxvbmdDb2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv
bnN0IHsgcmV0dXJuIGFsaWduU2VsZkZvckNoaWxkKGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Q
b3NpdGlvbjo6U3RyZXRjaCAmJiBoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjaGlsZCkgJiYgIWhh
c0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNoaWxkKTsgfQogICAgIGJvb2wgYWxsb3dlZFRvU3Ry
ZXRjaENoaWxkQWxvbmdSb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0
dXJuIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9u
OjpTdHJldGNoICYmIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNoaWxkKSAmJiAhaGFzQXV0b01hcmdp
bnNJblJvd0F4aXMoY2hpbGQpOyB9CiAgICAgYm9vbCBoYXNBdXRvTWFyZ2luc0luQ29sdW1uQXhp
cyhjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwOGUzNGVkZWE2N2RiNzc4MDQ0YjY3
ZTkxMzNlMjIyMDU0ZWU4NjUzLi4xMzMzYzI1YzMyMWIyNDFhY2VlMzc5NzRmNWVjZmU2ZWE5ZTVh
N2VhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDItMDMgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBncmlkIGl0ZW1z
CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA5NzcK
KworICAgICAgICBSZXZpZXdlZCBieSBKYXZpZXIgRmVybmFuZGV6LgorCisgICAgICAgIEVuYWJs
ZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25z
OgorCiAyMDIxLTAyLTAzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAg
ICAgICBFbmFibGUgd2VicnRjIHZpZGVvIGNhcHR1cmUgaW4gR1BVUHJvY2VzcyBmb3IgaU9TIFdl
YktpdFRlc3RSdW5uZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGM1NjZhOThmYTdlNDBhMWE5Mzhm
OGM2YzNkZmY0YjllZDk5OGUwNzAuLjFmZDQ0OWQzN2IzODA0ODRlZjYyZGY0MjM4YWI5YjMwMzg4
Zjc2MGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQ0MCwxMCArNDQ0MCw2IEBAIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAwNy5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJh
dGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2dyaWQtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXpl
LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2lu
dHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>