<?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>219679</bug_id>
          
          <creation_ts>2020-12-09 05:51:00 -0800</creation_ts>
          <short_desc>Support aspect-ratio on flexbox items</short_desc>
          <delta_ts>2021-02-19 22:34:13 -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>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1713116</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-12-09 05:51:00 -0800</bug_when>
    <thetext>Support aspect-ratio on flexbox children.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1713117</commentid>
    <comment_count>1</comment_count>
      <attachid>415748</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-12-09 05:52:33 -0800</bug_when>
    <thetext>Created attachment 415748
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1713160</commentid>
    <comment_count>2</comment_count>
      <attachid>415761</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2020-12-09 08:32:38 -0800</bug_when>
    <thetext>Created attachment 415761
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1715092</commentid>
    <comment_count>3</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-12-16 05:51:16 -0800</bug_when>
    <thetext>&lt;rdar://problem/72382311&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1717624</commentid>
    <comment_count>4</comment_count>
      <attachid>417080</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-06 05:25:56 -0800</bug_when>
    <thetext>Created attachment 417080
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1718258</commentid>
    <comment_count>5</comment_count>
      <attachid>417261</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-08 04:28:39 -0800</bug_when>
    <thetext>Created attachment 417261
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720370</commentid>
    <comment_count>6</comment_count>
      <attachid>417841</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-18 11:22:06 -0800</bug_when>
    <thetext>Created attachment 417841
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720875</commentid>
    <comment_count>7</comment_count>
      <attachid>417966</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-20 07:13:54 -0800</bug_when>
    <thetext>Created attachment 417966
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720895</commentid>
    <comment_count>8</comment_count>
      <attachid>417971</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-20 08:29:52 -0800</bug_when>
    <thetext>Created attachment 417971
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723013</commentid>
    <comment_count>9</comment_count>
      <attachid>418553</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-27 09:18:09 -0800</bug_when>
    <thetext>Created attachment 418553
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723738</commentid>
    <comment_count>10</comment_count>
      <attachid>418734</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-29 09:03:44 -0800</bug_when>
    <thetext>Created attachment 418734
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728171</commentid>
    <comment_count>11</comment_count>
      <attachid>420005</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-11 10:59:07 -0800</bug_when>
    <thetext>Created attachment 420005
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1729633</commentid>
    <comment_count>12</comment_count>
      <attachid>420456</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-16 05:38:40 -0800</bug_when>
    <thetext>Created attachment 420456
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1730217</commentid>
    <comment_count>13</comment_count>
      <attachid>420624</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-17 03:32:35 -0800</bug_when>
    <thetext>Created attachment 420624
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1730223</commentid>
    <comment_count>14</comment_count>
      <attachid>420628</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-17 04:52:43 -0800</bug_when>
    <thetext>Created attachment 420628
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1730794</commentid>
    <comment_count>15</comment_count>
      <attachid>420814</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-18 02:08:45 -0800</bug_when>
    <thetext>Created attachment 420814
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731258</commentid>
    <comment_count>16</comment_count>
      <attachid>420937</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-19 01:00:20 -0800</bug_when>
    <thetext>Created attachment 420937
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731298</commentid>
    <comment_count>17</comment_count>
      <attachid>420937</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-02-19 03:26:46 -0800</bug_when>
    <thetext>Comment on attachment 420937
Patch

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

Looking great, just one question

&gt; Source/WebCore/rendering/RenderBox.cpp:682
&gt; +    if (logicalMinHeight.isAuto() &amp;&amp; shouldComputeLogicalHeightFromAspectRatio() &amp;&amp; intrinsicContentHeight &amp;&amp; intrinsicContentHeight != LayoutUnit::max() &amp;&amp; styleToUse.overflowBlockDirection() == Overflow::Visible)

In which cases intrinsicContentHeight is max() ? Shouldn&apos;t it just use nullopt to mean an indefinite size? Looks like we&apos;re kind of duplicating checks</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731309</commentid>
    <comment_count>18</comment_count>
      <attachid>420937</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-19 05:43:57 -0800</bug_when>
    <thetext>Comment on attachment 420937
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:682
&gt;&gt; +    if (logicalMinHeight.isAuto() &amp;&amp; shouldComputeLogicalHeightFromAspectRatio() &amp;&amp; intrinsicContentHeight &amp;&amp; intrinsicContentHeight != LayoutUnit::max() &amp;&amp; styleToUse.overflowBlockDirection() == Overflow::Visible)
&gt; 
&gt; In which cases intrinsicContentHeight is max() ? Shouldn&apos;t it just use nullopt to mean an indefinite size? Looks like we&apos;re kind of duplicating checks

This is initiated by RenderFlexibleBox::layoutFlexItems calling mainAxisContentExtent(LayoutUnit::max()). You have a great point however looking at the code I think it will be difficult to introduce Optional here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731311</commentid>
    <comment_count>19</comment_count>
      <attachid>420958</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-19 05:58:42 -0800</bug_when>
    <thetext>Created attachment 420958
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731326</commentid>
    <comment_count>20</comment_count>
      <attachid>420958</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-02-19 07:44:14 -0800</bug_when>
    <thetext>Comment on attachment 420958
Patch

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

Awesome addition! Just one nit.

&gt; Source/WebCore/rendering/RenderBox.cpp:2947
&gt; +            if (computedValues.m_extent != LayoutUnit::max())

Mind adding a comment here explaining that using max() is the way callers have to tell this method to use a nullopt intrinsicHeight? Maybe even pointing to the RenderFlexibleBox code.

Code should be self-explanatory but in this case the context is not enough and I think it pays off to add a comment and ease the job of future reviewers :)

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:550
&gt; +}

I guess it&apos;s OK to have this here now. I hope we could eventually add the style().hasAspectRatio() check to the RenderBox::hasAspectRatio() in the future, but that&apos;s a far more intrusive change indeed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731377</commentid>
    <comment_count>21</comment_count>
      <attachid>420979</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-19 09:28:29 -0800</bug_when>
    <thetext>Created attachment 420979
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1731762</commentid>
    <comment_count>22</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-02-19 22:34:11 -0800</bug_when>
    <thetext>Committed r273193: &lt;https://commits.webkit.org/r273193&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 420979.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415748</attachid>
            <date>2020-12-09 05:52:33 -0800</date>
            <delta_ts>2020-12-09 08:32:34 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20201209145231.patch</filename>
            <type>text/plain</type>
            <size>8725</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQzNjEyNTkwMjU1ODdl
M2ZlOTFmNTA2ODkyMjJhYzFiMGZlOGNiYy4uM2M4ZGEzYTBmM2RiZWI0MDNjZmE5NDA0OGQwYzFi
ZjliMmIzYzM1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTA5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNoaWxkSGFzQXNwZWN0UmF0aW8pOgorICAgICAgICAo
V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxk
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJh
dGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRl
TWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVp
Z2h0IGNvbnN0KToKKwogMjAyMC0xMi0wOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgog
CiAgICAgICAgIERpcnR5IGxpbmUgYm94ZXMgd2hlbiBSZW5kZXJNZW51TGlzdCB0ZXh0IGNoYW5n
ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmlu
ZGV4IDJlN2Y0NGJiYWQ3YmYwMTI5MDdhMTlkYzU2ZjcyNTRhNzRmYTg1NjYuLjZkNzE5ZDM0OGZj
NWQ4MDYwOWFmNjA3ZTZlYmFkOGIzMGIzNDFjYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTQzLDYgKzU0MywxMSBAQCBMYXlvdXRV
bml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBj
b250ZW50TG9naWNhbEhlaQogICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjb21wdXRlZFZhbHVl
cy5tX2V4dGVudCAtIGJvcmRlclBhZGRpbmdBbmRTY3JvbGxiYXIpOwogfQogCitzdGF0aWMgYm9v
bCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCit7CisgICAgcmV0
dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRp
bygpOworfQorCiBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0
ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgU2l6ZVR5cGUg
c2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYgc2l6ZSkKIHsKICAgICAvLyBJZiB3ZSBoYXZlIGEgaG9y
aXpvbnRhbCBmbG93LCB0aGF0IG1lYW5zIHRoZSBtYWluIHNpemUgaXMgdGhlIHdpZHRoLgpAQCAt
NTY5LDcgKzU3NCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgLy8gb3VyIGxvZ2lj
YWwgd2lkdGggaXMgYXV0bywgd2UgY2FuIGp1c3QgdXNlIG91ciBjYWNoZWQgdmFsdWUuIFNvIGxl
dCdzIGRvCiAgICAgLy8gdGhhdCBoZXJlLiAoQ29tcGFyZSBjb2RlIGluIExheW91dEJsb2NrOjpj
b21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocykKICAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBh
ZGRpbmcgPSBjaGlsZC5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7Ci0gICAgaWYgKGNo
aWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNoaWxkLmhhc0FzcGVjdFJh
dGlvKCkpIHsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAm
JiAhY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpIHsKICAgICAgICAgaWYgKHNpemUudHlwZSgp
ID09IE1pbkNvbnRlbnQpCiAgICAgICAgICAgICByZXR1cm4gY2hpbGQubWluUHJlZmVycmVkTG9n
aWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQYWRkaW5nOwogICAgICAgICBpZiAoc2l6ZS50eXBlKCkg
PT0gTWF4Q29udGVudCkKQEAgLTczOSw5ICs3NDQsOSBAQCBMYXlvdXRQb2ludCBSZW5kZXJGbGV4
aWJsZUJveDo6Zmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KQogCiBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJl
bmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RSYXRpbygp
KQorICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJldHVybiBm
YWxzZTsKLSAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkgeworICAgIGlm
ICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYmIGNoaWxkLnN0eWxlKCkuYXNwZWN0
UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvKSB7CiAgICAgICAgIC8vIFdlIGNh
bid0IGNvbXB1dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCiAgICAgICAgIHJldHVybiBmYWxzZTsK
ICAgICB9CkBAIC03NTYsNyArNzYxLDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hp
bGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogICAgIAogTGF5b3V0
VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNp
bmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxlbmd0aCkgY29uc3QK
IHsKLSAgICBBU1NFUlQoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSk7CisgICAgQVNTRVJUKGNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKICAgICBBU1NFUlQoY2hpbGQuaW50cmluc2ljU2l6ZSgp
LmhlaWdodCgpKTsKICAgICAKICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjcm9zc1NpemU7CkBA
IC03NzEsNiArNzc2LDggQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1h
aW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICAKICAgICBjb25z
dCBMYXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7
CiAgICAgZG91YmxlIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgp
IC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICBpZiAoY2hpbGQu
c3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0Fu
ZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgICAgICByYXRpbyA9
IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RS
YXRpb0hlaWdodCgpOwogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCiAgICAgICAgIHJldHVy
biBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwogICAgIHJldHVybiBMYXlv
dXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOwpAQCAtMTE0MSw3ICsxMTQ4LDcgQEAg
TGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAgICAgLy8gZW5zdXJlIGl0J3MgdmFsaWQgdGhy
b3VnaCB0aGUgdmlydHVhbCBjYWxscyBvZiBjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRI
ZWlnaHRVc2luZy4KICAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50U2l6ZSA9IGNvbXB1dGVNYWlu
QXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBMZW5ndGgoTWluQ29udGVudCkpLnZh
bHVlT3IoMCk7CiAgICAgICAgIEFTU0VSVChjb250ZW50U2l6ZSA+PSAwKTsKLSAgICAgICAgaWYg
KGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgp
ID4gMCkKKyAgICAgICAgaWYgKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpICYmIGNoaWxkLmlu
dHJpbnNpY1NpemUoKS5oZWlnaHQoKSA+IDApCiAgICAgICAgICAgICBjb250ZW50U2l6ZSA9IGFk
anVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCBjb250
ZW50U2l6ZSk7CiAgICAgICAgIGNvbnRlbnRTaXplID0gc3RkOjptaW4oY29udGVudFNpemUsIG1h
eEV4dGVudC52YWx1ZU9yKGNvbnRlbnRTaXplKSk7CiAgICAgICAgIApAQCAtMTU1Niw3ICsxNTYz
LDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhl
aWdodChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg
ICAvLyBBc3BlY3QgcmF0aW8gaXMgcHJvcGVybHkgaGFuZGxlZCBieSBSZW5kZXJSZXBsYWNlZCBk
dXJpbmcgbGF5b3V0LgotICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGQu
aGFzQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNo
aWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBy
ZXR1cm4gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTg0
MDE3ZTM2MWRjNTYzODAxMTgyNDViMGVkM2I5OWJjYmFkZDFhNy4uZDY1MzcyYTJhNmIxNjAzMDJh
NDQ3OTg0YzY0ZWVlMmVhZDc0MTgxNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTEyLTA5
ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3Qt
cmF0aW8gb24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgVW5za2lwIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAg
ICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjAtMTItMDggIERpZWdvIFBpbm8gR2FyY2lh
ICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJQl0gUkVHUkVTU0lPTihyMjcwNTI2
KTogU2V2ZXJhbCBVUkwgcmVsYXRlZCB0ZXN0cyBhcmUgZmFpbGluZwpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
aW5kZXggYzVhOWQ2ZDM4Mzg3MmYwOWM4MTA4MjM5MmM3YTBlODA4NmZlMWQ4Ny4uNjY4ZGU5MWY1
YmJkNTM1MzcwN2UyMmUzZGJkMjlhNWE3YzExZjI5YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00
NDQxLDIwICs0NDQxLDExIEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI3Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJh
dGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMi5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAx
Ni5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxOS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415761</attachid>
            <date>2020-12-09 08:32:38 -0800</date>
            <delta_ts>2021-01-06 05:25:50 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20201209173237.patch</filename>
            <type>text/plain</type>
            <size>8736</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg4ODc2NzhhOGFlYjVi
MDZmZWMzNzI3ZjNiYzYwODQzYmNhZTlkOC4uMjVjNTUxMGY3NGI0ZGE3MGViMmI3OTBmYjA4M2Qx
MzdmMjliNTJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEyLTA5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNoaWxkSGFzQXNwZWN0UmF0aW8pOgorICAgICAgICAo
V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxk
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJh
dGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRl
TWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVp
Z2h0IGNvbnN0KToKKwogMjAyMC0xMi0wNCAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJA
aWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWZsZXhdIEltcGxlbWVudCA5LjguMSBEZWZpbml0
ZSBhbmQgSW5kZWZpbml0ZSBTaXplcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggYmU2MTI1NjQ4MTZjZjI4NTAxMTFlZTllNmE0OGM1NGYx
Yjk5OTE5My4uZDcxNjQxMGUzZGFmZmI4YzE5Y2YzYWJlMzg1YTE5YzE5ZGQwMDdmYiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDMs
NiArNTQzLDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVu
dEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4
KDBfbHUsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJh
cik7CiB9CiAKK3N0YXRpYyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkKK3sKKyAgICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5z
dHlsZSgpLmhhc0FzcGVjdFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRl
ckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJC
b3gmIGNoaWxkLCBTaXplVHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAg
IC8vIElmIHdlIGhhdmUgYSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6
ZSBpcyB0aGUgd2lkdGguCkBAIC01NjksNyArNTc0LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJl
bmQKICAgICAvLyBvdXIgbG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3Vy
IGNhY2hlZCB2YWx1ZS4gU28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNv
ZGUgaW4gTGF5b3V0QmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExh
eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2Fs
V2lkdGgoKTsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAm
JiAhY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2lj
YWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAg
ICAgICBpZiAoc2l6ZS50eXBlKCkgPT0gTWluQ29udGVudCkKICAgICAgICAgICAgIHJldHVybiBj
aGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAg
ICAgIGlmIChzaXplLnR5cGUoKSA9PSBNYXhDb250ZW50KQpAQCAtNzM5LDkgKzc0NCw5IEBAIExh
eW91dFBvaW50IFJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxk
QXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNo
aWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxk
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgp
LmhlaWdodCgpKSB7CisgICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYg
Y2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OkF1dG8p
IHsKICAgICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4KICAg
ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTc1Niw3ICs3NjEsNyBAQCBib29sIFJlbmRl
ckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp
IGNvbnN0CiAgICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNp
emVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jv
c3NTaXplTGVuZ3RoKSBjb25zdAogewotICAgIEFTU0VSVChjaGlsZC5oYXNBc3BlY3RSYXRpbygp
KTsKKyAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogICAgIEFTU0VSVChj
aGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpOwogICAgIAogICAgIE9wdGlvbmFsPExheW91
dFVuaXQ+IGNyb3NzU2l6ZTsKQEAgLTc3Niw2ICs3ODEsOCBAQCBMYXlvdXRVbml0IFJlbmRlckZs
ZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5k
ZXJCbwogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0gY2hpbGQu
aW50cmluc2ljU2l6ZSgpOwogICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53
aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7
CisgICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9U
eXBlOjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RS
YXRpb1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkK
KyAgICAgICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxk
LnN0eWxlKCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygp
KQogICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsK
ICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKQEAgLTEx
NTcsNyArMTE2NCw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxk
U2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgIC8vIGVuc3Vy
ZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1YWwgY2FsbHMgb2YgY29tcHV0ZUludHJpbnNp
Y0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCiAgICAgICAgIExheW91dFVuaXQgY29udGVudFNp
emUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgTGVuZ3Ro
KE1pbkNvbnRlbnQpKS52YWx1ZU9yKDApOwogICAgICAgICBBU1NFUlQoY29udGVudFNpemUgPj0g
MCk7Ci0gICAgICAgIGlmIChjaGlsZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNp
Y1NpemUoKS5oZWlnaHQoKSA+IDApCisgICAgICAgIGlmIChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSAmJiBjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgPiAwKQogICAgICAgICAgICAg
Y29udGVudFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFu
ZE1heChjaGlsZCwgY29udGVudFNpemUpOwogICAgICAgICBjb250ZW50U2l6ZSA9IHN0ZDo6bWlu
KGNvbnRlbnRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjb250ZW50U2l6ZSkpOwogICAgICAgICAK
QEAgLTE1NzIsNyArMTU3OSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0
Y2hDaGlsZExvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKICAgICAgICAgcmV0
dXJuIGZhbHNlOwogCiAgICAgLy8gQXNwZWN0IHJhdGlvIGlzIHByb3Blcmx5IGhhbmRsZWQgYnkg
UmVuZGVyUmVwbGFjZWQgZHVyaW5nIGxheW91dC4KLSAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBs
YWNlZCgpICYmIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKGNoaWxkLmlzUmVuZGVy
UmVwbGFjZWQoKSAmJiBjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0dXJu
IGZhbHNlOwogCiAgICAgcmV0dXJuIGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzQXV0
bygpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IDFmYzNiNTMzYzk0Y2IzMjliMmI1NTNmMGQ0OGE2MDZkOTUxOWNiNzUuLjBj
MGY5MGM2OTVkZmFiNGM3MTRlZWE1MmY5MDA3NDY5MTc4OGU2ZmYgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NCBAQAorMjAyMC0xMi0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg
IFN1cHBvcnQgYXNwZWN0LXJhdGlvIG9uIGZsZXhib3ggY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY3OQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuc2tpcCBzb21lIHRlc3RzIHRoYXQg
cGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIwLTEyLTA0ICBT
ZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3Mt
ZmxleF0gSW1wbGVtZW50IDkuOC4xIERlZmluaXRlIGFuZCBJbmRlZmluaXRlIFNpemVzCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCA4MTg2YjU1NGM1ODNjOTdmNzQxYWRhNzkyZDk4MDMzNTk0ZjRhZTA2
Li5mMTcxMjU4YmY0MWFmZTFiNjViMWY1YzQ5YTkyNmU4NWRkMmM4ZmUwIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTQ0MzksMjAgKzQ0MzksMTEgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0w
MjcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9j
ay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIzLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417080</attachid>
            <date>2021-01-06 05:25:56 -0800</date>
            <delta_ts>2021-01-08 04:28:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210106142554.patch</filename>
            <type>text/plain</type>
            <size>8950</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE2MDMxZjExNjkzZTY3
YzljOGUwNTJhMWRhNjkxNTBkZTM3YzkxZC4uYmRlOTI4NzVjZTAxZmZhMTdkYWMwYmUxNjE5NGVj
ZmM1MTI5ZmVjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNoaWxkSGFzQXNwZWN0UmF0aW8pOgorICAgICAgICAo
V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxk
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJh
dGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRl
TWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVp
Z2h0IGNvbnN0KToKKwogMjAyMS0wMS0wNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGln
YWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTltyMjcwOTQ3XVtHU3RyZWFtZXJdOiBEZWFk
bG9ja3MgYXVkaW8gcmVuZGVyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcAppbmRleCBhNzM2YzQ1YTgxNzZjYzZkOWE5NjY4MzQ4NTZmNzE3MWRi
MGE4MWEyLi4zZTA3NWUxZGIyMmVjODg1YWZkOWE1YTUxZGNhYmQ2ZTM0ZGE4NTQ5IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTU0Myw2
ICs1NDMsMTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50
RXh0ZW50KExheW91dFVuaXQgY29udGVudExvZ2ljYWxIZWkKICAgICByZXR1cm4gc3RkOjptYXgo
MF9sdSwgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFy
KTsKIH0KIAorc3RhdGljIGJvb2wgY2hpbGRIYXNBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gm
IGNoaWxkKQoreworICAgIHJldHVybiBjaGlsZC5oYXNBc3BlY3RSYXRpbygpIHx8IGNoaWxkLnN0
eWxlKCkuaGFzQXNwZWN0UmF0aW8oKTsKK30KKwogT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVy
RmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQsIFNpemVUeXBlIHNpemVUeXBlLCBjb25zdCBMZW5ndGgmIHNpemUpCiB7CiAgICAg
Ly8gSWYgd2UgaGF2ZSBhIGhvcml6b250YWwgZmxvdywgdGhhdCBtZWFucyB0aGUgbWFpbiBzaXpl
IGlzIHRoZSB3aWR0aC4KQEAgLTU2OSw3ICs1NzQsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBS
ZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVu
ZAogICAgIC8vIG91ciBsb2dpY2FsIHdpZHRoIGlzIGF1dG8sIHdlIGNhbiBqdXN0IHVzZSBvdXIg
Y2FjaGVkIHZhbHVlLiBTbyBsZXQncyBkbwogICAgIC8vIHRoYXQgaGVyZS4gKENvbXBhcmUgY29k
ZSBpbiBMYXlvdXRCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpCiAgICAgTGF5
b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nID0gY2hpbGQuYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxX
aWR0aCgpOwotICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYm
ICFjaGlsZC5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNh
bFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKSB7CiAgICAg
ICAgIGlmIChzaXplLnR5cGUoKSA9PSBNaW5Db250ZW50KQogICAgICAgICAgICAgcmV0dXJuIGNo
aWxkLm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIC0gYm9yZGVyQW5kUGFkZGluZzsKICAgICAg
ICAgaWYgKHNpemUudHlwZSgpID09IE1heENvbnRlbnQpCkBAIC03MzksOSArNzQ0LDkgQEAgTGF5
b3V0UG9pbnQgUmVuZGVyRmxleGlibGVCb3g6OmZsb3dBd2FyZUxvY2F0aW9uRm9yQ2hpbGQoY29u
c3QgUmVuZGVyQm94JiBjaGlsZCkKIAogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRB
c3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewotICAgIGlmICghY2hp
bGQuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQp
KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCku
aGVpZ2h0KCkpIHsKKyAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSAmJiBj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0bykg
ewogICAgICAgICAvLyBXZSBjYW4ndCBjb21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgogICAg
ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtNzU2LDcgKzc2MSw3IEBAIGJvb2wgUmVuZGVy
RmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkg
Y29uc3QKICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6
ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9z
c1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkp
OworICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSk7CiAgICAgQVNTRVJUKGNo
aWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSk7CiAKICAgICBhdXRvIGFkanVzdEZvckJveFNp
emluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExh
eW91dFVuaXQgewpAQCAtNzg3LDYgKzc5Miw4IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVC
b3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAK
ICAgICBjb25zdCBMYXlvdXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5z
aWNTaXplKCk7CiAgICAgZG91YmxlIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCku
dG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJh
dGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlw
ZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgICAg
ICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUo
KS5hc3BlY3RSYXRpb0hlaWdodCgpOwogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCiAgICAg
ICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwogICAgIHJl
dHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOwpAQCAtMTE2Nyw3ICsx
MTc0LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9y
TWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAgICAgLy8gZW5zdXJlIGl0J3Mg
dmFsaWQgdGhyb3VnaCB0aGUgdmlydHVhbCBjYWxscyBvZiBjb21wdXRlSW50cmluc2ljTG9naWNh
bENvbnRlbnRIZWlnaHRVc2luZy4KICAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50U2l6ZSA9IGNv
bXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBMZW5ndGgoTWluQ29u
dGVudCkpLnZhbHVlT3IoMCk7CiAgICAgICAgIEFTU0VSVChjb250ZW50U2l6ZSA+PSAwKTsKLSAg
ICAgICAgaWYgKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgp
LmhlaWdodCgpID4gMCkKKyAgICAgICAgaWYgKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpICYm
IGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSA+IDApCiAgICAgICAgICAgICBjb250ZW50
U2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNo
aWxkLCBjb250ZW50U2l6ZSk7CiAgICAgICAgIGNvbnRlbnRTaXplID0gc3RkOjptaW4oY29udGVu
dFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNvbnRlbnRTaXplKSk7CiAgICAgICAgIApAQCAtMTU4
Miw3ICsxNTg5LDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxk
TG9naWNhbEhlaWdodChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQogICAgICAgICByZXR1cm4gZmFs
c2U7CiAKICAgICAvLyBBc3BlY3QgcmF0aW8gaXMgcHJvcGVybHkgaGFuZGxlZCBieSBSZW5kZXJS
ZXBsYWNlZCBkdXJpbmcgbGF5b3V0LgotICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkg
JiYgY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNl
ZCgpICYmIGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7
CiAKICAgICByZXR1cm4gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
aW5kZXggOWE0Zjc0MDg3NzA5ZTQ0YzE1MzY5YzUwZWZjMDFlNTJkZjJiYjBhZi4uYTQ3NTIzMDE3
ZGQ3YTQwMWU5ZDg2Y2Q2YjNlOTEzMTBiNjQ2ZGY3ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIxLTAxLTA2ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9y
dCBhc3BlY3QtcmF0aW8gb24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lwIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5v
dy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMDYgIFlvdWVubiBG
YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjcyMjcp
OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3hoci9ldmVudC10aW1lb3V0LmFueS5o
dG1sIGlzIGEgZmxha3kgZmFpbHVyZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj
dGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggN2FiZGZjOTNkMDFi
ZTgzYWRkMTlkNmQ1NWQyZTljYjJhMzA5OTczZS4uZTRmODA1N2QzZWYzNGZmMjU5ODEzZWUyNzY2
NjQxY2JhMjI3MjBmOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwor
KysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDQxLDIwICs0NDQxLDExIEBA
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz
cGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMi5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNi5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxOS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAy
MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417261</attachid>
            <date>2021-01-08 04:28:39 -0800</date>
            <delta_ts>2021-01-18 11:22:02 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210108132838.patch</filename>
            <type>text/plain</type>
            <size>9929</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY0ZTU4MGFmODY5NWNl
OTNiNzVkM2VjOTFhN2FhMzM2NDczMDJjMi4uZjAzZmQyYTM0OThlOWYxOWE1YTIyOTc0MDEyMTYz
NWI2MDMyOGZkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGlsZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGls
ZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RS
YXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0
ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6
UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAg
IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhl
aWdodCBjb25zdCk6CisKIDIwMjEtMDEtMDggIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2Fs
dmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtFTUVdW1RodW5kZXJdIEFj
Y2VwdCBubyBwcm90ZWN0aW9uIHN5c3RlbSBzcGVjaWZpYyBjYXBzIGZvciBDRU5DCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDcwNmQ5Y2IwYWNjMWMwYzQ4ODQ2MWY1
YzBiMjM1NzdmOGFiNTY0NDEuLmIxNGNmZDg5NDczNTdmNGJhYTRjZjU4NDY1MGQ3ZjkxYTBmNWUy
ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC01MDEwLDcgKzUw
MTAsNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl
Y3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKCFzdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy
b21Bc3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0Zp
eGVkKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgp
KQorICAgIGlmICghaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSAmJiAhc2hvdWxkQ29tcHV0
ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgpLmxvZ2lj
YWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVyY2Vu
dE9yQ2FsY3VsYXRlZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1
ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmlu
ZGV4IGE3MzZjNDVhODE3NmNjNmQ5YTk2NjgzNDg1NmY3MTcxZGIwYTgxYTIuLmEzOTMzZTZlOTU3
ZWU3MjI3MTMzZjhkOWY4MWI3MzJjN2ZjNWFmYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTQzLDYgKzU0MywxMSBAQCBMYXlvdXRV
bml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBj
b250ZW50TG9naWNhbEhlaQogICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjb21wdXRlZFZhbHVl
cy5tX2V4dGVudCAtIGJvcmRlclBhZGRpbmdBbmRTY3JvbGxiYXIpOwogfQogCitzdGF0aWMgYm9v
bCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCit7CisgICAgcmV0
dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRp
bygpOworfQorCiBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0
ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgU2l6ZVR5cGUg
c2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYgc2l6ZSkKIHsKICAgICAvLyBJZiB3ZSBoYXZlIGEgaG9y
aXpvbnRhbCBmbG93LCB0aGF0IG1lYW5zIHRoZSBtYWluIHNpemUgaXMgdGhlIHdpZHRoLgpAQCAt
NTY5LDcgKzU3NCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgLy8gb3VyIGxvZ2lj
YWwgd2lkdGggaXMgYXV0bywgd2UgY2FuIGp1c3QgdXNlIG91ciBjYWNoZWQgdmFsdWUuIFNvIGxl
dCdzIGRvCiAgICAgLy8gdGhhdCBoZXJlLiAoQ29tcGFyZSBjb2RlIGluIExheW91dEJsb2NrOjpj
b21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocykKICAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBh
ZGRpbmcgPSBjaGlsZC5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7Ci0gICAgaWYgKGNo
aWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNoaWxkLmhhc0FzcGVjdFJh
dGlvKCkpIHsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAm
JiAhY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpIHsKICAgICAgICAgaWYgKHNpemUudHlwZSgp
ID09IE1pbkNvbnRlbnQpCiAgICAgICAgICAgICByZXR1cm4gY2hpbGQubWluUHJlZmVycmVkTG9n
aWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQYWRkaW5nOwogICAgICAgICBpZiAoc2l6ZS50eXBlKCkg
PT0gTWF4Q29udGVudCkKQEAgLTczOSw5ICs3NDQsOSBAQCBMYXlvdXRQb2ludCBSZW5kZXJGbGV4
aWJsZUJveDo6Zmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KQogCiBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJl
bmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RSYXRpbygp
KQorICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJldHVybiBm
YWxzZTsKLSAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkgeworICAgIGlm
ICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgpLmhhc0Fz
cGVjdFJhdGlvKCkpIHsKICAgICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlvIGluIHRo
aXMgY2FzZS4KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTc1Niw4ICs3NjEsNyBA
QCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRl
ckJveCYgY2hpbGQpIGNvbnN0CiAgICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk
LCBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoKSBjb25zdAogewotICAgIEFTU0VSVChjaGlsZC5oYXNB
c3BlY3RSYXRpbygpKTsKLSAgICBBU1NFUlQoY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgp
KTsKKyAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogCiAgICAgYXV0byBh
ZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBMZW5ndGgg
bGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKICAgICAgICAgQVNTRVJUKGxlbmd0aC5pc0ZpeGVkKCkp
OwpAQCAtNzg2LDcgKzc5MCwxMyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21w
dXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgIH0KIAog
ICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNp
Y1NpemUoKTsKLSAgICBkb3VibGUgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50
b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgIGRv
dWJsZSByYXRpbzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBB
c3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgp
ID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5p
c0VtcHR5KCkpKQorICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0
aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOworICAgIGVsc2UgeworICAg
ICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsKKyAgICAgICAgcmF0aW8g
PSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1Np
emUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygp
KQogICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsK
ICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKQEAgLTEx
NjcsNyArMTE3Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxk
U2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgIC8vIGVuc3Vy
ZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1YWwgY2FsbHMgb2YgY29tcHV0ZUludHJpbnNp
Y0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCiAgICAgICAgIExheW91dFVuaXQgY29udGVudFNp
emUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgTGVuZ3Ro
KE1pbkNvbnRlbnQpKS52YWx1ZU9yKDApOwogICAgICAgICBBU1NFUlQoY29udGVudFNpemUgPj0g
MCk7Ci0gICAgICAgIGlmIChjaGlsZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNp
Y1NpemUoKS5oZWlnaHQoKSA+IDApCisgICAgICAgIGlmIChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSAmJiBjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgPiAwKQogICAgICAgICAgICAg
Y29udGVudFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFu
ZE1heChjaGlsZCwgY29udGVudFNpemUpOwogICAgICAgICBjb250ZW50U2l6ZSA9IHN0ZDo6bWlu
KGNvbnRlbnRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjb250ZW50U2l6ZSkpOwogICAgICAgICAK
QEAgLTE1ODIsNyArMTU5Miw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0
Y2hDaGlsZExvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKICAgICAgICAgcmV0
dXJuIGZhbHNlOwogCiAgICAgLy8gQXNwZWN0IHJhdGlvIGlzIHByb3Blcmx5IGhhbmRsZWQgYnkg
UmVuZGVyUmVwbGFjZWQgZHVyaW5nIGxheW91dC4KLSAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBs
YWNlZCgpICYmIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKGNoaWxkLmlzUmVuZGVy
UmVwbGFjZWQoKSAmJiBjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0dXJu
IGZhbHNlOwogCiAgICAgcmV0dXJuIGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzQXV0
bygpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IGMwZjZjZjEyYTI1MmNiOWM4ODhkZTRkMmU5NDk5YjRkOGY1YzUwZjkuLmM1
NTVjMzQxZWFmMTBkYTU1Y2Y1OWU1MTRhODBjMDRjOTQyZjQwZDcgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NCBAQAorMjAyMS0wMS0wOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg
IFN1cHBvcnQgYXNwZWN0LXJhdGlvIG9uIGZsZXhib3ggY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY3OQorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuc2tpcCBzb21lIHRlc3RzIHRoYXQg
cGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAxLTA3ICBa
YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgcGF5cGFsLmNvbTogdGV4
dCBhdCB0aGUgYm90dG9tIG9mIHRoZSBwYWdlIGlzIG5vdCBhbGlnbmVkIHByb3Blcmx5CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCBhYmUyZjE4MzlmNjYzZDMzMzQ4OTBhZThlMTUxMzQwMzBkNDIyMzZh
Li45ZmZiNDgxYTIzYmJjN2E0M2NhMTdkNDNlYjkyZDdiNDNkNTVhMzllIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTQ0NDAsMTkgKzQ0NDAsOSBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAy
Ny5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2Nr
LWFzcGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQord2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTAuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTQuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTUuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTguaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTku
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417841</attachid>
            <date>2021-01-18 11:22:06 -0800</date>
            <delta_ts>2021-01-20 07:13:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210118202205.patch</filename>
            <type>text/plain</type>
            <size>11409</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RiMTY3NmRlZWM1Zjkz
YTBjNzNkZDljNjUwN2RmZDMwNjlmNmU0Ni4uM2ZjZDY5ZWM0ZTc1MTMwNDA3YzEzOGI4NWRjOTNl
NjNmMTRjNWI1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTE4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGlsZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGls
ZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RS
YXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0
ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6
UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAg
IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhl
aWdodCBjb25zdCk6CisKIDIwMjEtMDEtMTggIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJt
YW5uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJlY2VudGx5IGFkZGVkIGdsdWUgY29k
ZTogUmVuZGVyTGF5ZXI6OihzY3JvbGxUb09mZnNldCAvIHNjcm9sbFRvWE9mZnNldCAvIHNjcm9s
bFRvWU9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC
b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggMjc2
YzYzNDQ2NjQyMjhjYWNhMWMxOWUyNTdiZmEzOTQxOTU0MzQxMS4uZDE5MzAyZjI5NzUzNWIzYzMy
MWQ4ZDYzZWJlMmI1MjAzMjEzNmEzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHAKQEAgLTUwNDgsNyArNTA0OCw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl
TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICBpZiAoIXN0eWxlKCkuaGFz
QXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFzaG91bGRD
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgJiYgIXN0eWxlKCku
bG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNQ
ZXJjZW50T3JDYWxjdWxhdGVkKCkpCisgICAgaWYgKCFoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdo
dCgpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRz
KCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dp
Y2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggYTczNmM0NWE4MTc2Y2M2ZDlhOTY2ODM0ODU2ZjcxNzFk
YjBhODFhMi4uZDY2MzVjOWRkYTVmNjFjMDFkNDAwNzRiNDk5YmQ1MzNjNWZkZmU3YyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDMs
NiArNTQzLDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVu
dEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4
KDBfbHUsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJh
cik7CiB9CiAKK3N0YXRpYyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkKK3sKKyAgICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5z
dHlsZSgpLmhhc0FzcGVjdFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRl
ckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJC
b3gmIGNoaWxkLCBTaXplVHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAg
IC8vIElmIHdlIGhhdmUgYSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6
ZSBpcyB0aGUgd2lkdGguCkBAIC01NjksNyArNTc0LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJl
bmQKICAgICAvLyBvdXIgbG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3Vy
IGNhY2hlZCB2YWx1ZS4gU28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNv
ZGUgaW4gTGF5b3V0QmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExh
eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2Fs
V2lkdGgoKTsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAm
JiAhY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2lj
YWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAg
ICAgICBpZiAoc2l6ZS50eXBlKCkgPT0gTWluQ29udGVudCkKICAgICAgICAgICAgIHJldHVybiBj
aGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAg
ICAgIGlmIChzaXplLnR5cGUoKSA9PSBNYXhDb250ZW50KQpAQCAtNzM5LDkgKzc0NCw5IEBAIExh
eW91dFBvaW50IFJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxk
QXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNo
aWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxk
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgp
LmhlaWdodCgpKSB7CisgICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYg
IWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewogICAgICAgICAvLyBXZSBjYW4ndCBj
b21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg
fQpAQCAtNzU2LDggKzc2MSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNw
ZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICAKIExheW91dFVuaXQg
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0g
ICAgQVNTRVJUKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpOwotICAgIEFTU0VSVChjaGlsZC5pbnRy
aW5zaWNTaXplKCkuaGVpZ2h0KCkpOworICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSk7CiAKICAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewogICAgICAgICBBU1NF
UlQobGVuZ3RoLmlzRml4ZWQoKSk7CkBAIC03ODYsNyArNzkwLDEzIEBAIExheW91dFVuaXQgUmVu
ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0
IFJlbmRlckJvCiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNT
aXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwotICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50
cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQo
KS50b0Zsb2F0KCk7CisgICAgZG91YmxlIHJhdGlvOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFz
cGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYg
Y2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpCisgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5
bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0
KCk7CisgICAgZWxzZSB7CisgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0
KCkpOworICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQo
KSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgfQogICAgIGlm
IChpc0hvcml6b250YWxGbG93KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6
ZS52YWx1ZSgpICogcmF0aW8pOwogICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1
ZSgpIC8gcmF0aW8pOwpAQCAtODMzLDcgKzg0Myw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6
OmNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBM
CiAgICAgICAgIC8vIDEuIElmIGEgc2luZ2xlLWxpbmUgZmxleCBjb250YWluZXIgaGFzIGEgZGVm
aW5pdGUgY3Jvc3Mgc2l6ZSwgdGhlIGF1dG9tYXRpYyBwcmVmZXJyZWQgb3V0ZXIgY3Jvc3Mgc2l6
ZSBvZiBhbnkKICAgICAgICAgLy8gc3RyZXRjaGVkIGZsZXggaXRlbXMgaXMgdGhlIGZsZXggY29u
dGFpbmVyJ3MgaW5uZXIgY3Jvc3Mgc2l6ZSAoY2xhbXBlZCB0byB0aGUgZmxleCBpdGVt4oCZcyBt
aW4gYW5kIG1heCBjcm9zcyBzaXplKQogICAgICAgICAvLyBhbmQgaXMgY29uc2lkZXJlZCBkZWZp
bml0ZS4KLSAgICAgICAgaWYgKCFpc011bHRpbGluZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNo
aWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKKyAgICAgICAgaWYgKCFpc011bHRpbGlu
ZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gg
JiYgIWhhc0F1dG9NYXJnaW5zSW5Dcm9zc0F4aXMoY2hpbGQpKSB7CiAgICAgICAgICAgICAvLyBU
aGlzIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJh
dGlvVXNpbmcoKS4KICAgICAgICAgICAgIC8vIEZJWE1FOiBzbyBmYXIgd2UncmUgb25seSBjb25z
aWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0ZW5kIGl0IHRvIG90aGVyIGRlZmlu
aXRlIHNpemVzLgogICAgICAgICAgICAgaWYgKGF1dG8mIGNyb3NzU2l6ZSA9IGlzSG9yaXpvbnRh
bEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7IGNyb3NzU2l6ZS5p
c0ZpeGVkKCkpCkBAIC04OTYsNyArOTA2LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwKICAg
ICAvLyB3aWR0aCBvZiB0aGUgY2hpbGQuIEZvciB0aGUgbG9naWNhbCB3aWR0aCBheGlzIHdlIGp1
c3QgdXNlIHRoZSBwcmVmZXJyZWQKICAgICAvLyB3aWR0aDsgZm9yIHRoZSBoZWlnaHQgd2UgbmVl
ZCB0byBsYXkgb3V0IHRoZSBjaGlsZC4KICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50Owot
ICAgIGlmICghbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpIHsKKyAgICBpZiAoIW1h
aW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpIHx8IGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0
UmF0aW8oKSkgewogICAgICAgICB1cGRhdGVCbG9ja0NoaWxkRGlydHlCaXRzQmVmb3JlTGF5b3V0
KHJlbGF5b3V0Q2hpbGRyZW4sIGNoaWxkKTsKICAgICAgICAgaWYgKGNoaWxkLm5lZWRzTGF5b3V0
KCkgfHwgcmVsYXlvdXRDaGlsZHJlbiB8fCAhbV9pbnRyaW5zaWNTaXplQWxvbmdNYWluQXhpcy5j
b250YWlucygmY2hpbGQpKSB7CiAgICAgICAgICAgICBpZiAoIWNoaWxkLm5lZWRzTGF5b3V0KCkp
CkBAIC0xMTY3LDcgKzExNzcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1
c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAv
LyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdoIHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJ
bnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nLgogICAgICAgICBMYXlvdXRVbml0IGNv
bnRlbnRTaXplID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUs
IExlbmd0aChNaW5Db250ZW50KSkudmFsdWVPcigwKTsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRT
aXplID49IDApOwotICAgICAgICBpZiAoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZC5p
bnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgPiAwKQorICAgICAgICBpZiAoY2hpbGRIYXNBc3BlY3RS
YXRpbyhjaGlsZCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKICAgICAg
ICAgICAgIGNvbnRlbnRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4
aXNNaW5BbmRNYXgoY2hpbGQsIGNvbnRlbnRTaXplKTsKICAgICAgICAgY29udGVudFNpemUgPSBz
dGQ6Om1pbihjb250ZW50U2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY29udGVudFNpemUpKTsKICAg
ICAgICAgCkBAIC0xNTgyLDcgKzE1OTIsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVk
VG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIEFzcGVjdCByYXRpbyBpcyBwcm9wZXJseSBoYW5k
bGVkIGJ5IFJlbmRlclJlcGxhY2VkIGR1cmluZyBsYXlvdXQuCi0gICAgaWYgKGNoaWxkLmlzUmVu
ZGVyUmVwbGFjZWQoKSAmJiBjaGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmIChjaGlsZC5p
c1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAg
IHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQo
KS5pc0F1dG8oKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwppbmRleCA5MTk0ODc2M2U0MWNiNWU0MWU1YWM0NThmY2RlOGE0NmYxYmM4
MjAyLi5iZGYwMmFlNzEwYmUxM2EyYjU5NjE3NGFkOGQ5ZTlkMTg3NmUxYzI0IDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTQgQEAKKzIwMjEtMDEtMTggIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBmbGV4Ym94IGNoaWxkcmVuCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2NzkKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgc29tZSB0ZXN0
cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0w
MS0xOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgWyBNYWMg
V0sxIF0gUkVHUkVTU0lPTiAocjIzOTE0NSkgTGF5b3V0IFRlc3QgaHR0cC93cHQvbWVkaWFyZWNv
cmRlci9NZWRpYVJlY29yZGVyLWRhdGFhdmFpbGFibGUuaHRtbCBpcyBmbGFreSB0ZXh0IGRpZmYg
ZmFpbHVyZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGNiYjIyODFkMWQzOGFjYzA1MDljNzhlMzcw
NDkxZjJjZTJlODI3NC4uMjViMzdlZDU5ZmIyYzI4YmFjNjRhMTBkNjYxZTk5NDgzY2RlMDc5ZSAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDE2LDE5ICs0NDE2LDggQEAgd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNy5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz
cGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417966</attachid>
            <date>2021-01-20 07:13:54 -0800</date>
            <delta_ts>2021-01-20 08:29:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210120161353.patch</filename>
            <type>text/plain</type>
            <size>12303</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk2OWZiNDIzNmM4OGQ1
NmYzYWYyMjVkMGZhNjUwNjgxYWZkM2VjNC4uZDViZWUyYmUzMjJiZjY2NzI0YjA0ODgyNzg3N2Nm
MTViOTJhODVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTAxLTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGls
ZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcg
Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6
UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAg
IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhl
aWdodCBjb25zdCk6CisKIDIwMjEtMDEtMjAgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29t
PgogCiAgICAgICAgICJSZW1vdmUgcmVtYWluaW5nIG5vbi1zdGFuZGFyZCBDTVlLQSBzdXBwb3J0
IGZyb20gQ2FudmFzIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA5
MGZhZjkyYjUyODI4OTZjZDI3NzBjYWJhMjc3YjViNmJjNzUxMjAyLi41ZDRkNGI0MGU5NjMzNmY1
NTE0NmVmMmU1Mjk2NDgwMzViZWJhNjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcApAQCAtMjg0NCw3ICsyODQ0LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNhY2hlSW50cmlu
c2ljQ29udGVudExvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbShMYXlvdXRVbml0IGhlaWdodCkKICAg
ICAvLyBGSVhNRTogaXQgc2hvdWxkIGJlIGVub3VnaCB3aXRoIGNoZWNraW5nIGhhc092ZXJyaWRp
bmdMb2dpY2FsSGVpZ2h0KCkgYXMgdGhpcyBsb2dpYyBjb3VsZCBiZSBzaGFyZWQKICAgICAvLyBi
eSBhbnkgbGF5b3V0IHN5c3RlbSB1c2luZyBvdmVycmlkZXMgbGlrZSBncmlkIG9yIGZsZXguIEhv
d2V2ZXIgdGhpcyBjYXVzZXMgYSBuZXZlciBlbmRpbmcgc2VxdWVuY2Ugb2YgY2FsbHMKICAgICAv
LyBiZXR3ZWVuIGxheW91dEJsb2NrKCkgPC0+IHJlbGF5b3V0VG9Bdm9pZFdpZG93cygpLgotICAg
IGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8ICFw
YXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkp
CisgICAgaWYgKGlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCAhcGFyZW50KCkg
fHwgIXBhcmVudCgpLT5pc0ZsZXhpYmxlQm94KCkgfHwgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWln
aHQoKSB8fCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQogICAg
ICAgICByZXR1cm47CiAgICAgZG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+KHBhcmVudCgpKS0+
c2V0Q2FjaGVkQ2hpbGRJbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodCgqdGhpcywgaGVpZ2h0
KTsKIH0KQEAgLTUwNTEsNyArNTA1MSw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl
TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICBpZiAoIXN0eWxlKCkuaGFz
QXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFzaG91bGRD
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgJiYgIXN0eWxlKCku
bG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNQ
ZXJjZW50T3JDYWxjdWxhdGVkKCkpCisgICAgaWYgKCFoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdo
dCgpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRz
KCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dp
Y2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggYTczNmM0NWE4MTc2Y2M2ZDlhOTY2ODM0ODU2ZjcxNzFk
YjBhODFhMi4uZDY2MzVjOWRkYTVmNjFjMDFkNDAwNzRiNDk5YmQ1MzNjNWZkZmU3YyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDMs
NiArNTQzLDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVu
dEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4
KDBfbHUsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJh
cik7CiB9CiAKK3N0YXRpYyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkKK3sKKyAgICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5z
dHlsZSgpLmhhc0FzcGVjdFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRl
ckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJC
b3gmIGNoaWxkLCBTaXplVHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAg
IC8vIElmIHdlIGhhdmUgYSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6
ZSBpcyB0aGUgd2lkdGguCkBAIC01NjksNyArNTc0LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJl
bmQKICAgICAvLyBvdXIgbG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3Vy
IGNhY2hlZCB2YWx1ZS4gU28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNv
ZGUgaW4gTGF5b3V0QmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExh
eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2Fs
V2lkdGgoKTsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAm
JiAhY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2lj
YWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAg
ICAgICBpZiAoc2l6ZS50eXBlKCkgPT0gTWluQ29udGVudCkKICAgICAgICAgICAgIHJldHVybiBj
aGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAg
ICAgIGlmIChzaXplLnR5cGUoKSA9PSBNYXhDb250ZW50KQpAQCAtNzM5LDkgKzc0NCw5IEBAIExh
eW91dFBvaW50IFJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxk
QXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNo
aWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxk
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgp
LmhlaWdodCgpKSB7CisgICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYg
IWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewogICAgICAgICAvLyBXZSBjYW4ndCBj
b21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg
fQpAQCAtNzU2LDggKzc2MSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNw
ZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICAKIExheW91dFVuaXQg
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0g
ICAgQVNTRVJUKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpOwotICAgIEFTU0VSVChjaGlsZC5pbnRy
aW5zaWNTaXplKCkuaGVpZ2h0KCkpOworICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSk7CiAKICAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewogICAgICAgICBBU1NF
UlQobGVuZ3RoLmlzRml4ZWQoKSk7CkBAIC03ODYsNyArNzkwLDEzIEBAIExheW91dFVuaXQgUmVu
ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0
IFJlbmRlckJvCiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNT
aXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwotICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50
cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQo
KS50b0Zsb2F0KCk7CisgICAgZG91YmxlIHJhdGlvOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFz
cGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYg
Y2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpCisgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5
bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0
KCk7CisgICAgZWxzZSB7CisgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0
KCkpOworICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQo
KSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgfQogICAgIGlm
IChpc0hvcml6b250YWxGbG93KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6
ZS52YWx1ZSgpICogcmF0aW8pOwogICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1
ZSgpIC8gcmF0aW8pOwpAQCAtODMzLDcgKzg0Myw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6
OmNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBM
CiAgICAgICAgIC8vIDEuIElmIGEgc2luZ2xlLWxpbmUgZmxleCBjb250YWluZXIgaGFzIGEgZGVm
aW5pdGUgY3Jvc3Mgc2l6ZSwgdGhlIGF1dG9tYXRpYyBwcmVmZXJyZWQgb3V0ZXIgY3Jvc3Mgc2l6
ZSBvZiBhbnkKICAgICAgICAgLy8gc3RyZXRjaGVkIGZsZXggaXRlbXMgaXMgdGhlIGZsZXggY29u
dGFpbmVyJ3MgaW5uZXIgY3Jvc3Mgc2l6ZSAoY2xhbXBlZCB0byB0aGUgZmxleCBpdGVt4oCZcyBt
aW4gYW5kIG1heCBjcm9zcyBzaXplKQogICAgICAgICAvLyBhbmQgaXMgY29uc2lkZXJlZCBkZWZp
bml0ZS4KLSAgICAgICAgaWYgKCFpc011bHRpbGluZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNo
aWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKKyAgICAgICAgaWYgKCFpc011bHRpbGlu
ZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gg
JiYgIWhhc0F1dG9NYXJnaW5zSW5Dcm9zc0F4aXMoY2hpbGQpKSB7CiAgICAgICAgICAgICAvLyBU
aGlzIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJh
dGlvVXNpbmcoKS4KICAgICAgICAgICAgIC8vIEZJWE1FOiBzbyBmYXIgd2UncmUgb25seSBjb25z
aWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0ZW5kIGl0IHRvIG90aGVyIGRlZmlu
aXRlIHNpemVzLgogICAgICAgICAgICAgaWYgKGF1dG8mIGNyb3NzU2l6ZSA9IGlzSG9yaXpvbnRh
bEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7IGNyb3NzU2l6ZS5p
c0ZpeGVkKCkpCkBAIC04OTYsNyArOTA2LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwKICAg
ICAvLyB3aWR0aCBvZiB0aGUgY2hpbGQuIEZvciB0aGUgbG9naWNhbCB3aWR0aCBheGlzIHdlIGp1
c3QgdXNlIHRoZSBwcmVmZXJyZWQKICAgICAvLyB3aWR0aDsgZm9yIHRoZSBoZWlnaHQgd2UgbmVl
ZCB0byBsYXkgb3V0IHRoZSBjaGlsZC4KICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50Owot
ICAgIGlmICghbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpIHsKKyAgICBpZiAoIW1h
aW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpIHx8IGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0
UmF0aW8oKSkgewogICAgICAgICB1cGRhdGVCbG9ja0NoaWxkRGlydHlCaXRzQmVmb3JlTGF5b3V0
KHJlbGF5b3V0Q2hpbGRyZW4sIGNoaWxkKTsKICAgICAgICAgaWYgKGNoaWxkLm5lZWRzTGF5b3V0
KCkgfHwgcmVsYXlvdXRDaGlsZHJlbiB8fCAhbV9pbnRyaW5zaWNTaXplQWxvbmdNYWluQXhpcy5j
b250YWlucygmY2hpbGQpKSB7CiAgICAgICAgICAgICBpZiAoIWNoaWxkLm5lZWRzTGF5b3V0KCkp
CkBAIC0xMTY3LDcgKzExNzcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1
c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAv
LyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdoIHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJ
bnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nLgogICAgICAgICBMYXlvdXRVbml0IGNv
bnRlbnRTaXplID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUs
IExlbmd0aChNaW5Db250ZW50KSkudmFsdWVPcigwKTsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRT
aXplID49IDApOwotICAgICAgICBpZiAoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZC5p
bnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgPiAwKQorICAgICAgICBpZiAoY2hpbGRIYXNBc3BlY3RS
YXRpbyhjaGlsZCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKICAgICAg
ICAgICAgIGNvbnRlbnRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4
aXNNaW5BbmRNYXgoY2hpbGQsIGNvbnRlbnRTaXplKTsKICAgICAgICAgY29udGVudFNpemUgPSBz
dGQ6Om1pbihjb250ZW50U2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY29udGVudFNpemUpKTsKICAg
ICAgICAgCkBAIC0xNTgyLDcgKzE1OTIsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVk
VG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIEFzcGVjdCByYXRpbyBpcyBwcm9wZXJseSBoYW5k
bGVkIGJ5IFJlbmRlclJlcGxhY2VkIGR1cmluZyBsYXlvdXQuCi0gICAgaWYgKGNoaWxkLmlzUmVu
ZGVyUmVwbGFjZWQoKSAmJiBjaGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmIChjaGlsZC5p
c1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAg
IHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQo
KS5pc0F1dG8oKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwppbmRleCAyOGY2ODQ2MmNkOGM5MGJiZGIyZjJmYzA4MzNjNzI5N2UwOGYw
Mzc3Li5kZmI3ODM1ODM2MGQ1ODM0ODE1NzFiNDEyM2NjMTlkNDk3NGMwNTljIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTQgQEAKKzIwMjEtMDEtMjAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBmbGV4Ym94IGNoaWxkcmVuCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2NzkKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgc29tZSB0ZXN0
cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0w
MS0yMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJl
bWFpbmluZyBub24tc3RhbmRhcmQgQ01ZS0Egc3VwcG9ydCBmcm9tIGNhbnZhcwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKaW5kZXggOGNiYjIyODFkMWQzOGFjYzA1MDljNzhlMzcwNDkxZjJjZTJlODI3NC4uMjVi
MzdlZDU5ZmIyYzI4YmFjNjRhMTBkNjYxZTk5NDgzY2RlMDc5ZSAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CkBAIC00NDE2LDE5ICs0NDE2LDggQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl
Y3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417971</attachid>
            <date>2021-01-20 08:29:52 -0800</date>
            <delta_ts>2021-01-27 09:18:04 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210120172950.patch</filename>
            <type>text/plain</type>
            <size>12303</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk2OWZiNDIzNmM4OGQ1
NmYzYWYyMjVkMGZhNjUwNjgxYWZkM2VjNC4uZDViZWUyYmUzMjJiZjY2NzI0YjA0ODgyNzg3N2Nm
MTViOTJhODVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTAxLTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGls
ZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcg
Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6
UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAg
IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhl
aWdodCBjb25zdCk6CisKIDIwMjEtMDEtMjAgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29t
PgogCiAgICAgICAgICJSZW1vdmUgcmVtYWluaW5nIG5vbi1zdGFuZGFyZCBDTVlLQSBzdXBwb3J0
IGZyb20gQ2FudmFzIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA5
MGZhZjkyYjUyODI4OTZjZDI3NzBjYWJhMjc3YjViNmJjNzUxMjAyLi41ZDRkNGI0MGU5NjMzNmY1
NTE0NmVmMmU1Mjk2NDgwMzViZWJhNjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcApAQCAtMjg0NCw3ICsyODQ0LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNhY2hlSW50cmlu
c2ljQ29udGVudExvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbShMYXlvdXRVbml0IGhlaWdodCkKICAg
ICAvLyBGSVhNRTogaXQgc2hvdWxkIGJlIGVub3VnaCB3aXRoIGNoZWNraW5nIGhhc092ZXJyaWRp
bmdMb2dpY2FsSGVpZ2h0KCkgYXMgdGhpcyBsb2dpYyBjb3VsZCBiZSBzaGFyZWQKICAgICAvLyBi
eSBhbnkgbGF5b3V0IHN5c3RlbSB1c2luZyBvdmVycmlkZXMgbGlrZSBncmlkIG9yIGZsZXguIEhv
d2V2ZXIgdGhpcyBjYXVzZXMgYSBuZXZlciBlbmRpbmcgc2VxdWVuY2Ugb2YgY2FsbHMKICAgICAv
LyBiZXR3ZWVuIGxheW91dEJsb2NrKCkgPC0+IHJlbGF5b3V0VG9Bdm9pZFdpZG93cygpLgotICAg
IGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8ICFw
YXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkp
CisgICAgaWYgKGlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCAhcGFyZW50KCkg
fHwgIXBhcmVudCgpLT5pc0ZsZXhpYmxlQm94KCkgfHwgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWln
aHQoKSB8fCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQogICAg
ICAgICByZXR1cm47CiAgICAgZG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+KHBhcmVudCgpKS0+
c2V0Q2FjaGVkQ2hpbGRJbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodCgqdGhpcywgaGVpZ2h0
KTsKIH0KQEAgLTUwNTEsNyArNTA1MSw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl
TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICBpZiAoIXN0eWxlKCkuaGFz
QXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFzaG91bGRD
b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgJiYgIXN0eWxlKCku
bG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNQ
ZXJjZW50T3JDYWxjdWxhdGVkKCkpCisgICAgaWYgKCFoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdo
dCgpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRz
KCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dp
Y2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggYTczNmM0NWE4MTc2Y2M2ZDlhOTY2ODM0ODU2ZjcxNzFk
YjBhODFhMi4uZDY2MzVjOWRkYTVmNjFjMDFkNDAwNzRiNDk5YmQ1MzNjNWZkZmU3YyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDMs
NiArNTQzLDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVu
dEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4
KDBfbHUsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJh
cik7CiB9CiAKK3N0YXRpYyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkKK3sKKyAgICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5z
dHlsZSgpLmhhc0FzcGVjdFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRl
ckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJC
b3gmIGNoaWxkLCBTaXplVHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAg
IC8vIElmIHdlIGhhdmUgYSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6
ZSBpcyB0aGUgd2lkdGguCkBAIC01NjksNyArNTc0LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJl
bmQKICAgICAvLyBvdXIgbG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3Vy
IGNhY2hlZCB2YWx1ZS4gU28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNv
ZGUgaW4gTGF5b3V0QmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExh
eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2Fs
V2lkdGgoKTsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAm
JiAhY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2lj
YWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAg
ICAgICBpZiAoc2l6ZS50eXBlKCkgPT0gTWluQ29udGVudCkKICAgICAgICAgICAgIHJldHVybiBj
aGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAg
ICAgIGlmIChzaXplLnR5cGUoKSA9PSBNYXhDb250ZW50KQpAQCAtNzM5LDkgKzc0NCw5IEBAIExh
eW91dFBvaW50IFJlbmRlckZsZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxk
QXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNo
aWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxk
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgp
LmhlaWdodCgpKSB7CisgICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYg
IWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewogICAgICAgICAvLyBXZSBjYW4ndCBj
b21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNlLgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg
fQpAQCAtNzU2LDggKzc2MSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNw
ZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICAKIExheW91dFVuaXQg
UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0g
ICAgQVNTRVJUKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpOwotICAgIEFTU0VSVChjaGlsZC5pbnRy
aW5zaWNTaXplKCkuaGVpZ2h0KCkpOworICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNo
aWxkKSk7CiAKICAgICBhdXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVu
ZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewogICAgICAgICBBU1NF
UlQobGVuZ3RoLmlzRml4ZWQoKSk7CkBAIC03ODYsNyArNzkwLDEzIEBAIExheW91dFVuaXQgUmVu
ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0
IFJlbmRlckJvCiAgICAgfQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNT
aXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgpOwotICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50
cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQo
KS50b0Zsb2F0KCk7CisgICAgZG91YmxlIHJhdGlvOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFz
cGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYg
Y2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHkoKSkpCisgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5
bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0
KCk7CisgICAgZWxzZSB7CisgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0
KCkpOworICAgICAgICByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQo
KSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgfQogICAgIGlm
IChpc0hvcml6b250YWxGbG93KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6
ZS52YWx1ZSgpICogcmF0aW8pOwogICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1
ZSgpIC8gcmF0aW8pOwpAQCAtODMzLDcgKzg0Myw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6
OmNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBM
CiAgICAgICAgIC8vIDEuIElmIGEgc2luZ2xlLWxpbmUgZmxleCBjb250YWluZXIgaGFzIGEgZGVm
aW5pdGUgY3Jvc3Mgc2l6ZSwgdGhlIGF1dG9tYXRpYyBwcmVmZXJyZWQgb3V0ZXIgY3Jvc3Mgc2l6
ZSBvZiBhbnkKICAgICAgICAgLy8gc3RyZXRjaGVkIGZsZXggaXRlbXMgaXMgdGhlIGZsZXggY29u
dGFpbmVyJ3MgaW5uZXIgY3Jvc3Mgc2l6ZSAoY2xhbXBlZCB0byB0aGUgZmxleCBpdGVt4oCZcyBt
aW4gYW5kIG1heCBjcm9zcyBzaXplKQogICAgICAgICAvLyBhbmQgaXMgY29uc2lkZXJlZCBkZWZp
bml0ZS4KLSAgICAgICAgaWYgKCFpc011bHRpbGluZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNo
aWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKKyAgICAgICAgaWYgKCFpc011bHRpbGlu
ZSgpICYmIGFsaWdubWVudEZvckNoaWxkKGNoaWxkKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gg
JiYgIWhhc0F1dG9NYXJnaW5zSW5Dcm9zc0F4aXMoY2hpbGQpKSB7CiAgICAgICAgICAgICAvLyBU
aGlzIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJh
dGlvVXNpbmcoKS4KICAgICAgICAgICAgIC8vIEZJWE1FOiBzbyBmYXIgd2UncmUgb25seSBjb25z
aWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0ZW5kIGl0IHRvIG90aGVyIGRlZmlu
aXRlIHNpemVzLgogICAgICAgICAgICAgaWYgKGF1dG8mIGNyb3NzU2l6ZSA9IGlzSG9yaXpvbnRh
bEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7IGNyb3NzU2l6ZS5p
c0ZpeGVkKCkpCkBAIC04OTYsNyArOTA2LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwKICAg
ICAvLyB3aWR0aCBvZiB0aGUgY2hpbGQuIEZvciB0aGUgbG9naWNhbCB3aWR0aCBheGlzIHdlIGp1
c3QgdXNlIHRoZSBwcmVmZXJyZWQKICAgICAvLyB3aWR0aDsgZm9yIHRoZSBoZWlnaHQgd2UgbmVl
ZCB0byBsYXkgb3V0IHRoZSBjaGlsZC4KICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50Owot
ICAgIGlmICghbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpIHsKKyAgICBpZiAoIW1h
aW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpIHx8IGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0
UmF0aW8oKSkgewogICAgICAgICB1cGRhdGVCbG9ja0NoaWxkRGlydHlCaXRzQmVmb3JlTGF5b3V0
KHJlbGF5b3V0Q2hpbGRyZW4sIGNoaWxkKTsKICAgICAgICAgaWYgKGNoaWxkLm5lZWRzTGF5b3V0
KCkgfHwgcmVsYXlvdXRDaGlsZHJlbiB8fCAhbV9pbnRyaW5zaWNTaXplQWxvbmdNYWluQXhpcy5j
b250YWlucygmY2hpbGQpKSB7CiAgICAgICAgICAgICBpZiAoIWNoaWxkLm5lZWRzTGF5b3V0KCkp
CkBAIC0xMTY3LDcgKzExNzcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1
c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAv
LyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdoIHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJ
bnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nLgogICAgICAgICBMYXlvdXRVbml0IGNv
bnRlbnRTaXplID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUs
IExlbmd0aChNaW5Db250ZW50KSkudmFsdWVPcigwKTsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRT
aXplID49IDApOwotICAgICAgICBpZiAoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZC5p
bnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgPiAwKQorICAgICAgICBpZiAoY2hpbGRIYXNBc3BlY3RS
YXRpbyhjaGlsZCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKICAgICAg
ICAgICAgIGNvbnRlbnRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4
aXNNaW5BbmRNYXgoY2hpbGQsIGNvbnRlbnRTaXplKTsKICAgICAgICAgY29udGVudFNpemUgPSBz
dGQ6Om1pbihjb250ZW50U2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY29udGVudFNpemUpKTsKICAg
ICAgICAgCkBAIC0xNTgyLDcgKzE1OTIsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVk
VG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIEFzcGVjdCByYXRpbyBpcyBwcm9wZXJseSBoYW5k
bGVkIGJ5IFJlbmRlclJlcGxhY2VkIGR1cmluZyBsYXlvdXQuCi0gICAgaWYgKGNoaWxkLmlzUmVu
ZGVyUmVwbGFjZWQoKSAmJiBjaGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmIChjaGlsZC5p
c1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAg
IHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQo
KS5pc0F1dG8oKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwppbmRleCAyOGY2ODQ2MmNkOGM5MGJiZGIyZjJmYzA4MzNjNzI5N2UwOGYw
Mzc3Li5kZmI3ODM1ODM2MGQ1ODM0ODE1NzFiNDEyM2NjMTlkNDk3NGMwNTljIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTQgQEAKKzIwMjEtMDEtMjAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBmbGV4Ym94IGNoaWxkcmVuCisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2NzkKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgc29tZSB0ZXN0
cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0w
MS0yMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJl
bWFpbmluZyBub24tc3RhbmRhcmQgQ01ZS0Egc3VwcG9ydCBmcm9tIGNhbnZhcwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKaW5kZXggOGNiYjIyODFkMWQzOGFjYzA1MDljNzhlMzcwNDkxZjJjZTJlODI3NC4uYjk4
ZTBjMTgzMWMxYjU0MTEzNmFhNTU3YmExYmY4N2Y2ZDM1NjE2ZiAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CkBAIC00NDE2LDE5ICs0NDE2LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl
Y3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vaW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418553</attachid>
            <date>2021-01-27 09:18:09 -0800</date>
            <delta_ts>2021-01-29 09:03:38 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210127181807.patch</filename>
            <type>text/plain</type>
            <size>12309</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRkYzY4YWRkZGNkZTIz
MTViYTg0Yjc2MzlmNTA4NjhkM2NiNmE3ZC4uNzM2NGUyZTg2YjViMmVkYmFkMjJkOGJmNWZiMjQ5
NDVmMGE3MTBiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTAxLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGls
ZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcg
Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6
UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAg
IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhl
aWdodCBjb25zdCk6CisKIDIwMjEtMDEtMjcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv
bT4KIAogICAgICAgICBbTEZDXVtJRkNdIEV4cGFuZCAiZW1wdHkgbGluZSIgZmFzdCBwYXRoIHN1
cHBvcnQgZm9yIG11bHRpbGluZSBpbmxpbmUgYm94ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHAKaW5kZXggOThkMmMwYTI5OTVlZWI0MzVjZDE3MjY1ZjFlNzNmZjA0ZWRmNTEx
Mi4uYWUyOTQyNWQxZGQ1YTY2MmVlMWIwNDFlNjE3MTEyOTY2ZTcxZWRiMyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI4NjEsNyArMjg2MSw3IEBAIHZvaWQgUmVu
ZGVyQm94OjpjYWNoZUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0oTGF5
b3V0VW5pdCBoZWlnaHQpCiAgICAgLy8gRklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2ggd2l0aCBj
aGVja2luZyBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMgY291bGQg
YmUgc2hhcmVkCiAgICAgLy8gYnkgYW55IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJpZGVzIGxp
a2UgZ3JpZCBvciBmbGV4LiBIb3dldmVyIHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5nIHNlcXVl
bmNlIG9mIGNhbGxzCiAgICAgLy8gYmV0d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxheW91dFRv
QXZvaWRXaWRvd3MoKS4KLSAgICBpZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgp
IHx8ICFwYXJlbnQoKSB8fCAhcGFyZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNPdmVycmlk
aW5nTG9naWNhbEhlaWdodCgpKQorICAgIGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlv
bmVkKCkgfHwgIXBhcmVudCgpIHx8ICFwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092
ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t
QXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRlckZsZXhp
YmxlQm94PihwYXJlbnQoKSktPnNldENhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHQoKnRoaXMsIGhlaWdodCk7CiB9CkBAIC01MDg2LDcgKzUwODYsNyBAQCBib29sIFJlbmRl
ckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAg
ICAgaWYgKCFzdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK
IAotICAgIGlmICghc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZElu
c2V0cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCku
bG9naWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKQorICAgIGlmICghaGFzT3Zl
cnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSAmJiAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B
c3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVk
KCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKQog
ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGE3MzZjNDVhODE3NmNj
NmQ5YTk2NjgzNDg1NmY3MTcxZGIwYTgxYTIuLmQ2NjM1YzlkZGE1ZjYxYzAxZDQwMDc0YjQ5OWJk
NTMzYzVmZGZlN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp
YmxlQm94LmNwcApAQCAtNTQzLDYgKzU0MywxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl
Qm94OjptYWluQXhpc0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaQog
ICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRl
clBhZGRpbmdBbmRTY3JvbGxiYXIpOwogfQogCitzdGF0aWMgYm9vbCBjaGlsZEhhc0FzcGVjdFJh
dGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCit7CisgICAgcmV0dXJuIGNoaWxkLmhhc0FzcGVj
dFJhdGlvKCkgfHwgY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpOworfQorCiBPcHRpb25h
bDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9y
Q2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgU2l6ZVR5cGUgc2l6ZVR5cGUsIGNvbnN0IExl
bmd0aCYgc2l6ZSkKIHsKICAgICAvLyBJZiB3ZSBoYXZlIGEgaG9yaXpvbnRhbCBmbG93LCB0aGF0
IG1lYW5zIHRoZSBtYWluIHNpemUgaXMgdGhlIHdpZHRoLgpAQCAtNTY5LDcgKzU3NCw3IEBAIE9w
dGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRl
bnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgLy8gb3VyIGxvZ2ljYWwgd2lkdGggaXMgYXV0bywg
d2UgY2FuIGp1c3QgdXNlIG91ciBjYWNoZWQgdmFsdWUuIFNvIGxldCdzIGRvCiAgICAgLy8gdGhh
dCBoZXJlLiAoQ29tcGFyZSBjb2RlIGluIExheW91dEJsb2NrOjpjb21wdXRlUHJlZmVycmVkTG9n
aWNhbFdpZHRocykKICAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBjaGlsZC5ib3Jk
ZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNh
bFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICBpZiAo
Y2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAmJiAhY2hpbGRIYXNBc3BlY3RS
YXRpbyhjaGlsZCkpIHsKICAgICAgICAgaWYgKHNpemUudHlwZSgpID09IE1pbkNvbnRlbnQpCiAg
ICAgICAgICAgICByZXR1cm4gY2hpbGQubWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgLSBib3Jk
ZXJBbmRQYWRkaW5nOwogICAgICAgICBpZiAoc2l6ZS50eXBlKCkgPT0gTWF4Q29udGVudCkKQEAg
LTczOSw5ICs3NDQsOSBAQCBMYXlvdXRQb2ludCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJl
TG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQogCiBib29sIFJlbmRlckZs
ZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv
bnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmICghY2hpbGRI
YXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWNo
aWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkgeworICAgIGlmICghY2hpbGQuaW50cmluc2lj
U2l6ZSgpLmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKICAg
ICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4KICAgICAgICAg
cmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTc1Niw4ICs3NjEsNyBAQCBib29sIFJlbmRlckZsZXhp
YmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0
CiAgICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9t
QXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jvc3NTaXpl
TGVuZ3RoKSBjb25zdAogewotICAgIEFTU0VSVChjaGlsZC5oYXNBc3BlY3RSYXRpbygpKTsKLSAg
ICBBU1NFUlQoY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKTsKKyAgICBBU1NFUlQoY2hp
bGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogCiAgICAgYXV0byBhZGp1c3RGb3JCb3hTaXppbmcg
PSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBMZW5ndGggbGVuZ3RoKSAtPiBMYXlvdXRV
bml0IHsKICAgICAgICAgQVNTRVJUKGxlbmd0aC5pc0ZpeGVkKCkpOwpAQCAtNzg2LDcgKzc5MCwx
MyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNw
ZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAgIH0KIAogICAgIGNvbnN0IExheW91dFNp
emUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUoKTsKLSAgICBkb3Vi
bGUgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZElu
dHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgIGRvdWJsZSByYXRpbzsKKyAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJh
dGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlw
ZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgICAg
ICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUo
KS5hc3BlY3RSYXRpb0hlaWdodCgpOworICAgIGVsc2UgeworICAgICAgICBBU1NFUlQoY2hpbGRJ
bnRyaW5zaWNTaXplLmhlaWdodCgpKTsKKyAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1Np
emUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9h
dCgpOworICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFsRmxvdygpKQogICAgICAgICByZXR1cm4g
TGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJhdGlvKTsKICAgICByZXR1cm4gTGF5b3V0
VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsKQEAgLTgzMyw3ICs4NDMsNyBAQCBib29s
IFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY29uc3QgUmVuZGVy
Qm94JiBjaGlsZCwgY29uc3QgTAogICAgICAgICAvLyAxLiBJZiBhIHNpbmdsZS1saW5lIGZsZXgg
Y29udGFpbmVyIGhhcyBhIGRlZmluaXRlIGNyb3NzIHNpemUsIHRoZSBhdXRvbWF0aWMgcHJlZmVy
cmVkIG91dGVyIGNyb3NzIHNpemUgb2YgYW55CiAgICAgICAgIC8vIHN0cmV0Y2hlZCBmbGV4IGl0
ZW1zIGlzIHRoZSBmbGV4IGNvbnRhaW5lcidzIGlubmVyIGNyb3NzIHNpemUgKGNsYW1wZWQgdG8g
dGhlIGZsZXggaXRlbeKAmXMgbWluIGFuZCBtYXggY3Jvc3Mgc2l6ZSkKICAgICAgICAgLy8gYW5k
IGlzIGNvbnNpZGVyZWQgZGVmaW5pdGUuCi0gICAgICAgIGlmICghaXNNdWx0aWxpbmUoKSAmJiBh
bGlnbm1lbnRGb3JDaGlsZChjaGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CisgICAg
ICAgIGlmICghaXNNdWx0aWxpbmUoKSAmJiBhbGlnbm1lbnRGb3JDaGlsZChjaGlsZCkgPT0gSXRl
bVBvc2l0aW9uOjpTdHJldGNoICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jvc3NBeGlzKGNoaWxkKSkg
ewogICAgICAgICAgICAgLy8gVGhpcyBtdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIGNvbXB1dGVN
YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKCkuCiAgICAgICAgICAgICAvLyBGSVhNRTogc28g
ZmFyIHdlJ3JlIG9ubHkgY29uc2lkZXJlZCBmaXhlZCBzaXplcyBidXQgd2Ugc2hvdWxkIGV4dGVu
ZCBpdCB0byBvdGhlciBkZWZpbml0ZSBzaXplcy4KICAgICAgICAgICAgIGlmIChhdXRvJiBjcm9z
c1NpemUgPSBpc0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53
aWR0aCgpOyBjcm9zc1NpemUuaXNGaXhlZCgpKQpAQCAtODk2LDcgKzkwNiw3IEBAIExheW91dFVu
aXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKFJl
bmRlckJveCYgY2hpbGQsCiAgICAgLy8gd2lkdGggb2YgdGhlIGNoaWxkLiBGb3IgdGhlIGxvZ2lj
YWwgd2lkdGggYXhpcyB3ZSBqdXN0IHVzZSB0aGUgcHJlZmVycmVkCiAgICAgLy8gd2lkdGg7IGZv
ciB0aGUgaGVpZ2h0IHdlIG5lZWQgdG8gbGF5IG91dCB0aGUgY2hpbGQuCiAgICAgTGF5b3V0VW5p
dCBtYWluQXhpc0V4dGVudDsKLSAgICBpZiAoIW1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hp
bGQpKSB7CisgICAgaWYgKCFtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSB8fCBjaGls
ZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKICAgICAgICAgdXBkYXRlQmxvY2tDaGlsZERp
cnR5Qml0c0JlZm9yZUxheW91dChyZWxheW91dENoaWxkcmVuLCBjaGlsZCk7CiAgICAgICAgIGlm
IChjaGlsZC5uZWVkc0xheW91dCgpIHx8IHJlbGF5b3V0Q2hpbGRyZW4gfHwgIW1faW50cmluc2lj
U2l6ZUFsb25nTWFpbkF4aXMuY29udGFpbnMoJmNoaWxkKSkgewogICAgICAgICAgICAgaWYgKCFj
aGlsZC5uZWVkc0xheW91dCgpKQpAQCAtMTE2Nyw3ICsxMTc3LDcgQEAgTGF5b3V0VW5pdCBSZW5k
ZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQKICAgICAgICAgLy8gZW5zdXJlIGl0J3MgdmFsaWQgdGhyb3VnaCB0aGUgdmlydHVh
bCBjYWxscyBvZiBjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZy4KICAg
ICAgICAgTGF5b3V0VW5pdCBjb250ZW50U2l6ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNo
aWxkKGNoaWxkLCBNaW5TaXplLCBMZW5ndGgoTWluQ29udGVudCkpLnZhbHVlT3IoMCk7CiAgICAg
ICAgIEFTU0VSVChjb250ZW50U2l6ZSA+PSAwKTsKLSAgICAgICAgaWYgKGNoaWxkLmhhc0FzcGVj
dFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKKyAgICAgICAg
aWYgKGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5o
ZWlnaHQoKSA+IDApCiAgICAgICAgICAgICBjb250ZW50U2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZv
ckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCBjb250ZW50U2l6ZSk7CiAgICAg
ICAgIGNvbnRlbnRTaXplID0gc3RkOjptaW4oY29udGVudFNpemUsIG1heEV4dGVudC52YWx1ZU9y
KGNvbnRlbnRTaXplKSk7CiAgICAgICAgIApAQCAtMTU4Miw3ICsxNTkyLDcgQEAgYm9vbCBSZW5k
ZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodChjb25zdCBSZW5k
ZXJCb3gmIGNoaWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBBc3BlY3QgcmF0
aW8gaXMgcHJvcGVybHkgaGFuZGxlZCBieSBSZW5kZXJSZXBsYWNlZCBkdXJpbmcgbGF5b3V0Lgot
ICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGQuaGFzQXNwZWN0UmF0aW8o
KSkKKyAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkSGFzQXNwZWN0UmF0
aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gY2hpbGQuc3R5
bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZmI4ZTU0YzUyZDE2MDUyZDNl
ZjdkOWVmMjBhYzhiMmU0OTk1MWJiYi4uNDJmYTg5OWUyMGU0ODU4ZjdmZGY5ZDRiMzk3NWQwOTUw
YjllNDgwMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI3ICBSb2IgQnVpcyAgPHJi
dWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gZmxleGJv
eCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgVW5za2lwIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBl
Y3RhdGlvbnM6CisKIDIwMjEtMDEtMjcgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJr
aXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjcxOTQwLgpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMKaW5kZXggZWVlMTZlNjI3MzY2ZGY3N2UzY2VkMDViNTk0MzdkM2VkYmI5NThjNC4u
NDZiZDJjODI5ZjFiNWFlNDMyMTcwNDdhNzQwMzZjYTYxOWMxY2MxMiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCkBAIC00NDIzLDE5ICs0NDIzLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjgu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1h
c3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418734</attachid>
            <date>2021-01-29 09:03:44 -0800</date>
            <delta_ts>2021-02-11 10:59:00 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210129180342.patch</filename>
            <type>text/plain</type>
            <size>11581</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmMyZjA2MzI4N2Y4NzU2
NWI2NjliNmNmNjU3YzI0ZTEzY2JiY2IxMy4uNjEwNmJhNWY4NjBiOTg4NzY4YTNkM2U2Y2UxZGFl
NTAwMmFlNWQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAxLTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGls
ZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcg
Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKwog
MjAyMS0wMS0yOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzIwNTIuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guY3BwCmluZGV4IDJmZWVmOWUzMjdmNTBiNTkwZmE4OWExNTJiMTE2M2NjZDk1
MjJkYTEuLjJhODA1YjA0ZDFlNmNmMGZmYWZkODJmMjVlYWE3NWM5Y2NhOGVhM2UgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yODYxLDcgKzI4NjEsNyBAQCB2b2lk
IFJlbmRlckJveDo6Y2FjaGVJbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodEZvckZsZXhJdGVt
KExheW91dFVuaXQgaGVpZ2h0KQogICAgIC8vIEZJWE1FOiBpdCBzaG91bGQgYmUgZW5vdWdoIHdp
dGggY2hlY2tpbmcgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSBhcyB0aGlzIGxvZ2ljIGNv
dWxkIGJlIHNoYXJlZAogICAgIC8vIGJ5IGFueSBsYXlvdXQgc3lzdGVtIHVzaW5nIG92ZXJyaWRl
cyBsaWtlIGdyaWQgb3IgZmxleC4gSG93ZXZlciB0aGlzIGNhdXNlcyBhIG5ldmVyIGVuZGluZyBz
ZXF1ZW5jZSBvZiBjYWxscwogICAgIC8vIGJldHdlZW4gbGF5b3V0QmxvY2soKSA8LT4gcmVsYXlv
dXRUb0F2b2lkV2lkb3dzKCkuCi0gICAgaWYgKGlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9u
ZWQoKSB8fCAhcGFyZW50KCkgfHwgIXBhcmVudCgpLT5pc0ZsZXhpYmxlQm94KCkgfHwgaGFzT3Zl
cnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSkKKyAgICBpZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9z
aXRpb25lZCgpIHx8ICFwYXJlbnQoKSB8fCAhcGFyZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBo
YXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpIHx8IHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0
RnJvbUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybjsKICAgICBkb3duY2FzdDxSZW5kZXJG
bGV4aWJsZUJveD4ocGFyZW50KCkpLT5zZXRDYWNoZWRDaGlsZEludHJpbnNpY0NvbnRlbnRMb2dp
Y2FsSGVpZ2h0KCp0aGlzLCBoZWlnaHQpOwogfQpAQCAtNTA4Niw3ICs1MDg2LDcgQEAgYm9vbCBS
ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25z
dAogICAgIGlmICghc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gZmFs
c2U7CiAKLSAgICBpZiAoIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9B
bmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgpICYmICFzdHls
ZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkKKyAgICBpZiAoIWhh
c092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG
cm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNG
aXhlZCgpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQo
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBjNGVhOTk0N2Uz
M2QzMjNmYWJkZmFkOTA3MTY2YmM3NWM4ZTllMmIxLi5iZDdiMTIzMjBkNjk2NjY4ODFhNDQxZGUw
YTgzNTczMmYyOThhMmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAKQEAgLTU0Myw2ICs1NDMsMTEgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4
aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVudExvZ2ljYWxI
ZWkKICAgICByZXR1cm4gc3RkOjptYXgoMF9sdSwgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBi
b3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyKTsKIH0KIAorc3RhdGljIGJvb2wgY2hpbGRIYXNBc3Bl
Y3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQoreworICAgIHJldHVybiBjaGlsZC5oYXNB
c3BlY3RSYXRpbygpIHx8IGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKTsKK30KKwogT3B0
aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVu
dEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIFNpemVUeXBlIHNpemVUeXBlLCBjb25z
dCBMZW5ndGgmIHNpemUpCiB7CiAgICAgLy8gSWYgd2UgaGF2ZSBhIGhvcml6b250YWwgZmxvdywg
dGhhdCBtZWFucyB0aGUgbWFpbiBzaXplIGlzIHRoZSB3aWR0aC4KQEAgLTU2OSw3ICs1NzQsNyBA
QCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlz
RXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZAogICAgIC8vIG91ciBsb2dpY2FsIHdpZHRoIGlzIGF1
dG8sIHdlIGNhbiBqdXN0IHVzZSBvdXIgY2FjaGVkIHZhbHVlLiBTbyBsZXQncyBkbwogICAgIC8v
IHRoYXQgaGVyZS4gKENvbXBhcmUgY29kZSBpbiBMYXlvdXRCbG9jazo6Y29tcHV0ZVByZWZlcnJl
ZExvZ2ljYWxXaWR0aHMpCiAgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nID0gY2hpbGQu
Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpOwotICAgIGlmIChjaGlsZC5zdHlsZSgpLmxv
Z2ljYWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZC5oYXNBc3BlY3RSYXRpbygpKSB7CisgICAg
aWYgKGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNoaWxkSGFzQXNw
ZWN0UmF0aW8oY2hpbGQpKSB7CiAgICAgICAgIGlmIChzaXplLnR5cGUoKSA9PSBNaW5Db250ZW50
KQogICAgICAgICAgICAgcmV0dXJuIGNoaWxkLm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIC0g
Ym9yZGVyQW5kUGFkZGluZzsKICAgICAgICAgaWYgKHNpemUudHlwZSgpID09IE1heENvbnRlbnQp
CkBAIC03MzksOSArNzQ0LDkgQEAgTGF5b3V0UG9pbnQgUmVuZGVyRmxleGlibGVCb3g6OmZsb3dB
d2FyZUxvY2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKIAogYm9vbCBSZW5k
ZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk
KSBjb25zdAogewotICAgIGlmICghY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWNo
aWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYg
KCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpIHsKKyAgICBpZiAoIWNoaWxkLmludHJp
bnNpY1NpemUoKS5oZWlnaHQoKSAmJiAhY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7
CiAgICAgICAgIC8vIFdlIGNhbid0IGNvbXB1dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCiAgICAg
ICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBAIC03NTYsOCArNzYxLDcgQEAgYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj
b25zdAogICAgIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXpl
RnJvbUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3Nz
U2l6ZUxlbmd0aCkgY29uc3QKIHsKLSAgICBBU1NFUlQoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSk7
Ci0gICAgQVNTRVJUKGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSk7CisgICAgQVNTRVJU
KGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAogICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6
aW5nID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5
b3V0VW5pdCB7CiAgICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKQEAgLTc4Niw3ICs3
OTAsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICB9CiAKICAgICBjb25zdCBMYXlv
dXRTaXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7Ci0gICAg
ZG91YmxlIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hp
bGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICBkb3VibGUgcmF0aW87Cisg
ICAgaWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBl
OjpSYXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRp
b1R5cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAg
ICAgICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0
eWxlKCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKKyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKGNo
aWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIHJhdGlvID0gY2hpbGRJbnRyaW5z
aWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRv
RmxvYXQoKTsKKyAgICB9CiAgICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKICAgICAgICAgcmV0
dXJuIExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbyk7CiAgICAgcmV0dXJuIExh
eW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbyk7CkBAIC04MzMsNyArODQzLDcgQEAg
Ym9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNvbnN0IFJl
bmRlckJveCYgY2hpbGQsIGNvbnN0IEwKICAgICAgICAgLy8gMS4gSWYgYSBzaW5nbGUtbGluZSBm
bGV4IGNvbnRhaW5lciBoYXMgYSBkZWZpbml0ZSBjcm9zcyBzaXplLCB0aGUgYXV0b21hdGljIHBy
ZWZlcnJlZCBvdXRlciBjcm9zcyBzaXplIG9mIGFueQogICAgICAgICAvLyBzdHJldGNoZWQgZmxl
eCBpdGVtcyBpcyB0aGUgZmxleCBjb250YWluZXIncyBpbm5lciBjcm9zcyBzaXplIChjbGFtcGVk
IHRvIHRoZSBmbGV4IGl0ZW3igJlzIG1pbiBhbmQgbWF4IGNyb3NzIHNpemUpCiAgICAgICAgIC8v
IGFuZCBpcyBjb25zaWRlcmVkIGRlZmluaXRlLgotICAgICAgICBpZiAoIWlzTXVsdGlsaW5lKCkg
JiYgYWxpZ25tZW50Rm9yQ2hpbGQoY2hpbGQpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewor
ICAgICAgICBpZiAoIWlzTXVsdGlsaW5lKCkgJiYgYWxpZ25tZW50Rm9yQ2hpbGQoY2hpbGQpID09
IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCAmJiAhaGFzQXV0b01hcmdpbnNJbkNyb3NzQXhpcyhjaGls
ZCkpIHsKICAgICAgICAgICAgIC8vIFRoaXMgbXVzdCBiZSBrZXB0IGluIHN5bmMgd2l0aCBjb21w
dXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZygpLgogICAgICAgICAgICAgLy8gRklYTUU6
IHNvIGZhciB3ZSdyZSBvbmx5IGNvbnNpZGVyZWQgZml4ZWQgc2l6ZXMgYnV0IHdlIHNob3VsZCBl
eHRlbmQgaXQgdG8gb3RoZXIgZGVmaW5pdGUgc2l6ZXMuCiAgICAgICAgICAgICBpZiAoYXV0byYg
Y3Jvc3NTaXplID0gaXNIb3Jpem9udGFsRmxvdygpID8gc3R5bGUoKS5oZWlnaHQoKSA6IHN0eWxl
KCkud2lkdGgoKTsgY3Jvc3NTaXplLmlzRml4ZWQoKSkKQEAgLTExNjcsNyArMTE3Nyw3IEBAIExh
eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChj
b25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgIC8vIGVuc3VyZSBpdCdzIHZhbGlkIHRocm91
Z2ggdGhlIHZpcnR1YWwgY2FsbHMgb2YgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVp
Z2h0VXNpbmcuCiAgICAgICAgIExheW91dFVuaXQgY29udGVudFNpemUgPSBjb21wdXRlTWFpbkF4
aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgTGVuZ3RoKE1pbkNvbnRlbnQpKS52YWx1
ZU9yKDApOwogICAgICAgICBBU1NFUlQoY29udGVudFNpemUgPj0gMCk7Ci0gICAgICAgIGlmIChj
aGlsZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSA+
IDApCisgICAgICAgIGlmIChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSAmJiBjaGlsZC5pbnRy
aW5zaWNTaXplKCkuaGVpZ2h0KCkgPiAwKQogICAgICAgICAgICAgY29udGVudFNpemUgPSBhZGp1
c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwgY29udGVu
dFNpemUpOwogICAgICAgICBjb250ZW50U2l6ZSA9IHN0ZDo6bWluKGNvbnRlbnRTaXplLCBtYXhF
eHRlbnQudmFsdWVPcihjb250ZW50U2l6ZSkpOwogICAgICAgICAKQEAgLTE1ODIsNyArMTU5Miw3
IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0Y2hDaGlsZExvZ2ljYWxIZWln
aHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg
Ly8gQXNwZWN0IHJhdGlvIGlzIHByb3Blcmx5IGhhbmRsZWQgYnkgUmVuZGVyUmVwbGFjZWQgZHVy
aW5nIGxheW91dC4KLSAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkLmhh
c0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKGNoaWxkLmlzUmVuZGVyUmVwbGFjZWQoKSAmJiBjaGls
ZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0
dXJuIGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzQXV0bygpOwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGIzODg5
MjMzZGNmMWUzMDJlN2FkYzk1OWYzMDE2NjRkN2QwYzI0ZmIuLmVlOWU0MDVjYWRhNmYwZmY1N2Ey
MmU5NDU4NDJkNjkxZTRiYTIzZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor
KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMS0yOSAg
Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0LXJh
dGlvIG9uIGZsZXhib3ggY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIxOTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFVuc2tpcCBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAg
ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAxLTI5ICBDb21taXQgUXVldWUgIDxjb21t
aXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3
MjA1Mi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGI3MzQ0ZmMyYTE0OTdlZGQxZjc1YTViZmE1ZWJi
ZDkxZjc4OTg3ZGIuLjkzYmE4M2UyYWM4ZTVmYTdhZThhMTM0NDkyNzYzY2MyOGM0NTNmYTUgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQyMywxOSArNDQyMyw2IEBAIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl
Y3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAw
Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxOC5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxOS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420005</attachid>
            <date>2021-02-11 10:59:07 -0800</date>
            <delta_ts>2021-02-16 05:38:36 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210211195905.patch</filename>
            <type>text/plain</type>
            <size>12074</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBiZjJmZGIzYmRhNDY1
ZWI0NjJjMTJmNWUyNzEzMDRhNzY4MWMyZS4uNDA5N2E5MjkwNWEwYWM4YjBmOTc1ZTJlYzE1YTdh
M2M1YWNiMTdkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTExICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGls
ZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcg
Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKwog
MjAyMS0wMi0xMSAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV0
dXJuaW5nIHNSR0IgZnJvbSBDRyBjb2xvciBzcGFjZSBmdW5jdGlvbnMgb24gZmFpbHVyZSBpcyB0
b28gZXJyb3IgcHJvbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXgg
M2Q2Yjk2ODk5MDAwZmQzZTFhY2MwNzYyYzNiOTRjMjM1MzQ4MDIxOC4uYWVjNjhiOGNjMzQ1YzJl
ZTllZDZjZWM5YTZlYjMzYWUwZDhiOGEyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAKQEAgLTI4NzAsNyArMjg3MCw3IEBAIHZvaWQgUmVuZGVyQm94OjpjYWNoZUludHJp
bnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0oTGF5b3V0VW5pdCBoZWlnaHQpCiAg
ICAgLy8gRklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2ggd2l0aCBjaGVja2luZyBoYXNPdmVycmlk
aW5nTG9naWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMgY291bGQgYmUgc2hhcmVkCiAgICAgLy8g
YnkgYW55IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJpZGVzIGxpa2UgZ3JpZCBvciBmbGV4LiBI
b3dldmVyIHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5nIHNlcXVlbmNlIG9mIGNhbGxzCiAgICAg
Ly8gYmV0d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxheW91dFRvQXZvaWRXaWRvd3MoKS4KLSAg
ICBpZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFwYXJlbnQoKSB8fCAh
cGFyZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgp
KQorICAgIGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgp
IHx8ICFwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVp
Z2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKICAg
ICAgICAgcmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSkt
PnNldENhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoKnRoaXMsIGhlaWdo
dCk7CiB9CkBAIC01MTA5LDcgKzUxMDksNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0
ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKCFzdHlsZSgpLmhh
c0FzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghc2hvdWxk
Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgp
LmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlz
UGVyY2VudE9yQ2FsY3VsYXRlZCgpKQorICAgIGlmICghaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWln
aHQoKSAmJiAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0
cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9n
aWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKQogICAgICAgICByZXR1cm4gZmFs
c2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGM0ZWE5OTQ3ZTMzZDMyM2ZhYmRmYWQ5MDcxNjZiYzc1
YzhlOWUyYjEuLmJkN2IxMjMyMGQ2OTY2Njg4MWE0NDFkZTBhODM1NzMyZjI5OGEyYzIgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTQz
LDYgKzU0MywxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRl
bnRFeHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaQogICAgIHJldHVybiBzdGQ6Om1h
eCgwX2x1LCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlclBhZGRpbmdBbmRTY3JvbGxi
YXIpOwogfQogCitzdGF0aWMgYm9vbCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQpCit7CisgICAgcmV0dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQu
c3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpOworfQorCiBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5k
ZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVy
Qm94JiBjaGlsZCwgU2l6ZVR5cGUgc2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYgc2l6ZSkKIHsKICAg
ICAvLyBJZiB3ZSBoYXZlIGEgaG9yaXpvbnRhbCBmbG93LCB0aGF0IG1lYW5zIHRoZSBtYWluIHNp
emUgaXMgdGhlIHdpZHRoLgpAQCAtNTY5LDcgKzU3NCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+
IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBS
ZW5kCiAgICAgLy8gb3VyIGxvZ2ljYWwgd2lkdGggaXMgYXV0bywgd2UgY2FuIGp1c3QgdXNlIG91
ciBjYWNoZWQgdmFsdWUuIFNvIGxldCdzIGRvCiAgICAgLy8gdGhhdCBoZXJlLiAoQ29tcGFyZSBj
b2RlIGluIExheW91dEJsb2NrOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocykKICAgICBM
YXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBjaGlsZC5ib3JkZXJBbmRQYWRkaW5nTG9naWNh
bFdpZHRoKCk7Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkg
JiYgIWNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dp
Y2FsV2lkdGgoKS5pc0F1dG8oKSAmJiAhY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpIHsKICAg
ICAgICAgaWYgKHNpemUudHlwZSgpID09IE1pbkNvbnRlbnQpCiAgICAgICAgICAgICByZXR1cm4g
Y2hpbGQubWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQYWRkaW5nOwogICAg
ICAgICBpZiAoc2l6ZS50eXBlKCkgPT0gTWF4Q29udGVudCkKQEAgLTczOSw5ICs3NDQsOSBAQCBM
YXlvdXRQb2ludCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChj
b25zdCBSZW5kZXJCb3gmIGNoaWxkKQogCiBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGls
ZEFzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFj
aGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGls
ZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUo
KS5oZWlnaHQoKSkgeworICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYm
ICFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKICAgICAgICAgLy8gV2UgY2FuJ3Qg
Y29tcHV0ZSBhIHJhdGlvIGluIHRoaXMgY2FzZS4KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg
IH0KQEAgLTc1Niw4ICs3NjEsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFz
cGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiAgICAgCiBMYXlvdXRVbml0
IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhj
b25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoKSBjb25zdAogewot
ICAgIEFTU0VSVChjaGlsZC5oYXNBc3BlY3RSYXRpbygpKTsKLSAgICBBU1NFUlQoY2hpbGQuaW50
cmluc2ljU2l6ZSgpLmhlaWdodCgpKTsKKyAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhj
aGlsZCkpOwogCiAgICAgYXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJl
bmRlckJveCYgYm94LCBMZW5ndGggbGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKICAgICAgICAgQVNT
RVJUKGxlbmd0aC5pc0ZpeGVkKCkpOwpAQCAtNzg2LDcgKzc5MCwxMyBAQCBMYXlvdXRVbml0IFJl
bmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25z
dCBSZW5kZXJCbwogICAgIH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2lj
U2l6ZSA9IGNoaWxkLmludHJpbnNpY1NpemUoKTsKLSAgICBkb3VibGUgcmF0aW8gPSBjaGlsZElu
dHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0
KCkudG9GbG9hdCgpOworICAgIGRvdWJsZSByYXRpbzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5h
c3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHls
ZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYm
IGNoaWxkSW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpKQorICAgICAgICByYXRpbyA9IGNoaWxkLnN0
eWxlKCkuYXNwZWN0UmF0aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdo
dCgpOworICAgIGVsc2UgeworICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdo
dCgpKTsKKyAgICAgICAgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0
KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgIH0KICAgICBp
ZiAoaXNIb3Jpem9udGFsRmxvdygpKQogICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1Np
emUudmFsdWUoKSAqIHJhdGlvKTsKICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFs
dWUoKSAvIHJhdGlvKTsKQEAgLTgzMyw3ICs4NDMsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94
OjpjaGlsZENyb3NzU2l6ZUlzRGVmaW5pdGUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgY29uc3Qg
TAogICAgICAgICAvLyAxLiBJZiBhIHNpbmdsZS1saW5lIGZsZXggY29udGFpbmVyIGhhcyBhIGRl
ZmluaXRlIGNyb3NzIHNpemUsIHRoZSBhdXRvbWF0aWMgcHJlZmVycmVkIG91dGVyIGNyb3NzIHNp
emUgb2YgYW55CiAgICAgICAgIC8vIHN0cmV0Y2hlZCBmbGV4IGl0ZW1zIGlzIHRoZSBmbGV4IGNv
bnRhaW5lcidzIGlubmVyIGNyb3NzIHNpemUgKGNsYW1wZWQgdG8gdGhlIGZsZXggaXRlbeKAmXMg
bWluIGFuZCBtYXggY3Jvc3Mgc2l6ZSkKICAgICAgICAgLy8gYW5kIGlzIGNvbnNpZGVyZWQgZGVm
aW5pdGUuCi0gICAgICAgIGlmICghaXNNdWx0aWxpbmUoKSAmJiBhbGlnbm1lbnRGb3JDaGlsZChj
aGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CisgICAgICAgIGlmICghaXNNdWx0aWxp
bmUoKSAmJiBhbGlnbm1lbnRGb3JDaGlsZChjaGlsZCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNo
ICYmICFoYXNBdXRvTWFyZ2luc0luQ3Jvc3NBeGlzKGNoaWxkKSkgewogICAgICAgICAgICAgLy8g
VGhpcyBtdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RS
YXRpb1VzaW5nKCkuCiAgICAgICAgICAgICAvLyBGSVhNRTogc28gZmFyIHdlJ3JlIG9ubHkgY29u
c2lkZXJlZCBmaXhlZCBzaXplcyBidXQgd2Ugc2hvdWxkIGV4dGVuZCBpdCB0byBvdGhlciBkZWZp
bml0ZSBzaXplcy4KICAgICAgICAgICAgIGlmIChhdXRvJiBjcm9zc1NpemUgPSBpc0hvcml6b250
YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgpOyBjcm9zc1NpemUu
aXNGaXhlZCgpKQpAQCAtMTE2Nyw3ICsxMTc3LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs
ZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQK
ICAgICAgICAgLy8gZW5zdXJlIGl0J3MgdmFsaWQgdGhyb3VnaCB0aGUgdmlydHVhbCBjYWxscyBv
ZiBjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZy4KICAgICAgICAgTGF5
b3V0VW5pdCBjb250ZW50U2l6ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxk
LCBNaW5TaXplLCBMZW5ndGgoTWluQ29udGVudCkpLnZhbHVlT3IoMCk7CiAgICAgICAgIEFTU0VS
VChjb250ZW50U2l6ZSA+PSAwKTsKLSAgICAgICAgaWYgKGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkg
JiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKKyAgICAgICAgaWYgKGNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSA+
IDApCiAgICAgICAgICAgICBjb250ZW50U2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJh
dGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCBjb250ZW50U2l6ZSk7CiAgICAgICAgIGNvbnRl
bnRTaXplID0gc3RkOjptaW4oY29udGVudFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNvbnRlbnRT
aXplKSk7CiAgICAgICAgIApAQCAtMTU4Miw3ICsxNTkyLDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJs
ZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodChjb25zdCBSZW5kZXJCb3gmIGNo
aWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBBc3BlY3QgcmF0aW8gaXMgcHJv
cGVybHkgaGFuZGxlZCBieSBSZW5kZXJSZXBsYWNlZCBkdXJpbmcgbGF5b3V0LgotICAgIGlmIChj
aGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICBp
ZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQp
KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gY2hpbGQuc3R5bGUoKS5sb2dp
Y2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2EzNjUyYTcxNjFkMDAyZDUxNGRiMzljMTY0
NTBjMWZhMjhlM2Q4Zi4uNzEzM2U5NGY0ODY3ZDYxNTJhY2MwNmE3ZWYyN2UwNGIyNjkxNTQyMyAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTExICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp
YS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gZmxleGJveCBjaGlsZHJl
bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5Njc5
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lw
IHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6
CisKIDIwMjEtMDItMTEgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+
IGFuZCBJbWFub2wgRmVybmFuZGV6ICA8aWZlcm5hbmRlekBpZ2FsaWEuY29tPgogCiAgICAgICAg
IENvbXBsZXRlIFhSU2Vzc2lvbjo6cmVxdWVzdEFuaW1hdGlvbkZyYW1lIGltcGxlbWVudGF0aW9u
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv
VGVzdEV4cGVjdGF0aW9ucwppbmRleCBmYzU0ZDlmMTQzZWFlMGY1NjRiNDIyNzI0MjE5NzgzNmY2
NTRiMTJhLi43YmUxYWJjMWMxNWYwZjJhODZlZjIxNWE0MWM5OTY0MjdjNjNiMzIxIDEwMDY0NAot
LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKQEAgLTQ1NTksMjIgKzQ1NTksNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
Lwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJh
dGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2Jsb2NrLWFzcGVjdC1yYXRpby0wMzAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDguaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDku
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTQuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTguaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMTkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420456</attachid>
            <date>2021-02-16 05:38:40 -0800</date>
            <delta_ts>2021-02-17 03:32:29 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210216143839.patch</filename>
            <type>text/plain</type>
            <size>11122</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyOTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY0NGM4ZjVkNTU4ZjQz
YjNlOWVjZjliZGY2YWE2ZGIwYzcyY2YxZS4uNWY0M2QzZmRhNmJkYWI0MTAyMTE3YWZhMzMyMTE5
MGY0MTcwZGY1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTE2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2ljYWxI
ZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAq
IHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGls
ZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcg
Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NT
aXplSXNEZWZpbml0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKwog
MjAyMS0wMi0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK
ICAgICAgICAgVGVhcmRvd24gc2hhZG93IHJvb3QgcmVuZGVyZXJzIG9uIGhvc3RDaGlsZEVsZW1l
bnREaWRDaGFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC
b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNjEw
YmQxOTU4YTYxYTY0NWEzN2U5MGJmNTA0OTMzMGRlMjc2YTUxMy4uMzc1ZmNmOTczZGY2YTAxNWYx
MGI3YzljNWJmYTNkZjk2Mjc0NmNlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHAKQEAgLTI4NjIsNyArMjg2Miw3IEBAIHZvaWQgUmVuZGVyQm94OjpjYWNoZUludHJpbnNp
Y0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0oTGF5b3V0VW5pdCBoZWlnaHQpCiAgICAg
Ly8gRklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2ggd2l0aCBjaGVja2luZyBoYXNPdmVycmlkaW5n
TG9naWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMgY291bGQgYmUgc2hhcmVkCiAgICAgLy8gYnkg
YW55IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJpZGVzIGxpa2UgZ3JpZCBvciBmbGV4LiBIb3dl
dmVyIHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5nIHNlcXVlbmNlIG9mIGNhbGxzCiAgICAgLy8g
YmV0d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxheW91dFRvQXZvaWRXaWRvd3MoKS4KLSAgICBp
ZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFwYXJlbnQoKSB8fCAhcGFy
ZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQor
ICAgIGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8
ICFwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0
KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKICAgICAg
ICAgcmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSktPnNl
dENhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoKnRoaXMsIGhlaWdodCk7
CiB9CkBAIC01MTAwLDcgKzUxMDAsNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxv
Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKCFzdHlsZSgpLmhhc0Fz
cGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghc2hvdWxkQ29t
cHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgpLmxv
Z2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVy
Y2VudE9yQ2FsY3VsYXRlZCgpKQorICAgIGlmICghaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQo
KSAmJiAhc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygp
ICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9naWNh
bEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7
CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCmluZGV4IGI2MzAwN2VhMjMzYTc3ZGNmZWU1ZGNiZDc0NzhiYTk4NGEx
ODQ1MDQuLmM0ZDAwNWExODZkMDFlYmVkNDhlZDcyYmNiOTUwYzNiYjM0NmE3M2EgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTQ0LDYg
KzU0NCwxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRlbnRF
eHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaQogICAgIHJldHVybiBzdGQ6Om1heCgw
X2x1LCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlclBhZGRpbmdBbmRTY3JvbGxiYXIp
OwogfQogCitzdGF0aWMgYm9vbCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpCit7CisgICAgcmV0dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuc3R5
bGUoKS5oYXNBc3BlY3RSYXRpbygpOworfQorCiBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94
JiBjaGlsZCwgU2l6ZVR5cGUgc2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYgc2l6ZSkKIHsKICAgICAv
LyBJZiB3ZSBoYXZlIGEgaG9yaXpvbnRhbCBmbG93LCB0aGF0IG1lYW5zIHRoZSBtYWluIHNpemUg
aXMgdGhlIHdpZHRoLgpAQCAtNTcwLDcgKzU3NSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJl
bmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5k
CiAgICAgLy8gb3VyIGxvZ2ljYWwgd2lkdGggaXMgYXV0bywgd2UgY2FuIGp1c3QgdXNlIG91ciBj
YWNoZWQgdmFsdWUuIFNvIGxldCdzIGRvCiAgICAgLy8gdGhhdCBoZXJlLiAoQ29tcGFyZSBjb2Rl
IGluIExheW91dEJsb2NrOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocykKICAgICBMYXlv
dXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBjaGlsZC5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdp
ZHRoKCk7Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYg
IWNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2Fs
V2lkdGgoKS5pc0F1dG8oKSAmJiAhY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpIHsKICAgICAg
ICAgaWYgKHNpemUuaXNNaW5Db250ZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gY2hpbGQubWlu
UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQYWRkaW5nOwogICAgICAgICBpZiAo
c2l6ZS5pc01heENvbnRlbnQoKSkKQEAgLTc0MCw5ICs3NDUsOSBAQCBMYXlvdXRQb2ludCBSZW5k
ZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gm
IGNoaWxkKQogCiBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RS
YXRpbygpKQorICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJl
dHVybiBmYWxzZTsKLSAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkgewor
ICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkpIHsKICAgICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlv
IGluIHRoaXMgY2FzZS4KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTc1Nyw4ICs3
NjIsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiAgICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl
Qm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoKSBjb25zdAogewotICAgIEFTU0VSVChjaGls
ZC5oYXNBc3BlY3RSYXRpbygpKTsKLSAgICBBU1NFUlQoY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhl
aWdodCgpKTsKKyAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogCiAgICAg
YXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBM
ZW5ndGggbGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKICAgICAgICAgQVNTRVJUKGxlbmd0aC5pc0Zp
eGVkKCkpOwpAQCAtNzgyLDcgKzc4NiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94
Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAg
IH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmlu
dHJpbnNpY1NpemUoKTsKLSAgICBkb3VibGUgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lk
dGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOwor
ICAgIGRvdWJsZSByYXRpbzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUo
KSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlv
VHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2lj
U2l6ZS5pc0VtcHR5KCkpKQorICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0
aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOworICAgIGVsc2Ug
eworICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsKKyAgICAgICAg
cmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJp
bnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFs
RmxvdygpKQogICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJh
dGlvKTsKICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsK
QEAgLTExNTIsNyArMTE2Miw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVz
dENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgIC8v
IGVuc3VyZSBpdCdzIHZhbGlkIHRocm91Z2ggdGhlIHZpcnR1YWwgY2FsbHMgb2YgY29tcHV0ZUlu
dHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcuCiAgICAgICAgIExheW91dFVuaXQgY29u
dGVudFNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwg
TGVuZ3RoKExlbmd0aFR5cGU6Ok1pbkNvbnRlbnQpKS52YWx1ZU9yKDApOwogICAgICAgICBBU1NF
UlQoY29udGVudFNpemUgPj0gMCk7Ci0gICAgICAgIGlmIChjaGlsZC5oYXNBc3BlY3RSYXRpbygp
ICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSA+IDApCisgICAgICAgIGlmIChjaGls
ZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSAmJiBjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkg
PiAwKQogICAgICAgICAgICAgY29udGVudFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RS
YXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwgY29udGVudFNpemUpOwogICAgICAgICBjb250
ZW50U2l6ZSA9IHN0ZDo6bWluKGNvbnRlbnRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjb250ZW50
U2l6ZSkpOwogICAgICAgICAKQEAgLTE1NjcsNyArMTU3Nyw3IEBAIGJvb2wgUmVuZGVyRmxleGli
bGVCb3g6Om5lZWRUb1N0cmV0Y2hDaGlsZExvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gQXNwZWN0IHJhdGlvIGlzIHBy
b3Blcmx5IGhhbmRsZWQgYnkgUmVuZGVyUmVwbGFjZWQgZHVyaW5nIGxheW91dC4KLSAgICBpZiAo
Y2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAg
aWYgKGNoaWxkLmlzUmVuZGVyUmVwbGFjZWQoKSAmJiBjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxk
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIGNoaWxkLnN0eWxlKCkubG9n
aWNhbEhlaWdodCgpLmlzQXV0bygpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA3MDQ2MTdhZjE1MmZjZmU2ODY2MzEyNmU2
OTY4NWNlZGViMWEwODQuLjFkZTkzMzA2MTY3ODQ5OGNiNmQ2ZGM4NTk2OWYxZjA1MjdhZDc4YzEg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0xNiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2Fs
aWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0LXJhdGlvIG9uIGZsZXhib3ggY2hpbGRy
ZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTY3
OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuc2tp
cCBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25z
OgorCiAyMDIxLTAyLTE2ICBDaHJpcyBMb3JkICA8Y2xvcmRAaWdhbGlhLmNvbT4KIAogICAgICAg
ICBbR1RLXVtXUEVdIHRleC1pbWFnZS1hbmQtc3ViLWltYWdlLTJkLXdpdGgtdmlkZW8gdGVzdHMg
cGFzcyB1bmV4cGVjdGVkbHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGUwMTUxNTQ1MDY1OTViNDZk
MzZiYzI0MTIyZmVmMTA2NDY2ZDhkOWYuLmQ4NGMzZDMwNjZhYjc0MGRjZWQ4OTVkNjBiMzg5NWUy
YzEzNDI5OTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU2MSwyMiArNDU2MSw2IEBAIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1y
YXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzMC5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAw
OC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxNy5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAxOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAxOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420624</attachid>
            <date>2021-02-17 03:32:35 -0800</date>
            <delta_ts>2021-02-17 04:52:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210217123233.patch</filename>
            <type>text/plain</type>
            <size>11773</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyOTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY1YWJmOGNiMDE5YjJj
N2ZjMzZjMGU3NzQ1YWZmMWMzODdhYzEyMy4uOGVjZmVmZjcwYTU0MzcwMjc3Y2IwM2M1ZTFkMGY2
MDJhMmI0MGFmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTE3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1h
eCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29u
dGVudExvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3Qp
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpjaGlsZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZs
ZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVj
dFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6
OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIw
MjEtMDItMTYgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBD
U1MgcHJvcGVydHkgdG8gZW5hYmxlIHNlcGFyYXRlZCBiaXQgb24gR3JhcGhpY3NMYXllcgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA2MTBiZDE5NThhNjFhNjQ1YTM3
ZTkwYmY1MDQ5MzMwZGUyNzZhNTEzLi42NDE2ZjU3NTk0YjkwMDIxZjk5ZDgyNjhlNDI2YjU0YmFm
M2E2ZWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjc5LDcg
KzY3OSw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlN
aW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPCiAgICAgICAgICAgICBsb2dpY2FsSGVp
Z2h0ID0gc3RkOjptaW4obG9naWNhbEhlaWdodCwgbWF4SC52YWx1ZSgpKTsKICAgICB9CiAgICAg
YXV0byBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7Ci0g
ICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxI
ZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAmJiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIHN0eWxl
VG9Vc2Uub3ZlcmZsb3dCbG9ja0RpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKQorICAg
IGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVp
Z2h0RnJvbUFzcGVjdFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBpbnRyaW5z
aWNDb250ZW50SGVpZ2h0ICE9IExheW91dFVuaXQ6Om1heCgpICYmIHN0eWxlVG9Vc2Uub3ZlcmZs
b3dCbG9ja0RpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKQogICAgICAgICBsb2dpY2Fs
TWluSGVpZ2h0ID0gTGVuZ3RoKCppbnRyaW5zaWNDb250ZW50SGVpZ2h0LCBMZW5ndGhUeXBlOjpG
aXhlZCk7CiAgICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhlaWdo
dCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgbG9naWNhbE1pbkhlaWdodCwg
aW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2Fs
SGVpZ2h0LCBjb21wdXRlZExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CkBAIC0yODYyLDcgKzI4NjIs
NyBAQCB2b2lkIFJlbmRlckJveDo6Y2FjaGVJbnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodEZv
ckZsZXhJdGVtKExheW91dFVuaXQgaGVpZ2h0KQogICAgIC8vIEZJWE1FOiBpdCBzaG91bGQgYmUg
ZW5vdWdoIHdpdGggY2hlY2tpbmcgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSBhcyB0aGlz
IGxvZ2ljIGNvdWxkIGJlIHNoYXJlZAogICAgIC8vIGJ5IGFueSBsYXlvdXQgc3lzdGVtIHVzaW5n
IG92ZXJyaWRlcyBsaWtlIGdyaWQgb3IgZmxleC4gSG93ZXZlciB0aGlzIGNhdXNlcyBhIG5ldmVy
IGVuZGluZyBzZXF1ZW5jZSBvZiBjYWxscwogICAgIC8vIGJldHdlZW4gbGF5b3V0QmxvY2soKSA8
LT4gcmVsYXlvdXRUb0F2b2lkV2lkb3dzKCkuCi0gICAgaWYgKGlzRmxvYXRpbmdPck91dE9mRmxv
d1Bvc2l0aW9uZWQoKSB8fCAhcGFyZW50KCkgfHwgIXBhcmVudCgpLT5pc0ZsZXhpYmxlQm94KCkg
fHwgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSkKKyAgICBpZiAoaXNGbG9hdGluZ09yT3V0
T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFwYXJlbnQoKSB8fCAhcGFyZW50KCktPmlzRmxleGlibGVC
b3goKSB8fCBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpIHx8IHNob3VsZENvbXB1dGVMb2dp
Y2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybjsKICAgICBkb3duY2Fz
dDxSZW5kZXJGbGV4aWJsZUJveD4ocGFyZW50KCkpLT5zZXRDYWNoZWRDaGlsZEludHJpbnNpY0Nv
bnRlbnRMb2dpY2FsSGVpZ2h0KCp0aGlzLCBoZWlnaHQpOwogfQpAQCAtNTEwMCw3ICs1MTAwLDcg
QEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0
aW8oKSBjb25zdAogICAgIGlmICghc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQogICAgICAgICBy
ZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw
ZWN0UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgp
ICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkKKyAg
ICBpZiAoIWhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgJiYgIXNob3VsZENvbXB1dGVMb2dp
Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVp
Z2h0KCkuaXNGaXhlZCgpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNh
bGN1bGF0ZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBi
NjMwMDdlYTIzM2E3N2RjZmVlNWRjYmQ3NDc4YmE5ODRhMTg0NTA0Li5jNGQwMDVhMTg2ZDAxZWJl
ZDQ4ZWQ3MmJjYjk1MGMzYmIzNDZhNzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTU0NCw2ICs1NDQsMTEgQEAgTGF5b3V0VW5pdCBS
ZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVu
dExvZ2ljYWxIZWkKICAgICByZXR1cm4gc3RkOjptYXgoMF9sdSwgY29tcHV0ZWRWYWx1ZXMubV9l
eHRlbnQgLSBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyKTsKIH0KIAorc3RhdGljIGJvb2wgY2hp
bGRIYXNBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQoreworICAgIHJldHVybiBj
aGlsZC5oYXNBc3BlY3RSYXRpbygpIHx8IGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKTsK
K30KKwogT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
QXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIFNpemVUeXBlIHNpemVU
eXBlLCBjb25zdCBMZW5ndGgmIHNpemUpCiB7CiAgICAgLy8gSWYgd2UgaGF2ZSBhIGhvcml6b250
YWwgZmxvdywgdGhhdCBtZWFucyB0aGUgbWFpbiBzaXplIGlzIHRoZSB3aWR0aC4KQEAgLTU3MCw3
ICs1NzUsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0
ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZAogICAgIC8vIG91ciBsb2dpY2FsIHdp
ZHRoIGlzIGF1dG8sIHdlIGNhbiBqdXN0IHVzZSBvdXIgY2FjaGVkIHZhbHVlLiBTbyBsZXQncyBk
bwogICAgIC8vIHRoYXQgaGVyZS4gKENvbXBhcmUgY29kZSBpbiBMYXlvdXRCbG9jazo6Y29tcHV0
ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpCiAgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5n
ID0gY2hpbGQuYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpOwotICAgIGlmIChjaGlsZC5z
dHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZC5oYXNBc3BlY3RSYXRpbygp
KSB7CisgICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNo
aWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKSB7CiAgICAgICAgIGlmIChzaXplLmlzTWluQ29udGVu
dCgpKQogICAgICAgICAgICAgcmV0dXJuIGNoaWxkLm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgp
IC0gYm9yZGVyQW5kUGFkZGluZzsKICAgICAgICAgaWYgKHNpemUuaXNNYXhDb250ZW50KCkpCkBA
IC03NDAsOSArNzQ1LDkgQEAgTGF5b3V0UG9pbnQgUmVuZGVyRmxleGlibGVCb3g6OmZsb3dBd2Fy
ZUxvY2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKIAogYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj
b25zdAogewotICAgIGlmICghY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFj
aGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpIHsKKyAgICBpZiAoIWNoaWxkLmludHJpbnNp
Y1NpemUoKS5oZWlnaHQoKSAmJiAhY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CiAg
ICAgICAgIC8vIFdlIGNhbid0IGNvbXB1dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCiAgICAgICAg
IHJldHVybiBmYWxzZTsKICAgICB9CkBAIC03NTcsOCArNzYyLDcgQEAgYm9vbCBSZW5kZXJGbGV4
aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z
dAogICAgIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJv
bUFzcGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6
ZUxlbmd0aCkgY29uc3QKIHsKLSAgICBBU1NFUlQoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSk7Ci0g
ICAgQVNTRVJUKGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSk7CisgICAgQVNTRVJUKGNo
aWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAogICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5n
ID0gW3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0
VW5pdCB7CiAgICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKQEAgLTc4Miw3ICs3ODYs
MTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFz
cGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICB9CiAKICAgICBjb25zdCBMYXlvdXRT
aXplJiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7Ci0gICAgZG91
YmxlIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJ
bnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICBkb3VibGUgcmF0aW87CisgICAg
aWYgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpS
YXRpbyB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5
cGU6OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICAg
ICAgcmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxl
KCkuYXNwZWN0UmF0aW9IZWlnaHQoKTsKKyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKGNoaWxk
SW50cmluc2ljU2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNT
aXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxv
YXQoKTsKKyAgICB9CiAgICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKICAgICAgICAgcmV0dXJu
IExheW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbyk7CiAgICAgcmV0dXJuIExheW91
dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbyk7CkBAIC0xMTUyLDcgKzExNjIsNyBAQCBM
YXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgo
Y29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAvLyBlbnN1cmUgaXQncyB2YWxpZCB0aHJv
dWdoIHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhl
aWdodFVzaW5nLgogICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5B
eGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIExlbmd0aChMZW5ndGhUeXBlOjpNaW5D
b250ZW50KSkudmFsdWVPcigwKTsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRTaXplID49IDApOwot
ICAgICAgICBpZiAoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZC5pbnRyaW5zaWNTaXpl
KCkuaGVpZ2h0KCkgPiAwKQorICAgICAgICBpZiAoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkg
JiYgY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKICAgICAgICAgICAgIGNvbnRl
bnRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgo
Y2hpbGQsIGNvbnRlbnRTaXplKTsKICAgICAgICAgY29udGVudFNpemUgPSBzdGQ6Om1pbihjb250
ZW50U2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY29udGVudFNpemUpKTsKICAgICAgICAgCkBAIC0x
NTY3LDcgKzE1NzcsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hp
bGRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAgICAgICAgIHJldHVybiBm
YWxzZTsKIAogICAgIC8vIEFzcGVjdCByYXRpbyBpcyBwcm9wZXJseSBoYW5kbGVkIGJ5IFJlbmRl
clJlcGxhY2VkIGR1cmluZyBsYXlvdXQuCi0gICAgaWYgKGNoaWxkLmlzUmVuZGVyUmVwbGFjZWQo
KSAmJiBjaGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxh
Y2VkKCkgJiYgY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCAwNmU3NDc5YTJlNjU5ZTNhNzgzMDZkMzA0YmQyMTkzYTAyMWY2NTJlLi5hNzM2MWJh
NDM1YjQzMGJkOTJhZjdlNWU3OTFmMTdjNzZiNmEzYjA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK
KzIwMjEtMDItMTcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBw
b3J0IGFzcGVjdC1yYXRpbyBvbiBmbGV4Ym94IGNoaWxkcmVuCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2NzkKKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgc29tZSB0ZXN0cyB0aGF0IHBhc3Mg
bm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMi0xNiAgTWFudWVs
IFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdhbGlhLmNvbT4KIAogICAgICAgICBbc2VsZWN0b3Jz
XSA6Zm9jdXMtdmlzaWJsZSBwYXJzaW5nIGFuZCBleHBlcmltZW50YWwgZmxhZwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKaW5kZXggYjEwYmU4NjM5MGVkY2U2OThjZGMzZWNiMjlmZjFmOWJiMjNmNjdiYi4uZjI3
ZGNlZGQ3NzgyMDlmMjVmODFmZDYxYTJkMWQ5ZjU5MzlmMGUzYyAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
CkBAIC00NTYwLDIwICs0NTYwLDcgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjguaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl
Y3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KKyMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420628</attachid>
            <date>2021-02-17 04:52:43 -0800</date>
            <delta_ts>2021-02-18 02:08:41 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210217135240.patch</filename>
            <type>text/plain</type>
            <size>11872</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyOTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjExYTJmM2RmMTMwN2Jj
Y2M2MzM4OTMyNTY3NmQxNzQ5YTgyYWY1MS4uNzdiMmE2NzZmNDJkYmI5OTc2ZWI0MGJlMTIzNzMx
MzIxYmY2OGQ0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTE3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1h
eCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29u
dGVudExvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3Qp
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpjaGlsZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZs
ZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVj
dFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6
OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIw
MjEtMDItMTcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBJbXByb3Zl
IHBlcmNlbnRhZ2UgaGVpZ2h0IGluIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0
UmF0aW8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZDU4OTVmMDY1
OTliMDM5MzM5ZWM5ZDE3ZGJlNzdiNmQ2YjQyZDljMS4uZGUyNWUzODE0MmRiNWJhNWFiMDMxNGM2
ZjA1Nzk1NTBjZDczNzczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK
QEAgLTY3OSw3ICs2NzksNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNh
bEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTwogICAgICAgICAgICAg
bG9naWNhbEhlaWdodCA9IHN0ZDo6bWluKGxvZ2ljYWxIZWlnaHQsIG1heEgudmFsdWUoKSk7CiAg
ICAgfQogICAgIGF1dG8gbG9naWNhbE1pbkhlaWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhl
aWdodCgpOwotICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1
dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdo
dCAmJiBzdHlsZVRvVXNlLm92ZXJmbG93QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6Vmlz
aWJsZSkKKyAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRl
TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpICYmIGludHJpbnNpY0NvbnRlbnRIZWlnaHQg
JiYgaW50cmluc2ljQ29udGVudEhlaWdodCAhPSBMYXlvdXRVbml0OjptYXgoKSAmJiBzdHlsZVRv
VXNlLm92ZXJmbG93QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkKICAgICAg
ICAgbG9naWNhbE1pbkhlaWdodCA9IExlbmd0aCgqaW50cmluc2ljQ29udGVudEhlaWdodCwgTGVu
Z3RoVHlwZTo6Rml4ZWQpOwogICAgIGlmIChPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZExv
Z2ljYWxIZWlnaHQgPSBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIGxvZ2ljYWxN
aW5IZWlnaHQsIGludHJpbnNpY0NvbnRlbnRIZWlnaHQpKQogICAgICAgICByZXR1cm4gc3RkOjpt
YXgobG9naWNhbEhlaWdodCwgY29tcHV0ZWRMb2dpY2FsSGVpZ2h0LnZhbHVlKCkpOwpAQCAtMjg2
Miw3ICsyODYyLDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29udGVudExvZ2lj
YWxIZWlnaHRGb3JGbGV4SXRlbShMYXlvdXRVbml0IGhlaWdodCkKICAgICAvLyBGSVhNRTogaXQg
c2hvdWxkIGJlIGVub3VnaCB3aXRoIGNoZWNraW5nIGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0
KCkgYXMgdGhpcyBsb2dpYyBjb3VsZCBiZSBzaGFyZWQKICAgICAvLyBieSBhbnkgbGF5b3V0IHN5
c3RlbSB1c2luZyBvdmVycmlkZXMgbGlrZSBncmlkIG9yIGZsZXguIEhvd2V2ZXIgdGhpcyBjYXVz
ZXMgYSBuZXZlciBlbmRpbmcgc2VxdWVuY2Ugb2YgY2FsbHMKICAgICAvLyBiZXR3ZWVuIGxheW91
dEJsb2NrKCkgPC0+IHJlbGF5b3V0VG9Bdm9pZFdpZG93cygpLgotICAgIGlmIChpc0Zsb2F0aW5n
T3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8ICFwYXJlbnQoKS0+aXNGbGV4
aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkpCisgICAgaWYgKGlzRmxv
YXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCAhcGFyZW50KCkgfHwgIXBhcmVudCgpLT5p
c0ZsZXhpYmxlQm94KCkgfHwgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSB8fCBzaG91bGRD
b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm47CiAg
ICAgZG93bmNhc3Q8UmVuZGVyRmxleGlibGVCb3g+KHBhcmVudCgpKS0+c2V0Q2FjaGVkQ2hpbGRJ
bnRyaW5zaWNDb250ZW50TG9naWNhbEhlaWdodCgqdGhpcywgaGVpZ2h0KTsKIH0KQEAgLTUxMDMs
NyArNTEwMyw3IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv
bUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICBhdXRvIGlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VIZWln
aHQgPSBbdGhpc10gKCkgewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCku
aXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IHBl
cmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwogICAgIH07Ci0gICAgaWYgKCFz
aG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgJiYgIXN0
eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhaXNSZXNvbHZhYmxlUGVyY2VudGFn
ZUhlaWdodCgpKQorICAgIGlmICghaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSAmJiAhc2hv
dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHls
ZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIWlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VI
ZWlnaHQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBiNjMw
MDdlYTIzM2E3N2RjZmVlNWRjYmQ3NDc4YmE5ODRhMTg0NTA0Li5jNGQwMDVhMTg2ZDAxZWJlZDQ4
ZWQ3MmJjYjk1MGMzYmIzNDZhNzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTU0NCw2ICs1NDQsMTEgQEAgTGF5b3V0VW5pdCBSZW5k
ZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVudExv
Z2ljYWxIZWkKICAgICByZXR1cm4gc3RkOjptYXgoMF9sdSwgY29tcHV0ZWRWYWx1ZXMubV9leHRl
bnQgLSBib3JkZXJQYWRkaW5nQW5kU2Nyb2xsYmFyKTsKIH0KIAorc3RhdGljIGJvb2wgY2hpbGRI
YXNBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQoreworICAgIHJldHVybiBjaGls
ZC5oYXNBc3BlY3RSYXRpbygpIHx8IGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKTsKK30K
KwogT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhp
c0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIFNpemVUeXBlIHNpemVUeXBl
LCBjb25zdCBMZW5ndGgmIHNpemUpCiB7CiAgICAgLy8gSWYgd2UgaGF2ZSBhIGhvcml6b250YWwg
ZmxvdywgdGhhdCBtZWFucyB0aGUgbWFpbiBzaXplIGlzIHRoZSB3aWR0aC4KQEAgLTU3MCw3ICs1
NzUsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1h
aW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZAogICAgIC8vIG91ciBsb2dpY2FsIHdpZHRo
IGlzIGF1dG8sIHdlIGNhbiBqdXN0IHVzZSBvdXIgY2FjaGVkIHZhbHVlLiBTbyBsZXQncyBkbwog
ICAgIC8vIHRoYXQgaGVyZS4gKENvbXBhcmUgY29kZSBpbiBMYXlvdXRCbG9jazo6Y29tcHV0ZVBy
ZWZlcnJlZExvZ2ljYWxXaWR0aHMpCiAgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nID0g
Y2hpbGQuYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpOwotICAgIGlmIChjaGlsZC5zdHls
ZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmICFjaGlsZC5oYXNBc3BlY3RSYXRpbygpKSB7
CisgICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgIWNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpKSB7CiAgICAgICAgIGlmIChzaXplLmlzTWluQ29udGVudCgp
KQogICAgICAgICAgICAgcmV0dXJuIGNoaWxkLm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIC0g
Ym9yZGVyQW5kUGFkZGluZzsKICAgICAgICAgaWYgKHNpemUuaXNNYXhDb250ZW50KCkpCkBAIC03
NDAsOSArNzQ1LDkgQEAgTGF5b3V0UG9pbnQgUmVuZGVyRmxleGlibGVCb3g6OmZsb3dBd2FyZUxv
Y2F0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKIAogYm9vbCBSZW5kZXJGbGV4
aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z
dAogewotICAgIGlmICghY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAoIWNoaWxkSGFz
QXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFjaGls
ZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpIHsKKyAgICBpZiAoIWNoaWxkLmludHJpbnNpY1Np
emUoKS5oZWlnaHQoKSAmJiAhY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7CiAgICAg
ICAgIC8vIFdlIGNhbid0IGNvbXB1dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCiAgICAgICAgIHJl
dHVybiBmYWxzZTsKICAgICB9CkBAIC03NTcsOCArNzYyLDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJs
ZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAog
ICAgIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFz
cGVjdFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNyb3NzU2l6ZUxl
bmd0aCkgY29uc3QKIHsKLSAgICBBU1NFUlQoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSk7Ci0gICAg
QVNTRVJUKGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSk7CisgICAgQVNTRVJUKGNoaWxk
SGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKIAogICAgIGF1dG8gYWRqdXN0Rm9yQm94U2l6aW5nID0g
W3RoaXNdIChjb25zdCBSZW5kZXJCb3gmIGJveCwgTGVuZ3RoIGxlbmd0aCkgLT4gTGF5b3V0VW5p
dCB7CiAgICAgICAgIEFTU0VSVChsZW5ndGguaXNGaXhlZCgpKTsKQEAgLTc4Miw3ICs3ODYsMTMg
QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVj
dFJhdGlvVXNpbmcoY29uc3QgUmVuZGVyQm8KICAgICB9CiAKICAgICBjb25zdCBMYXlvdXRTaXpl
JiBjaGlsZEludHJpbnNpY1NpemUgPSBjaGlsZC5pbnRyaW5zaWNTaXplKCk7Ci0gICAgZG91Ymxl
IHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXplLndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRy
aW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQoKTsKKyAgICBkb3VibGUgcmF0aW87CisgICAgaWYg
KGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpSYXRp
byB8fCAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5cGU6
OkF1dG9BbmRSYXRpbyAmJiBjaGlsZEludHJpbnNpY1NpemUuaXNFbXB0eSgpKSkKKyAgICAgICAg
cmF0aW8gPSBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvV2lkdGgoKSAvIGNoaWxkLnN0eWxlKCku
YXNwZWN0UmF0aW9IZWlnaHQoKTsKKyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKGNoaWxkSW50
cmluc2ljU2l6ZS5oZWlnaHQoKSk7CisgICAgICAgIHJhdGlvID0gY2hpbGRJbnRyaW5zaWNTaXpl
LndpZHRoKCkudG9GbG9hdCgpIC8gY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpLnRvRmxvYXQo
KTsKKyAgICB9CiAgICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKICAgICAgICAgcmV0dXJuIExh
eW91dFVuaXQoY3Jvc3NTaXplLnZhbHVlKCkgKiByYXRpbyk7CiAgICAgcmV0dXJuIExheW91dFVu
aXQoY3Jvc3NTaXplLnZhbHVlKCkgLyByYXRpbyk7CkBAIC0xMTUyLDcgKzExNjIsNyBAQCBMYXlv
dXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29u
c3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAvLyBlbnN1cmUgaXQncyB2YWxpZCB0aHJvdWdo
IHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdo
dFVzaW5nLgogICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5BeGlz
RXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIExlbmd0aChMZW5ndGhUeXBlOjpNaW5Db250
ZW50KSkudmFsdWVPcigwKTsKICAgICAgICAgQVNTRVJUKGNvbnRlbnRTaXplID49IDApOwotICAg
ICAgICBpZiAoY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZC5pbnRyaW5zaWNTaXplKCku
aGVpZ2h0KCkgPiAwKQorICAgICAgICBpZiAoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkgJiYg
Y2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpID4gMCkKICAgICAgICAgICAgIGNvbnRlbnRT
aXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hp
bGQsIGNvbnRlbnRTaXplKTsKICAgICAgICAgY29udGVudFNpemUgPSBzdGQ6Om1pbihjb250ZW50
U2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY29udGVudFNpemUpKTsKICAgICAgICAgCkBAIC0xNTY3
LDcgKzE1NzcsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJldGNoQ2hpbGRM
b2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAgICAgICAgIHJldHVybiBmYWxz
ZTsKIAogICAgIC8vIEFzcGVjdCByYXRpbyBpcyBwcm9wZXJseSBoYW5kbGVkIGJ5IFJlbmRlclJl
cGxhY2VkIGR1cmluZyBsYXlvdXQuCi0gICAgaWYgKGNoaWxkLmlzUmVuZGVyUmVwbGFjZWQoKSAm
JiBjaGlsZC5oYXNBc3BlY3RSYXRpbygpKQorICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2Vk
KCkgJiYgY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK
IAogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp
bmRleCA4NmE2MmE5ZDAxNjY5ZjZiYjA2ZmQ0YWVkYjhlYzUwZDU4ZDJhNGU0Li41NDM2ZTYxZDlh
ZmM5MTE0MDA1NTU4MTg1OTZkMjU2YmRkYzkwY2EzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw
MjEtMDItMTcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBTdXBwb3J0
IGFzcGVjdC1yYXRpbyBvbiBmbGV4Ym94IGNoaWxkcmVuCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk2NzkKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93
LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMi0xNyAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEltcHJvdmUgcGVyY2VudGFnZSBoZWlnaHQg
aW4gc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMKaW5kZXggMmI1MGVlNGY1MDdmN2NiNWRkMzk5ODZlYzI1YWZkYjljZjhiMzY0Ny4uOWM3MDk3
ZWU3ZGUxNzZlMTcxOGQ5Y2E3MjUyOWFjNmQ0MDk1NWY0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBA
IC00NTU5LDIwICs0NTU5LDcgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KKyMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420814</attachid>
            <date>2021-02-18 02:08:45 -0800</date>
            <delta_ts>2021-02-19 01:00:14 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210218110844.patch</filename>
            <type>text/plain</type>
            <size>11631</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFiNzBhYWYyYTdlOGJk
ZmFiMWY5MjIxOWRlYjljNTRhYjY3ZjM3Yy4uZjVhOTNkMDIzZDllNWU4NDY3NTUwMTc5ZmU3MTU1
OTA0NGQwNTU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTAyLTE4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBjaGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1h
eCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlSW50cmluc2ljQ29u
dGVudExvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3Qp
OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpjaGlsZEhhc0FzcGVjdFJhdGlvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZs
ZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5TaXplRnJvbUFzcGVj
dFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6
OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJG
bGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIw
MjEtMDItMTUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAg
ICAgICAgW2Nzcy1mbGV4XSBJbXBsZW1lbnQgc2VjdGlvbiA5LjggRGVmaW5pdGUgYW5kIEluZGVm
aW5pdGUgU2l6ZXMgY2FzZSAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmlu
ZGV4IGQ1ODk1ZjA2NTk5YjAzOTMzOWVjOWQxN2RiZTc3YjZkNmI0MmQ5YzEuLmRlMjVlMzgxNDJk
YjViYTVhYjAzMTRjNmYwNTc5NTUwY2Q3Mzc3MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCkBAIC02NzksNyArNjc5LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNv
bnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE8K
ICAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1pbihsb2dpY2FsSGVpZ2h0LCBtYXhI
LnZhbHVlKCkpOwogICAgIH0KICAgICBhdXRvIGxvZ2ljYWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNl
LmxvZ2ljYWxNaW5IZWlnaHQoKTsKLSAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1dG8oKSAm
JiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpICYmIGludHJpbnNp
Y0NvbnRlbnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGlyZWN0aW9uKCkgPT0g
T3ZlcmZsb3c6OlZpc2libGUpCisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkgJiYg
c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAmJiBpbnRyaW5zaWND
b250ZW50SGVpZ2h0ICYmIGludHJpbnNpY0NvbnRlbnRIZWlnaHQgIT0gTGF5b3V0VW5pdDo6bWF4
KCkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZp
c2libGUpCiAgICAgICAgIGxvZ2ljYWxNaW5IZWlnaHQgPSBMZW5ndGgoKmludHJpbnNpY0NvbnRl
bnRIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkKTsKICAgICBpZiAoT3B0aW9uYWw8TGF5b3V0VW5p
dD4gY29tcHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5T
aXplLCBsb2dpY2FsTWluSGVpZ2h0LCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSkKICAgICAgICAg
cmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxIZWlnaHQsIGNvbXB1dGVkTG9naWNhbEhlaWdodC52YWx1
ZSgpKTsKQEAgLTI4NjIsNyArMjg2Miw3IEBAIHZvaWQgUmVuZGVyQm94OjpjYWNoZUludHJpbnNp
Y0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0oTGF5b3V0VW5pdCBoZWlnaHQpCiAgICAg
Ly8gRklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2ggd2l0aCBjaGVja2luZyBoYXNPdmVycmlkaW5n
TG9naWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMgY291bGQgYmUgc2hhcmVkCiAgICAgLy8gYnkg
YW55IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJpZGVzIGxpa2UgZ3JpZCBvciBmbGV4LiBIb3dl
dmVyIHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5nIHNlcXVlbmNlIG9mIGNhbGxzCiAgICAgLy8g
YmV0d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxheW91dFRvQXZvaWRXaWRvd3MoKS4KLSAgICBp
ZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFwYXJlbnQoKSB8fCAhcGFy
ZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQor
ICAgIGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8
ICFwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0
KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKICAgICAg
ICAgcmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSktPnNl
dENhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoKnRoaXMsIGhlaWdodCk7
CiB9CkBAIC01MTAzLDcgKzUxMDMsNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxv
Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgYXV0byBpc1Jlc29sdmFibGVQ
ZXJjZW50YWdlSGVpZ2h0ID0gW3RoaXNdICgpIHsKICAgICAgICAgcmV0dXJuIHN0eWxlKCkubG9n
aWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChpc091dE9mRmxvd1Bvc2l0
aW9uZWQoKSB8fCBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKICAgICB9
OwotICAgIGlmICghc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZElu
c2V0cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIWlzUmVzb2x2
YWJsZVBlcmNlbnRhZ2VIZWlnaHQoKSkKKyAgICBpZiAoIWhhc092ZXJyaWRpbmdMb2dpY2FsSGVp
Z2h0KCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNl
dHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgpICYmICFpc1Jlc29sdmFi
bGVQZXJjZW50YWdlSGVpZ2h0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVy
biB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp
YmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j
cHAKaW5kZXggY2IyM2Y2ZDE5MzdhM2Q2MDVjZTE5NGQzNTc0ZDI2NzAwOTBjNWZjYy4uOWE1N2Mw
MmIwYzA2MzIyOTU1N2ZhODA4NzdmMDIzNjZkYTliMTA2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDQsNiArNTQ0LDExIEBAIExh
eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4dGVudChMYXlvdXRV
bml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVk
VmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJhcik7CiB9CiAKK3N0YXRp
YyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKK3sKKyAg
ICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5zdHlsZSgpLmhhc0FzcGVj
dFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpj
b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBTaXpl
VHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAgIC8vIElmIHdlIGhhdmUg
YSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6ZSBpcyB0aGUgd2lkdGgu
CkBAIC01NzAsNyArNTc1LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVC
b3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmQKICAgICAvLyBvdXIg
bG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3VyIGNhY2hlZCB2YWx1ZS4g
U28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNvZGUgaW4gTGF5b3V0Qmxv
Y2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExheW91dFVuaXQgYm9yZGVy
QW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKLSAgICBp
ZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAmJiAhY2hpbGQuaGFzQXNw
ZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0
bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAgICAgICBpZiAoc2l6ZS5p
c01pbkNvbnRlbnQoKSkKICAgICAgICAgICAgIHJldHVybiBjaGlsZC5taW5QcmVmZXJyZWRMb2dp
Y2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAgICAgIGlmIChzaXplLmlzTWF4Q29u
dGVudCgpKQpAQCAtNzQwLDkgKzc0NSw5IEBAIExheW91dFBvaW50IFJlbmRlckZsZXhpYmxlQm94
OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAKIGJv
b2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94
JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpCisgICAg
aWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwot
ICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKSB7CisgICAgaWYgKCFjaGls
ZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYgIWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0
aW8oKSkgewogICAgICAgICAvLyBXZSBjYW4ndCBjb21wdXRlIGEgcmF0aW8gaW4gdGhpcyBjYXNl
LgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtNzUyLDggKzc1Nyw3IEBAIGJvb2wg
UmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkgY29uc3QKICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVN
YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExlbmd0
aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGNoaWxkLmhhc0FzcGVjdFJh
dGlvKCkpOwotICAgIEFTU0VSVChjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpOworICAg
IEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSk7CiAKICAgICBhdXRvIGFkanVzdEZv
ckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94JiBib3gsIExlbmd0aCBsZW5ndGgp
IC0+IExheW91dFVuaXQgewogICAgICAgICBBU1NFUlQobGVuZ3RoLmlzRml4ZWQoKSk7CkBAIC03
ODMsNyArNzg3LDEzIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWlu
U2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAgfQogCiAgICAgY29u
c3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0gY2hpbGQuaW50cmluc2ljU2l6ZSgp
OwotICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQo
KSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgZG91YmxlIHJh
dGlvOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgpID09IEFzcGVjdFJh
dGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9UeXBlKCkgPT0gQXNw
ZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNTaXplLmlzRW1wdHko
KSkpCisgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1dpZHRoKCkgLyBj
aGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7CisgICAgZWxzZSB7CisgICAgICAgIEFT
U0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOworICAgICAgICByYXRpbyA9IGNoaWxk
SW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWln
aHQoKS50b0Zsb2F0KCk7CisgICAgfQogICAgIGlmIChpc0hvcml6b250YWxGbG93KCkpCiAgICAg
ICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0aW8pOwogICAgIHJl
dHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOwpAQCAtODI1LDcgKzgz
NSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExlCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6
OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RSYXRpbygpIHx8ICFj
aGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJh
dGlvKGNoaWxkKSB8fCAhY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKQogICAgICAgICBy
ZXR1cm4gZmFsc2U7CiAKICAgICAvLyA5LjggaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1m
bGV4Ym94LyNkZWZpbml0ZS1zaXplcwpAQCAtMTU5MSw3ICsxNjAxLDcgQEAgYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodChjb25zdCBSZW5kZXJC
b3gmIGNoaWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBBc3BlY3QgcmF0aW8g
aXMgcHJvcGVybHkgaGFuZGxlZCBieSBSZW5kZXJSZXBsYWNlZCBkdXJpbmcgbGF5b3V0LgotICAg
IGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkK
KyAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkSGFzQXNwZWN0UmF0aW8o
Y2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4gY2hpbGQuc3R5bGUo
KS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjY1ZTg3ZGY0YjYyYzA3MWRhMDU0
N2Q4M2U2YzhmMWU3ZjU2NmU0My4uZmEzMmQzMDhiMDNjOGVhNThjZTUwMTRmZDlhZDRiOTU3ZDU5
ZjFkMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTE4ICBSb2IgQnVpcyAgPHJidWlz
QGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gZmxleGJveCBj
aGlsZHJlbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
VW5za2lwIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3Rh
dGlvbnM6CisKIDIwMjEtMDItMTUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxp
YS5jb20+CiAKICAgICAgICAgW2Nzcy1mbGV4XSBJbXBsZW1lbnQgc2VjdGlvbiA5LjggRGVmaW5p
dGUgYW5kIEluZGVmaW5pdGUgU2l6ZXMgY2FzZSAxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA0Njcw
YjNiZTI1MTU4YTIwNzFiODcxODNlMjk0OTY2ZDllNzdkMDZjLi4wZTczMDk5Njk1NjFkNzYyMjBh
NDA2OWQyOTUwYTVlZjZlOTFjYmJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NTEsMjAgKzQ1
NTEsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxhYwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9h
YnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDEu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0w
MDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTIuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTYuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTcuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMTkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQorIyBmbGV4
LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420937</attachid>
            <date>2021-02-19 01:00:20 -0800</date>
            <delta_ts>2021-02-19 05:58:37 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210219100019.patch</filename>
            <type>text/plain</type>
            <size>11980</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjdlNzM5NTkyOTg0ODgx
Y2ZhM2NjMzE4ODBiYWFkZDJiOWVhYmM3OS4uNWExNjM3MjcyNTZiNjJjNDM0NDE4N2YyZDM3MjUw
ZGUwYTE1NGUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAyLTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gZmxleGJveCBpdGVtcyBieSBub3Qgb25s
eQorICAgICAgICBjb25zaWRlcmluZyBpbXBsaWNpdCBhc3BlY3QtcmF0aW8gaW4gaXRlbXMgKGZv
ciBleGFtcGxlCisgICAgICAgIGltYWdlcykgYnV0IGFsc28gdGhvcnVnaCBleHBsaWNpdCBhc3Bl
Y3QtcmF0aW8gcHJvcGVydHkKKyAgICAgICAgdXNhZ2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcv
UmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9n
aWNhbEhlaWdodEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgV2UgY2FuJ3QgdXNlIGludHJpbnNp
YyBoZWlnaHQgaGVyZSBpZiBpdCBpcyB1bnJlc29sdmVkLgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyQm94OjpjYWNoZUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0gY29u
c3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdp
ZHRoRnJvbUFzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgSWYgb3ZlcnJpZGUgaGVpZ2h0IGlz
IHNldCB0aGVuIHdlIGNhbiBjb21wdXRlIGxvZ2ljYWwgd2lkdGggZnJvbSBpdC4KKyAgICAgICAg
KiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2hp
bGRIYXNBc3BlY3RSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6
Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
RmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5n
IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpjaGlsZENyb3Nz
U2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodCBjb25z
dCk6CisKIDIwMjEtMDItMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+
CiAKICAgICAgICAgU2Nyb2xsaW5nIG9uIGh0dHBzOi8vd3d3LmFwcGxlLmNvbS9pcGFkLWFpci8g
Y2FuIGppdHRlciBvbiBjZXJ0YWluIHNlY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJCb3guY3BwCmluZGV4IGQyZDM3YTA5OWM5NGQ3YmU3M2E5YTMwY2M3MDUzNzdlM2RhZTJjY2Yu
LmU5NzI5Y2I3NzIyNmExNTRkOGQ0ZGU4NWE5YWQ4NmExNmU0YTY2NTcgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NzksNyArNjc5LDcgQEAgTGF5b3V0VW5pdCBS
ZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2lj
YWxIZWlnaHQsIE8KICAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1pbihsb2dpY2Fs
SGVpZ2h0LCBtYXhILnZhbHVlKCkpOwogICAgIH0KICAgICBhdXRvIGxvZ2ljYWxNaW5IZWlnaHQg
PSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKTsKLSAgICBpZiAobG9naWNhbE1pbkhlaWdo
dC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygp
ICYmIGludHJpbnNpY0NvbnRlbnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGly
ZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpCisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQu
aXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAm
JiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIGludHJpbnNpY0NvbnRlbnRIZWlnaHQgIT0gTGF5
b3V0VW5pdDo6bWF4KCkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGlyZWN0aW9uKCkgPT0g
T3ZlcmZsb3c6OlZpc2libGUpCiAgICAgICAgIGxvZ2ljYWxNaW5IZWlnaHQgPSBMZW5ndGgoKmlu
dHJpbnNpY0NvbnRlbnRIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkKTsKICAgICBpZiAoT3B0aW9u
YWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxIZWln
aHRVc2luZyhNaW5TaXplLCBsb2dpY2FsTWluSGVpZ2h0LCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0
KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxIZWlnaHQsIGNvbXB1dGVkTG9naWNh
bEhlaWdodC52YWx1ZSgpKTsKQEAgLTI4NjIsNyArMjg2Miw3IEBAIHZvaWQgUmVuZGVyQm94Ojpj
YWNoZUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0oTGF5b3V0VW5pdCBo
ZWlnaHQpCiAgICAgLy8gRklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2ggd2l0aCBjaGVja2luZyBo
YXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMgY291bGQgYmUgc2hhcmVk
CiAgICAgLy8gYnkgYW55IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJpZGVzIGxpa2UgZ3JpZCBv
ciBmbGV4LiBIb3dldmVyIHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5nIHNlcXVlbmNlIG9mIGNh
bGxzCiAgICAgLy8gYmV0d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxheW91dFRvQXZvaWRXaWRv
d3MoKS4KLSAgICBpZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFwYXJl
bnQoKSB8fCAhcGFyZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNPdmVycmlkaW5nTG9naWNh
bEhlaWdodCgpKQorICAgIGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwg
IXBhcmVudCgpIHx8ICFwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdM
b2dpY2FsSGVpZ2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0
aW8oKSkKICAgICAgICAgcmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94Pihw
YXJlbnQoKSktPnNldENhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoKnRo
aXMsIGhlaWdodCk7CiB9CkBAIC01MTAzLDcgKzUxMDMsNyBAQCBib29sIFJlbmRlckJveDo6c2hv
dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgYXV0byBp
c1Jlc29sdmFibGVQZXJjZW50YWdlSGVpZ2h0ID0gW3RoaXNdICgpIHsKICAgICAgICAgcmV0dXJu
IHN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChpc091
dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJs
ZSgpKTsKICAgICB9OwotICAgIGlmICghc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl
Y3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkg
JiYgIWlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VIZWlnaHQoKSkKKyAgICBpZiAoIWhhc092ZXJyaWRp
bmdMb2dpY2FsSGVpZ2h0KCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0
UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgpICYm
ICFpc1Jlc29sdmFibGVQZXJjZW50YWdlSGVpZ2h0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK
IAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAKaW5kZXggY2IyM2Y2ZDE5MzdhM2Q2MDVjZTE5NGQzNTc0ZDI2NzAwOTBj
NWZjYy4uOWE1N2MwMmIwYzA2MzIyOTU1N2ZhODA4NzdmMDIzNjZkYTliMTA2NyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDQsNiAr
NTQ0LDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4
dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4KDBf
bHUsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJhcik7
CiB9CiAKK3N0YXRpYyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkKK3sKKyAgICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5zdHls
ZSgpLmhhc0FzcGVjdFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZs
ZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBTaXplVHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAgIC8v
IElmIHdlIGhhdmUgYSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6ZSBp
cyB0aGUgd2lkdGguCkBAIC01NzAsNyArNTc1LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVu
ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmQK
ICAgICAvLyBvdXIgbG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3VyIGNh
Y2hlZCB2YWx1ZS4gU28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNvZGUg
aW4gTGF5b3V0QmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExheW91
dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lk
dGgoKTsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAmJiAh
Y2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2ljYWxX
aWR0aCgpLmlzQXV0bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAgICAg
ICBpZiAoc2l6ZS5pc01pbkNvbnRlbnQoKSkKICAgICAgICAgICAgIHJldHVybiBjaGlsZC5taW5Q
cmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAgICAgIGlmIChz
aXplLmlzTWF4Q29udGVudCgpKQpAQCAtNzQwLDkgKzc0NSw5IEBAIExheW91dFBvaW50IFJlbmRl
ckZsZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29u
c3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNoaWxkLmhhc0FzcGVjdFJh
dGlvKCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0
dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKSB7Cisg
ICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYgIWNoaWxkLnN0eWxlKCku
aGFzQXNwZWN0UmF0aW8oKSkgewogICAgICAgICAvLyBXZSBjYW4ndCBjb21wdXRlIGEgcmF0aW8g
aW4gdGhpcyBjYXNlLgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtNzUyLDggKzc1
Nyw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3Qg
UmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVC
b3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGNoaWxk
Lmhhc0FzcGVjdFJhdGlvKCkpOwotICAgIEFTU0VSVChjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVp
Z2h0KCkpOworICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSk7CiAKICAgICBh
dXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94JiBib3gsIExl
bmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewogICAgICAgICBBU1NFUlQobGVuZ3RoLmlzRml4
ZWQoKSk7CkBAIC03ODMsNyArNzg3LDEzIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6
OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAg
fQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0gY2hpbGQuaW50
cmluc2ljU2l6ZSgpOwotICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0
aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7Cisg
ICAgZG91YmxlIHJhdGlvOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgp
ID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9U
eXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNT
aXplLmlzRW1wdHkoKSkpCisgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7CisgICAgZWxzZSB7
CisgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOworICAgICAgICBy
YXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmlu
c2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgfQogICAgIGlmIChpc0hvcml6b250YWxG
bG93KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0
aW8pOwogICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOwpA
QCAtODI1LDcgKzgzNSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJ
c0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExlCiAKIGJvb2wgUmVuZGVy
RmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RS
YXRpbygpIHx8ICFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpCisgICAgaWYgKCFjaGls
ZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSB8fCAhY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgp
KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyA5LjggaHR0cHM6Ly9kcmFmdHMuY3Nz
d2cub3JnL2Nzcy1mbGV4Ym94LyNkZWZpbml0ZS1zaXplcwpAQCAtMTU5MSw3ICsxNjAxLDcgQEAg
Ym9vbCBSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodChj
b25zdCBSZW5kZXJCb3gmIGNoaWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBB
c3BlY3QgcmF0aW8gaXMgcHJvcGVybHkgaGFuZGxlZCBieSBSZW5kZXJSZXBsYWNlZCBkdXJpbmcg
bGF5b3V0LgotICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGQuaGFzQXNw
ZWN0UmF0aW8oKSkKKyAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkSGFz
QXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4g
Y2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2I3N2JiODE0
NzBhNTNhMTUyMjBhNTFkYzdjOWZkZTNiZjQ0YTAzYi4uMmRjZDU3MzI5YzJmMDhlMWY4ZDZjMzQ2
MTFjMzhlZmNkNzBiMzQ4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhw
ZWN0YXRpb25zOgorCiAyMDIxLTAyLTE4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw
bGUuY29tPgogCiAgICAgICAgIFNjcm9sbGluZyBvbiBodHRwczovL3d3dy5hcHBsZS5jb20vaXBh
ZC1haXIvIGNhbiBqaXR0ZXIgb24gY2VydGFpbiBzZWN0aW9ucwpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5k
ZXggNDY3MGIzYmUyNTE1OGEyMDcxYjg3MTgzZTI5NDk2NmQ5ZTc3ZDA2Yy4uMzEzMjBiY2Q4NTBk
NjY2ZjljMzNkNTlkYjY0MDBkMjJmNjUxZGZiZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTUx
LDIwICs0NTUxLDggQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWMKIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDEyLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE3
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
KyMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0
LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420958</attachid>
            <date>2021-02-19 05:58:42 -0800</date>
            <delta_ts>2021-02-19 09:28:24 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210219145840.patch</filename>
            <type>text/plain</type>
            <size>11785</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzY5ODBjNDRjOWZiMDYw
M2UwMmVmNzRmNDQ5NTk1NTQ2MmNmZTFmMC4uYjU5NzUyZWI0MmVlNjMxNDcwMzI5MDRiNGJiNTY4
MzYyZmViZDE4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAyLTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gZmxleGJveCBpdGVtcyBieSBub3Qgb25s
eQorICAgICAgICBjb25zaWRlcmluZyBpbXBsaWNpdCBhc3BlY3QtcmF0aW8gaW4gaXRlbXMgKGZv
ciBleGFtcGxlCisgICAgICAgIGltYWdlcykgYnV0IGFsc28gdGhyb3VnaCBleHBsaWNpdCBhc3Bl
Y3QtcmF0aW8gcHJvcGVydHkKKyAgICAgICAgdXNhZ2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcv
UmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y2FjaGVJbnRyaW5z
aWNDb250ZW50TG9naWNhbEhlaWdodEZvckZsZXhJdGVtIGNvbnN0KToKKyAgICAgICAgKFdlYkNv
cmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICBEbyBu
b3QgcGFzcyBpbmRlZmluaXRlIGludHJpbnNpYyBoZWlnaHQuCisgICAgICAgIChXZWJDb3JlOjpS
ZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3Qp
OgorICAgICAgICBJZiBvdmVycmlkZSBoZWlnaHQgaXMgc2V0IHRoZW4gd2UgY2FuIGNvbXB1dGUg
bG9naWNhbCB3aWR0aCBmcm9tIGl0LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGlsZEhhc0FzcGVjdFJhdGlvKToKKyAgICAg
ICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JD
aGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3Bl
Y3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29t
cHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29y
ZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jv
c3NTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVk
VG9TdHJldGNoQ2hpbGRMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKwogMjAyMS0wMi0xOSAgSmlld2Vu
IFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFBDTTogUmVxdWVzdCBzZXJ2
ZXIgcHVibGljIGtleSB0byBnZW5lcmF0ZSBzZWNyZXQgdG9rZW4KZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckJveC5jcHAKaW5kZXggZDJkMzdhMDk5Yzk0ZDdiZTczYTlhMzBjYzcwNTM3N2Uz
ZGFlMmNjZi4uZGMxODRiNjVhNDQ3NWNlNzQwYTgyMjQ4NTQ3NjA1Zjc2Mzc5NmQ4MiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTI4NjIsNyArMjg2Miw3IEBAIHZv
aWQgUmVuZGVyQm94OjpjYWNoZUludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0
ZW0oTGF5b3V0VW5pdCBoZWlnaHQpCiAgICAgLy8gRklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2gg
d2l0aCBjaGVja2luZyBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMg
Y291bGQgYmUgc2hhcmVkCiAgICAgLy8gYnkgYW55IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJp
ZGVzIGxpa2UgZ3JpZCBvciBmbGV4LiBIb3dldmVyIHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5n
IHNlcXVlbmNlIG9mIGNhbGxzCiAgICAgLy8gYmV0d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxh
eW91dFRvQXZvaWRXaWRvd3MoKS4KLSAgICBpZiAoaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRp
b25lZCgpIHx8ICFwYXJlbnQoKSB8fCAhcGFyZW50KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNP
dmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQorICAgIGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQ
b3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8ICFwYXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8
IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWln
aHRGcm9tQXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRl
ckZsZXhpYmxlQm94PihwYXJlbnQoKSktPnNldENhY2hlZENoaWxkSW50cmluc2ljQ29udGVudExv
Z2ljYWxIZWlnaHQoKnRoaXMsIGhlaWdodCk7CiB9CkBAIC0yOTQzLDcgKzI5NDMsOSBAQCBSZW5k
ZXJCb3g6OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dp
Y2FsSGVpZ2h0KExheW91dFVuaQogCiAgICAgICAgIExheW91dFVuaXQgaGVpZ2h0UmVzdWx0Owog
ICAgICAgICBpZiAoY2hlY2tNaW5NYXhIZWlnaHQpIHsKLSAgICAgICAgICAgIExheW91dFVuaXQg
aW50cmluc2ljSGVpZ2h0ID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQYWRk
aW5nTG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50
cmluc2ljSGVpZ2h0OworICAgICAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ICE9
IExheW91dFVuaXQ6Om1heCgpKQorICAgICAgICAgICAgICAgIGludHJpbnNpY0hlaWdodCA9IGNv
bXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsK
ICAgICAgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp
bygpKQogICAgICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RS
YXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFu
ZFBhZGRpbmdFeHRlbnQoKSwgTGF5b3V0VW5pdChzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygp
KSwgc3R5bGUoKS5ib3hTaXppbmdGb3JBc3BlY3RSYXRpbygpLCBsb2dpY2FsV2lkdGgoKSk7CiAg
ICAgICAgICAgICBlbHNlCkBAIC01MTAzLDcgKzUxMDUsNyBAQCBib29sIFJlbmRlckJveDo6c2hv
dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgYXV0byBp
c1Jlc29sdmFibGVQZXJjZW50YWdlSGVpZ2h0ID0gW3RoaXNdICgpIHsKICAgICAgICAgcmV0dXJu
IHN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChpc091
dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJs
ZSgpKTsKICAgICB9OwotICAgIGlmICghc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl
Y3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkg
JiYgIWlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VIZWlnaHQoKSkKKyAgICBpZiAoIWhhc092ZXJyaWRp
bmdMb2dpY2FsSGVpZ2h0KCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0
UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgpICYm
ICFpc1Jlc29sdmFibGVQZXJjZW50YWdlSGVpZ2h0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK
IAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAKaW5kZXggY2IyM2Y2ZDE5MzdhM2Q2MDVjZTE5NGQzNTc0ZDI2NzAwOTBj
NWZjYy4uOWE1N2MwMmIwYzA2MzIyOTU1N2ZhODA4NzdmMDIzNjZkYTliMTA2NyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC01NDQsNiAr
NTQ0LDExIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4
dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpCiAgICAgcmV0dXJuIHN0ZDo6bWF4KDBf
bHUsIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJhcik7
CiB9CiAKK3N0YXRpYyBib29sIGNoaWxkSGFzQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkKK3sKKyAgICByZXR1cm4gY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSB8fCBjaGlsZC5zdHls
ZSgpLmhhc0FzcGVjdFJhdGlvKCk7Cit9CisKIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZs
ZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBTaXplVHlwZSBzaXplVHlwZSwgY29uc3QgTGVuZ3RoJiBzaXplKQogewogICAgIC8v
IElmIHdlIGhhdmUgYSBob3Jpem9udGFsIGZsb3csIHRoYXQgbWVhbnMgdGhlIG1haW4gc2l6ZSBp
cyB0aGUgd2lkdGguCkBAIC01NzAsNyArNTc1LDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVu
ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmQK
ICAgICAvLyBvdXIgbG9naWNhbCB3aWR0aCBpcyBhdXRvLCB3ZSBjYW4ganVzdCB1c2Ugb3VyIGNh
Y2hlZCB2YWx1ZS4gU28gbGV0J3MgZG8KICAgICAvLyB0aGF0IGhlcmUuIChDb21wYXJlIGNvZGUg
aW4gTGF5b3V0QmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKQogICAgIExheW91
dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGNoaWxkLmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lk
dGgoKTsKLSAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAmJiAh
Y2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkgeworICAgIGlmIChjaGlsZC5zdHlsZSgpLmxvZ2ljYWxX
aWR0aCgpLmlzQXV0bygpICYmICFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkgewogICAgICAg
ICBpZiAoc2l6ZS5pc01pbkNvbnRlbnQoKSkKICAgICAgICAgICAgIHJldHVybiBjaGlsZC5taW5Q
cmVmZXJyZWRMb2dpY2FsV2lkdGgoKSAtIGJvcmRlckFuZFBhZGRpbmc7CiAgICAgICAgIGlmIChz
aXplLmlzTWF4Q29udGVudCgpKQpAQCAtNzQwLDkgKzc0NSw5IEBAIExheW91dFBvaW50IFJlbmRl
ckZsZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpCiAKIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29u
c3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoIWNoaWxkLmhhc0FzcGVjdFJh
dGlvKCkpCisgICAgaWYgKCFjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0
dXJuIGZhbHNlOwotICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKSB7Cisg
ICAgaWYgKCFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkgJiYgIWNoaWxkLnN0eWxlKCku
aGFzQXNwZWN0UmF0aW8oKSkgewogICAgICAgICAvLyBXZSBjYW4ndCBjb21wdXRlIGEgcmF0aW8g
aW4gdGhpcyBjYXNlLgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtNzUyLDggKzc1
Nyw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0aW8oY29uc3Qg
UmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICAKIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVC
b3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGNoaWxk
Lmhhc0FzcGVjdFJhdGlvKCkpOwotICAgIEFTU0VSVChjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVp
Z2h0KCkpOworICAgIEFTU0VSVChjaGlsZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSk7CiAKICAgICBh
dXRvIGFkanVzdEZvckJveFNpemluZyA9IFt0aGlzXSAoY29uc3QgUmVuZGVyQm94JiBib3gsIExl
bmd0aCBsZW5ndGgpIC0+IExheW91dFVuaXQgewogICAgICAgICBBU1NFUlQobGVuZ3RoLmlzRml4
ZWQoKSk7CkBAIC03ODMsNyArNzg3LDEzIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6
OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRlckJvCiAgICAg
fQogCiAgICAgY29uc3QgTGF5b3V0U2l6ZSYgY2hpbGRJbnRyaW5zaWNTaXplID0gY2hpbGQuaW50
cmluc2ljU2l6ZSgpOwotICAgIGRvdWJsZSByYXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0
aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmluc2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7Cisg
ICAgZG91YmxlIHJhdGlvOworICAgIGlmIChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvVHlwZSgp
ID09IEFzcGVjdFJhdGlvVHlwZTo6UmF0aW8gfHwgKGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0aW9U
eXBlKCkgPT0gQXNwZWN0UmF0aW9UeXBlOjpBdXRvQW5kUmF0aW8gJiYgY2hpbGRJbnRyaW5zaWNT
aXplLmlzRW1wdHkoKSkpCisgICAgICAgIHJhdGlvID0gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRp
b1dpZHRoKCkgLyBjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlvSGVpZ2h0KCk7CisgICAgZWxzZSB7
CisgICAgICAgIEFTU0VSVChjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkpOworICAgICAgICBy
YXRpbyA9IGNoaWxkSW50cmluc2ljU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSAvIGNoaWxkSW50cmlu
c2ljU2l6ZS5oZWlnaHQoKS50b0Zsb2F0KCk7CisgICAgfQogICAgIGlmIChpc0hvcml6b250YWxG
bG93KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpICogcmF0
aW8pOwogICAgIHJldHVybiBMYXlvdXRVbml0KGNyb3NzU2l6ZS52YWx1ZSgpIC8gcmF0aW8pOwpA
QCAtODI1LDcgKzgzNSw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJ
c0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGNvbnN0IExlCiAKIGJvb2wgUmVuZGVy
RmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RS
YXRpbygpIHx8ICFjaGlsZC5pbnRyaW5zaWNTaXplKCkuaGVpZ2h0KCkpCisgICAgaWYgKCFjaGls
ZEhhc0FzcGVjdFJhdGlvKGNoaWxkKSB8fCAhY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgp
KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyA5LjggaHR0cHM6Ly9kcmFmdHMuY3Nz
d2cub3JnL2Nzcy1mbGV4Ym94LyNkZWZpbml0ZS1zaXplcwpAQCAtMTU5MSw3ICsxNjAxLDcgQEAg
Ym9vbCBSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodChj
b25zdCBSZW5kZXJCb3gmIGNoaWxkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBB
c3BlY3QgcmF0aW8gaXMgcHJvcGVybHkgaGFuZGxlZCBieSBSZW5kZXJSZXBsYWNlZCBkdXJpbmcg
bGF5b3V0LgotICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgY2hpbGQuaGFzQXNw
ZWN0UmF0aW8oKSkKKyAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkSGFz
QXNwZWN0UmF0aW8oY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXR1cm4g
Y2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCk7CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTA3MjQyYzQz
ZGY1Zjc4MjYwODNhZWE5YTRiYWI1MWI1YjU3N2UxMS4uNzRiN2UzMDE4NjFhMWFhYjk0MTBhZGY0
ZmI4MGE1MWQ2MDU4ZTI1NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAyLTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhw
ZWN0YXRpb25zOgorCiAyMDIxLTAyLTE5ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5j
b20+CiAKICAgICAgICAgUENNOiBSZXF1ZXN0IHNlcnZlciBwdWJsaWMga2V5IHRvIGdlbmVyYXRl
IHNlY3JldCB0b2tlbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBi
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNDY3MGIzYmUyNTE1OGEyMDcxYjg3
MTgzZTI5NDk2NmQ5ZTc3ZDA2Yy4uMzEzMjBiY2Q4NTBkNjY2ZjljMzNkNTlkYjY0MDBkMjJmNjUx
ZGZiZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTUxLDIwICs0NTUxLDggQEAgd2Via2l0Lm9y
Zy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGlu
Zy9zbG90dGVkLXBsYWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1y
YXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h
c3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KKyMgZmxleC1iYXNpczpjb250ZW50CiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAy
Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>420979</attachid>
            <date>2021-02-19 09:28:29 -0800</date>
            <delta_ts>2021-02-19 22:34:12 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219679-20210219182828.patch</filename>
            <type>text/plain</type>
            <size>11962</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzUxNjI5MGYzYjlkOTVh
YjVmMDk4NjBmOTg1NjJmMDZjZmVjZmZiMy4uNDVjYTQ1Zjg1NWYxZjM1MjVjOGVlN2Q2MWYxMjk5
YjhkODE1M2YyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAyLTE5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g
b24gZmxleGJveCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjE5Njc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5p
bi4KKworICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBmbGV4Ym94IGl0ZW1zIGJ5IG5v
dCBvbmx5CisgICAgICAgIGNvbnNpZGVyaW5nIGltcGxpY2l0IGFzcGVjdC1yYXRpbyBpbiBpdGVt
cyAoZm9yIGV4YW1wbGUKKyAgICAgICAgaW1hZ2VzKSBidXQgYWxzbyB0aHJvdWdoIGV4cGxpY2l0
IGFzcGVjdC1yYXRpbyBwcm9wZXJ0eQorICAgICAgICB1c2FnZS4KKworICAgICAgICAqIHJlbmRl
cmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjYWNoZUlu
dHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0gY29uc3QpOgorICAgICAgICAo
V2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodCBjb25zdCk6CisgICAgICAg
IERvIG5vdCBwYXNzIGluZGVmaW5pdGUgaW50cmluc2ljIGhlaWdodC4KKyAgICAgICAgKFdlYkNv
cmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyBj
b25zdCk6CisgICAgICAgIElmIG92ZXJyaWRlIGhlaWdodCBpcyBzZXQgdGhlbiB3ZSBjYW4gY29t
cHV0ZSBsb2dpY2FsIHdpZHRoIGZyb20gaXQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNoaWxkSGFzQXNwZWN0UmF0aW8pOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVu
dEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGls
ZEFzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94
Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyBjb25zdCk6CisgICAgICAgIChX
ZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWlu
ZXJDcm9zc1NpemUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6
Om5lZWRUb1N0cmV0Y2hDaGlsZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorCiAyMDIxLTAyLTE5ICBN
YXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgYSBHQyB2
ZXJpZmllci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZDJkMzdh
MDk5Yzk0ZDdiZTczYTlhMzBjYzcwNTM3N2UzZGFlMmNjZi4uOWIxODU0Y2ExMGRmM2FkNjFhMDIx
Yjg5YmI3NjgyMTczODdlNjA5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j
cHAKQEAgLTI4NjIsNyArMjg2Miw3IEBAIHZvaWQgUmVuZGVyQm94OjpjYWNoZUludHJpbnNpY0Nv
bnRlbnRMb2dpY2FsSGVpZ2h0Rm9yRmxleEl0ZW0oTGF5b3V0VW5pdCBoZWlnaHQpCiAgICAgLy8g
RklYTUU6IGl0IHNob3VsZCBiZSBlbm91Z2ggd2l0aCBjaGVja2luZyBoYXNPdmVycmlkaW5nTG9n
aWNhbEhlaWdodCgpIGFzIHRoaXMgbG9naWMgY291bGQgYmUgc2hhcmVkCiAgICAgLy8gYnkgYW55
IGxheW91dCBzeXN0ZW0gdXNpbmcgb3ZlcnJpZGVzIGxpa2UgZ3JpZCBvciBmbGV4LiBIb3dldmVy
IHRoaXMgY2F1c2VzIGEgbmV2ZXIgZW5kaW5nIHNlcXVlbmNlIG9mIGNhbGxzCiAgICAgLy8gYmV0
d2VlbiBsYXlvdXRCbG9jaygpIDwtPiByZWxheW91dFRvQXZvaWRXaWRvd3MoKS4KLSAgICBpZiAo
aXNGbG9hdGluZ09yT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8ICFwYXJlbnQoKSB8fCAhcGFyZW50
KCktPmlzRmxleGlibGVCb3goKSB8fCBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQorICAg
IGlmIChpc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgIXBhcmVudCgpIHx8ICFw
YXJlbnQoKS0+aXNGbGV4aWJsZUJveCgpIHx8IGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkg
fHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKICAgICAgICAg
cmV0dXJuOwogICAgIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSktPnNldENh
Y2hlZENoaWxkSW50cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoKnRoaXMsIGhlaWdodCk7CiB9
CkBAIC0yOTQzLDcgKzI5NDMsMTEgQEAgUmVuZGVyQm94OjpMb2dpY2FsRXh0ZW50Q29tcHV0ZWRW
YWx1ZXMgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbmkKIAogICAgICAg
ICBMYXlvdXRVbml0IGhlaWdodFJlc3VsdDsKICAgICAgICAgaWYgKGNoZWNrTWluTWF4SGVpZ2h0
KSB7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IGludHJpbnNpY0hlaWdodCA9IGNvbXB1dGVkVmFs
dWVzLm1fZXh0ZW50IC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAg
ICAgIC8vIENhbGxlcnMgcGFzc2luZyBMYXlvdXRVbml0OjptYXgoKSBmb3IgbG9naWNhbEhlaWdo
dCBtZWFucyBhbiBpbmRlZmluaXRlIGhlaWdodCwgc28KKyAgICAgICAgICAgIC8vIHRyYW5zbGF0
ZSB0aGlzIHRvIGEgbnVsbG9wdCBpbnRyaW5zaWMgaGVpZ2h0IGZvciBmdXJ0aGVyIGxvZ2ljYWwg
aGVpZ2h0IGNvbXB1dGF0aW9ucy4KKyAgICAgICAgICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IGlu
dHJpbnNpY0hlaWdodDsKKyAgICAgICAgICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAh
PSBMYXlvdXRVbml0OjptYXgoKSkKKyAgICAgICAgICAgICAgICBpbnRyaW5zaWNIZWlnaHQgPSBj
b21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCk7
CiAgICAgICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0
aW8oKSkKICAgICAgICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBibG9ja1NpemVGcm9tQXNwZWN0
UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJB
bmRQYWRkaW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8o
KSksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSwgbG9naWNhbFdpZHRoKCkpOwog
ICAgICAgICAgICAgZWxzZQpAQCAtNTEwMyw3ICs1MTA3LDcgQEAgYm9vbCBSZW5kZXJCb3g6OnNo
b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAgIGF1dG8g
aXNSZXNvbHZhYmxlUGVyY2VudGFnZUhlaWdodCA9IFt0aGlzXSAoKSB7CiAgICAgICAgIHJldHVy
biBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAoaXNP
dXRPZkZsb3dQb3NpdGlvbmVkKCkgfHwgcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFi
bGUoKSk7CiAgICAgfTsKLSAgICBpZiAoIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw
ZWN0UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgp
ICYmICFpc1Jlc29sdmFibGVQZXJjZW50YWdlSGVpZ2h0KCkpCisgICAgaWYgKCFoYXNPdmVycmlk
aW5nTG9naWNhbEhlaWdodCgpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvQW5kSW5zZXRzKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAm
JiAhaXNSZXNvbHZhYmxlUGVyY2VudGFnZUhlaWdodCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7
CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCmluZGV4IGNiMjNmNmQxOTM3YTNkNjA1Y2UxOTRkMzU3NGQyNjcwMDkw
YzVmY2MuLjlhNTdjMDJiMGMwNjMyMjk1NTdmYTgwODc3ZjAyMzY2ZGE5YjEwNjcgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTQ0LDYg
KzU0NCwxMSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRlbnRF
eHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaQogICAgIHJldHVybiBzdGQ6Om1heCgw
X2x1LCBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJvcmRlclBhZGRpbmdBbmRTY3JvbGxiYXIp
OwogfQogCitzdGF0aWMgYm9vbCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQpCit7CisgICAgcmV0dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuc3R5
bGUoKS5oYXNBc3BlY3RSYXRpbygpOworfQorCiBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94
JiBjaGlsZCwgU2l6ZVR5cGUgc2l6ZVR5cGUsIGNvbnN0IExlbmd0aCYgc2l6ZSkKIHsKICAgICAv
LyBJZiB3ZSBoYXZlIGEgaG9yaXpvbnRhbCBmbG93LCB0aGF0IG1lYW5zIHRoZSBtYWluIHNpemUg
aXMgdGhlIHdpZHRoLgpAQCAtNTcwLDcgKzU3NSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJl
bmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5k
CiAgICAgLy8gb3VyIGxvZ2ljYWwgd2lkdGggaXMgYXV0bywgd2UgY2FuIGp1c3QgdXNlIG91ciBj
YWNoZWQgdmFsdWUuIFNvIGxldCdzIGRvCiAgICAgLy8gdGhhdCBoZXJlLiAoQ29tcGFyZSBjb2Rl
IGluIExheW91dEJsb2NrOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocykKICAgICBMYXlv
dXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBjaGlsZC5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdp
ZHRoKCk7Ci0gICAgaWYgKGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYg
IWNoaWxkLmhhc0FzcGVjdFJhdGlvKCkpIHsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5sb2dpY2Fs
V2lkdGgoKS5pc0F1dG8oKSAmJiAhY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpIHsKICAgICAg
ICAgaWYgKHNpemUuaXNNaW5Db250ZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gY2hpbGQubWlu
UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgLSBib3JkZXJBbmRQYWRkaW5nOwogICAgICAgICBpZiAo
c2l6ZS5pc01heENvbnRlbnQoKSkKQEAgLTc0MCw5ICs3NDUsOSBAQCBMYXlvdXRQb2ludCBSZW5k
ZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlTG9jYXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gm
IGNoaWxkKQogCiBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKCFjaGlsZC5oYXNBc3BlY3RS
YXRpbygpKQorICAgIGlmICghY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpCiAgICAgICAgIHJl
dHVybiBmYWxzZTsKLSAgICBpZiAoIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkgewor
ICAgIGlmICghY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpICYmICFjaGlsZC5zdHlsZSgp
Lmhhc0FzcGVjdFJhdGlvKCkpIHsKICAgICAgICAgLy8gV2UgY2FuJ3QgY29tcHV0ZSBhIHJhdGlv
IGluIHRoaXMgY2FzZS4KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTc1Miw4ICs3
NTcsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlvKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiAgICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl
Qm94Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gm
IGNoaWxkLCBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoKSBjb25zdAogewotICAgIEFTU0VSVChjaGls
ZC5oYXNBc3BlY3RSYXRpbygpKTsKLSAgICBBU1NFUlQoY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhl
aWdodCgpKTsKKyAgICBBU1NFUlQoY2hpbGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkpOwogCiAgICAg
YXV0byBhZGp1c3RGb3JCb3hTaXppbmcgPSBbdGhpc10gKGNvbnN0IFJlbmRlckJveCYgYm94LCBM
ZW5ndGggbGVuZ3RoKSAtPiBMYXlvdXRVbml0IHsKICAgICAgICAgQVNTRVJUKGxlbmd0aC5pc0Zp
eGVkKCkpOwpAQCAtNzgzLDcgKzc4NywxMyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94
Ojpjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCbwogICAg
IH0KIAogICAgIGNvbnN0IExheW91dFNpemUmIGNoaWxkSW50cmluc2ljU2l6ZSA9IGNoaWxkLmlu
dHJpbnNpY1NpemUoKTsKLSAgICBkb3VibGUgcmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lk
dGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJpbnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOwor
ICAgIGRvdWJsZSByYXRpbzsKKyAgICBpZiAoY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUo
KSA9PSBBc3BlY3RSYXRpb1R5cGU6OlJhdGlvIHx8IChjaGlsZC5zdHlsZSgpLmFzcGVjdFJhdGlv
VHlwZSgpID09IEFzcGVjdFJhdGlvVHlwZTo6QXV0b0FuZFJhdGlvICYmIGNoaWxkSW50cmluc2lj
U2l6ZS5pc0VtcHR5KCkpKQorICAgICAgICByYXRpbyA9IGNoaWxkLnN0eWxlKCkuYXNwZWN0UmF0
aW9XaWR0aCgpIC8gY2hpbGQuc3R5bGUoKS5hc3BlY3RSYXRpb0hlaWdodCgpOworICAgIGVsc2Ug
eworICAgICAgICBBU1NFUlQoY2hpbGRJbnRyaW5zaWNTaXplLmhlaWdodCgpKTsKKyAgICAgICAg
cmF0aW8gPSBjaGlsZEludHJpbnNpY1NpemUud2lkdGgoKS50b0Zsb2F0KCkgLyBjaGlsZEludHJp
bnNpY1NpemUuaGVpZ2h0KCkudG9GbG9hdCgpOworICAgIH0KICAgICBpZiAoaXNIb3Jpem9udGFs
RmxvdygpKQogICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAqIHJh
dGlvKTsKICAgICByZXR1cm4gTGF5b3V0VW5pdChjcm9zc1NpemUudmFsdWUoKSAvIHJhdGlvKTsK
QEAgLTgyNSw3ICs4MzUsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZE1haW5TaXpl
SXNEZWZpbml0ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBMZQogCiBib29sIFJlbmRl
ckZsZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShj
b25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewotICAgIGlmICghY2hpbGQuaGFzQXNwZWN0
UmF0aW8oKSB8fCAhY2hpbGQuaW50cmluc2ljU2l6ZSgpLmhlaWdodCgpKQorICAgIGlmICghY2hp
bGRIYXNBc3BlY3RSYXRpbyhjaGlsZCkgfHwgIWNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQo
KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gOS44IGh0dHBzOi8vZHJhZnRzLmNz
c3dnLm9yZy9jc3MtZmxleGJveC8jZGVmaW5pdGUtc2l6ZXMKQEAgLTE1OTEsNyArMTYwMSw3IEBA
IGJvb2wgUmVuZGVyRmxleGlibGVCb3g6Om5lZWRUb1N0cmV0Y2hDaGlsZExvZ2ljYWxIZWlnaHQo
Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8g
QXNwZWN0IHJhdGlvIGlzIHByb3Blcmx5IGhhbmRsZWQgYnkgUmVuZGVyUmVwbGFjZWQgZHVyaW5n
IGxheW91dC4KLSAgICBpZiAoY2hpbGQuaXNSZW5kZXJSZXBsYWNlZCgpICYmIGNoaWxkLmhhc0Fz
cGVjdFJhdGlvKCkpCisgICAgaWYgKGNoaWxkLmlzUmVuZGVyUmVwbGFjZWQoKSAmJiBjaGlsZEhh
c0FzcGVjdFJhdGlvKGNoaWxkKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJu
IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzQXV0bygpOwpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGUwNzI0MmM0
M2RmNWY3ODI2MDgzYWVhOWE0YmFiNTFiNWI1NzdlMTEuLjVkYzFmNmIzMWQzNmJjZWU2NTA1YmMz
MWYzODM2MjgwMDI3NGYwZTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0xOSAgUm9i
IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0LXJhdGlv
IG9uIGZsZXhib3ggaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIxOTY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IFNlcmdpbyBWaWxsYXIgU2Vu
aW4uCisKKyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBU
ZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAyLTE5ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBh
cHBsZS5jb20+CiAKICAgICAgICAgUENNOiBSZXF1ZXN0IHNlcnZlciBwdWJsaWMga2V5IHRvIGdl
bmVyYXRlIHNlY3JldCB0b2tlbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNDY3MGIzYmUyNTE1OGEy
MDcxYjg3MTgzZTI5NDk2NmQ5ZTc3ZDA2Yy4uMzEzMjBiY2Q4NTBkNjY2ZjljMzNkNTlkYjY0MDBk
MjJmNjUxZGZiZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg
Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTUxLDIwICs0NTUxLDggQEAgd2Vi
a2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2NvcGluZy9zbG90dGVkLXBsYWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz
cGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t
MDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl
eC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA4Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDE4Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KKyMgZmxleC1iYXNpczpjb250
ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>