<?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>238985</bug_id>
          
          <creation_ts>2022-04-07 23:26:34 -0700</creation_ts>
          <short_desc>REGRESSION(r290770): element.scrollIntoViewIfNeeded() scrolls to top even when element is already in viewport</short_desc>
          <delta_ts>2024-07-30 15:50:20 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Scrolling</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://github.com/web-platform-tests/wpt/pull/33573</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=238567</see_also>
    
    <see_also>https://github.com/web-platform-tests/wpt/pull/47376</see_also>
          <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>237747</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Nikita Vasilyev">nvasilyev</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>clopez</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>fred.wang</cc>
    
    <cc>glenn</cc>
    
    <cc>jonlee</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>ntim</cc>
    
    <cc>pdr</cc>
    
    <cc>rbuis</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1859608</commentid>
    <comment_count>0</comment_count>
      <attachid>457025</attachid>
    <who name="Nikita Vasilyev">nvasilyev</who>
    <bug_when>2022-04-07 23:26:34 -0700</bug_when>
    <thetext>Created attachment 457025
[HTML] Reduction

Steps:
1. Open attached HTML reduction
2. Click anywhere on the text

Expected:
scrollTop doesn&apos;t change.

Actual:
Starting r290770, #box elements scrolls to top.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1859651</commentid>
    <comment_count>1</comment_count>
      <attachid>457038</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-08 03:53:20 -0700</bug_when>
    <thetext>Created attachment 457038
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1859697</commentid>
    <comment_count>2</comment_count>
      <attachid>457060</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-08 06:07:33 -0700</bug_when>
    <thetext>Created attachment 457060
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1859736</commentid>
    <comment_count>3</comment_count>
      <attachid>457074</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-08 08:36:32 -0700</bug_when>
    <thetext>Created attachment 457074
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1859737</commentid>
    <comment_count>4</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2022-04-08 08:38:44 -0700</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1861053</commentid>
    <comment_count>5</comment_count>
      <attachid>457512</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-13 00:51:10 -0700</bug_when>
    <thetext>Created attachment 457512
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1861733</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-04-14 23:27:13 -0700</bug_when>
    <thetext>&lt;rdar://problem/91797137&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865183</commentid>
    <comment_count>7</comment_count>
      <attachid>457512</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-04-28 10:26:01 -0700</bug_when>
    <thetext>Comment on attachment 457512
Patch

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

&gt; Source/WebCore/rendering/RenderLayer.cpp:2659
&gt; +    bool intersects = exposeRect.maxX() &gt;= visibleRect.x() &amp;&amp; exposeRect.x() &lt;= visibleRect.maxX();

call this intersectsInX

&gt; Source/WebCore/rendering/RenderLayer.cpp:2664
&gt; +        LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width();

Seems like you could compute intersectWidth without making a rect.

&gt; Source/WebCore/rendering/RenderLayer.cpp:-2674
&gt; -        } else if (intersectWidth &gt; 0) {

Keep the braces because the comment makes it a multi-line clause.

&gt; Source/WebCore/rendering/RenderLayer.cpp:2696
&gt; +    intersects = exposeRect.maxY() &gt;= visibleRect.y() &amp;&amp; exposeRect.y() &lt;= visibleRect.maxY();

bool intersectsInY =

&gt; Source/WebCore/rendering/RenderLayer.cpp:2700
&gt; +        LayoutRect exposeRectY(visibleRect.x(), exposeRect.y(), visibleRect.width(), exposeRect.height());

Ditto

&gt; Source/WebCore/rendering/RenderLayer.cpp:2710
&gt; +        } else if (intersectHeight &gt; 0)

Ditto</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865290</commentid>
    <comment_count>8</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-04-28 16:49:35 -0700</bug_when>
    <thetext>&lt;rdar://90985370&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865384</commentid>
    <comment_count>9</comment_count>
      <attachid>458577</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-29 01:52:27 -0700</bug_when>
    <thetext>Created attachment 458577
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865444</commentid>
    <comment_count>10</comment_count>
      <attachid>458590</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-29 08:49:20 -0700</bug_when>
    <thetext>Created attachment 458590
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865460</commentid>
    <comment_count>11</comment_count>
      <attachid>458592</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-29 10:22:48 -0700</bug_when>
    <thetext>Created attachment 458592
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865519</commentid>
    <comment_count>12</comment_count>
      <attachid>458592</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2022-04-29 13:14:31 -0700</bug_when>
    <thetext>Comment on attachment 458592
Patch

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

&gt; Source/WebCore/rendering/RenderLayer.cpp:2655
&gt; +    bool intersectsInX = exposeRect.maxX() &gt;= visibleRect.x() &amp;&amp; exposeRect.x() &lt;= visibleRect.maxX();

Does this handle the &quot;touches but does not intersect&quot; case correctly?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865618</commentid>
    <comment_count>13</comment_count>
      <attachid>457512</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-29 22:25:32 -0700</bug_when>
    <thetext>Comment on attachment 457512
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2659
&gt;&gt; +    bool intersects = exposeRect.maxX() &gt;= visibleRect.x() &amp;&amp; exposeRect.x() &lt;= visibleRect.maxX();
&gt; 
&gt; call this intersectsInX

Done.

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2664
&gt;&gt; +        LayoutUnit intersectWidth = intersection(visibleRect, exposeRectX).width();
&gt; 
&gt; Seems like you could compute intersectWidth without making a rect.

Done.

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:-2674
&gt;&gt; -        } else if (intersectWidth &gt; 0) {
&gt; 
&gt; Keep the braces because the comment makes it a multi-line clause.

Done.

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2696
&gt;&gt; +    intersects = exposeRect.maxY() &gt;= visibleRect.y() &amp;&amp; exposeRect.y() &lt;= visibleRect.maxY();
&gt; 
&gt; bool intersectsInY =

Done.

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2700
&gt;&gt; +        LayoutRect exposeRectY(visibleRect.x(), exposeRect.y(), visibleRect.width(), exposeRect.height());
&gt; 
&gt; Ditto

Done.

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2710
&gt;&gt; +        } else if (intersectHeight &gt; 0)
&gt; 
&gt; Ditto

Done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865622</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-04-29 23:08:39 -0700</bug_when>
    <thetext>Committed r293642 (250146@main): &lt;https://commits.webkit.org/250146@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 458592.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865624</commentid>
    <comment_count>15</comment_count>
      <attachid>458592</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2022-04-29 23:24:54 -0700</bug_when>
    <thetext>Comment on attachment 458592
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2655
&gt;&gt; +    bool intersectsInX = exposeRect.maxX() &gt;= visibleRect.x() &amp;&amp; exposeRect.x() &lt;= visibleRect.maxX();
&gt; 
&gt; Does this handle the &quot;touches but does not intersect&quot; case correctly?

I believe so, {(0,0), (10,10)} and {(11,0),(20, 10)} touch but do not intersect, matched by the expression above.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1865674</commentid>
    <comment_count>16</comment_count>
      <attachid>458592</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2022-04-30 13:43:47 -0700</bug_when>
    <thetext>Comment on attachment 458592
Patch

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

&gt;&gt;&gt; Source/WebCore/rendering/RenderLayer.cpp:2655
&gt;&gt;&gt; +    bool intersectsInX = exposeRect.maxX() &gt;= visibleRect.x() &amp;&amp; exposeRect.x() &lt;= visibleRect.maxX();
&gt;&gt; 
&gt;&gt; Does this handle the &quot;touches but does not intersect&quot; case correctly?
&gt; 
&gt; I believe so, {(0,0), (10,10)} and {(11,0),(20, 10)} touch but do not intersect, matched by the expression above.

So you’re saying that we want &quot;touches but not intersect&quot; to return true here. Not obvious to me, but glad you thought it through.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1877686</commentid>
    <comment_count>17</comment_count>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2022-06-23 10:15:41 -0700</bug_when>
    <thetext>*** Bug 238567 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>2049663</commentid>
    <comment_count>18</comment_count>
    <who name="Tim Nguyen (:ntim)">ntim</who>
    <bug_when>2024-07-30 15:50:20 -0700</bug_when>
    <thetext>Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/47376</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>457025</attachid>
            <date>2022-04-07 23:26:34 -0700</date>
            <delta_ts>2022-04-07 23:26:34 -0700</delta_ts>
            <desc>[HTML] Reduction</desc>
            <filename>scroll-into-view-bug.html</filename>
            <type>text/html</type>
            <size>1190</size>
            <attacher name="Nikita Vasilyev">nvasilyev</attacher>
            
              <data encoding="base64">PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDxtZXRhIGNoYXJzZXQ9IlVURi04Ij4K
ICAgIDx0aXRsZT5TY3JvbGxJbnRvVmlldzwvdGl0bGU+CjwvaGVhZD4KPGJvZHk+CjxkaXYgc3R5
bGU9ImJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyBoZWlnaHQ6IDMwMHB4OyB3aWR0aDogMjAwcHg7
IG92ZXJmbG93LXk6IGF1dG87IiBpZD0iYm94Ij4KICAgIDxkaXY+dGV4dDwvZGl2PgogICAgPGRp
dj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRleHQ8L2Rpdj4KICAgIDxkaXY+dGV4dDwvZGl2PgogICAg
PGRpdiBpZD0idGV4dCI+LS0tIENsaWNraW5nIGhlcmUgc2hvdWxkIE5PVCBzY3JvbGwgdG8gdG9w
IC0tLTwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRleHQ8L2Rpdj4KICAgIDxk
aXY+dGV4dDwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRleHQ8L2Rpdj4KICAg
IDxkaXY+dGV4dDwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRleHQ8L2Rpdj4K
ICAgIDxkaXY+dGV4dDwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRleHQ8L2Rp
dj4KICAgIDxkaXY+dGV4dDwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRleHQ8
L2Rpdj4KICAgIDxkaXY+dGV4dDwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2PnRl
eHQ8L2Rpdj4KICAgIDxkaXY+dGV4dDwvZGl2PgogICAgPGRpdj50ZXh0PC9kaXY+CiAgICA8ZGl2
PnRleHQ8L2Rpdj4KPC9kaXY+CjxzY3JpcHQ+CmJveC5zY3JvbGxUb3AgPSA0MDsKYm94Lm9uY2xp
Y2sgPSBmdW5jdGlvbigpIHsKICAgIGxldCBkaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk
aXYiKTsKICAgIGRpdi50ZXh0Q29udGVudCA9ICJkaXYiOwogICAgdGV4dC5wYXJlbnROb2RlLmlu
c2VydEJlZm9yZShkaXYsIHRleHQpOwoKICAgIGxldCBzcGFuID0gZG9jdW1lbnQuY3JlYXRlRWxl
bWVudCgic3BhbiIpOwogICAgc3Bhbi50YWJJbmRleCA9IDA7CiAgICBkaXYuYXBwZW5kKHNwYW4p
OwoKICAgIC8vIE5vdGUgdGhhdCB0aGUgYnVnIGRvZXMgTk9UIHJlcHJvZHVjZSB3aGVuIHNwYW4g
aGFzIHRleHQhCiAgICAvLyBzcGFuLnRleHRDb250ZW50ID0gImZvbyI7CgogICAgc3Bhbi5zY3Jv
bGxJbnRvVmlld0lmTmVlZGVkKCk7Cn0KPC9zY3JpcHQ+CjwvYm9keT4KPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>457038</attachid>
            <date>2022-04-08 03:53:20 -0700</date>
            <delta_ts>2022-04-08 06:07:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220408115318.patch</filename>
            <type>text/plain</type>
            <size>4673</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTExN2M2MmU0M2UyNjdj
ZDI3MWFhY2Y1ZmExN2I4ODRkODIzM2Y5Yy4uMWZhZDNhMmQxODU2NjhhZDI2Y2I2OTM3MTgxNDhj
MmJkOTE0MDU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA0LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl
ckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpnZXRSZWN0VG9FeHBv
c2UgY29uc3QpOgorCiAyMDIyLTA0LTA3ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv
bT4KIAogICAgICAgICBbQ1NTIENvbnRhaW5lciBRdWVyaWVzXSBFdmFsdWF0ZSBhZ2FpbnN0IHNo
YWRvdy1pbmNsdWRpbmcgYW5jZXN0b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh
eWVyLmNwcAppbmRleCAxZjU1NmZiNmVhM2M4M2Q5NGRmMDVmYThjNDg4OWQzODFlZmY0MzBjLi40
MzQyNDQ5YTNlNjkzYWMxNWViNTRmYTg0MWFlMWMyNTVkMjQ4NjgwIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTI2NTgsMTIgKzI2NTgsMTQgQEAgTGF5b3V0
UmVjdCBSZW5kZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2li
bGVSZWN0LCBjb25zdCBMYXkKICAgICAgICAgfQogICAgIH0KIAotICAgIC8vIERldGVybWluZSB0
aGUgYXBwcm9wcmlhdGUgWCBiZWhhdmlvci4KICAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9y
IHNjcm9sbFggPSBhbGlnblguZ2V0SGlkZGVuQmVoYXZpb3IoKTsKLSAgICBMYXlvdXRSZWN0IGV4
cG9zZVJlY3RYKGV4cG9zZVJlY3QueCgpLCB2aXNpYmxlUmVjdC55KCksIGV4cG9zZVJlY3Qud2lk
dGgoKSwgdmlzaWJsZVJlY3QuaGVpZ2h0KCkpOwotICAgIExheW91dFJlY3QgaW50ZXJzZWN0UmVj
dCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFgpOwotICAgIGlmICghaW50
ZXJzZWN0UmVjdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RXaWR0
aCA9IGludGVyc2VjdFJlY3Qud2lkdGgoKTsKKyAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9y
IHNjcm9sbFkgPSBhbGlnblkuZ2V0SGlkZGVuQmVoYXZpb3IoKTsKKyAgICBib29sIGNvbnRhaW5z
ID0gdmlzaWJsZVJlY3QuY29udGFpbnMoZXhwb3NlUmVjdCk7CisKKyAgICAvLyBEZXRlcm1pbmUg
dGhlIGFwcHJvcHJpYXRlIFggYmVoYXZpb3IuCisgICAgaWYgKGNvbnRhaW5zKSB7CisgICAgICAg
IExheW91dFJlY3QgZXhwb3NlUmVjdFgoZXhwb3NlUmVjdC54KCksIHZpc2libGVSZWN0LnkoKSwg
ZXhwb3NlUmVjdC53aWR0aCgpLCB2aXNpYmxlUmVjdC5oZWlnaHQoKSk7CisgICAgICAgIExheW91
dFVuaXQgaW50ZXJzZWN0V2lkdGggPSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9zZVJl
Y3RYKS53aWR0aCgpOwogICAgICAgICBpZiAoaW50ZXJzZWN0V2lkdGggPT0gZXhwb3NlUmVjdC53
aWR0aCgpIHx8IChhbGlnblgubGVnYWN5SG9yaXpvbnRhbFZpc2liaWxpdHlUaHJlc2hvbGRFbmFi
bGVkKCkgJiYgaW50ZXJzZWN0V2lkdGggPj0gTUlOX0lOVEVSU0VDVF9GT1JfUkVWRUFMKSkgewog
ICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhl
IHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3Rh
bmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwgYnV0IG92ZXIgYSBjZXJ0YWluIHRocmVzaG9sZCwK
QEAgLTI2NzQsMTAgKzI2NzYsOSBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpnZXRSZWN0VG9F
eHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IExheQogICAgICAgICAg
ICAgc2Nyb2xsWCA9IGFsaWduWC5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKICAgICAgICAgICAgIGlm
IChzY3JvbGxYID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWduQ2VudGVyKQogICAg
ICAgICAgICAgICAgIHNjcm9sbFggPSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpOb1Njcm9s
bDsKLSAgICAgICAgfSBlbHNlIGlmIChpbnRlcnNlY3RXaWR0aCA+IDApIHsKKyAgICAgICAgfSBl
bHNlIGlmIChpbnRlcnNlY3RXaWR0aCA+IDApCiAgICAgICAgICAgICAvLyBJZiB0aGUgcmVjdGFu
Z2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCBidXQgbm90IGFib3ZlIHRoZSBtaW5pbXVtIHRocmVz
aG9sZCwgdXNlIHRoZSBzcGVjaWZpZWQgcGFydGlhbCBiZWhhdmlvcgogICAgICAgICAgICAgc2Ny
b2xsWCA9IGFsaWduWC5nZXRQYXJ0aWFsQmVoYXZpb3IoKTsKLSAgICAgICAgfQogICAgIH0KICAg
ICAvLyBJZiB3ZSdyZSB0cnlpbmcgdG8gYWxpZ24gdG8gdGhlIGNsb3Nlc3QgZWRnZSwgYW5kIHRo
ZSBleHBvc2VSZWN0IGlzIGZ1cnRoZXIgcmlnaHQKICAgICAvLyB0aGFuIHRoZSB2aXNpYmxlUmVj
dCwgYW5kIG5vdCBiaWdnZXIgdGhhbiB0aGUgdmlzaWJsZSBhcmVhLCB0aGVuIGFsaWduIHdpdGgg
dGhlIHJpZ2h0LgpAQCAtMjY5NiwxMSArMjY5Nyw5IEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6
OmdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgTGF5
CiAgICAgICAgIHggPSBleHBvc2VSZWN0LngoKTsKIAogICAgIC8vIERldGVybWluZSB0aGUgYXBw
cm9wcmlhdGUgWSBiZWhhdmlvci4KLSAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9s
bFkgPSBhbGlnblkuZ2V0SGlkZGVuQmVoYXZpb3IoKTsKLSAgICBMYXlvdXRSZWN0IGV4cG9zZVJl
Y3RZKHZpc2libGVSZWN0LngoKSwgZXhwb3NlUmVjdC55KCksIHZpc2libGVSZWN0LndpZHRoKCks
IGV4cG9zZVJlY3QuaGVpZ2h0KCkpOwotICAgIGludGVyc2VjdFJlY3QgPSBpbnRlcnNlY3Rpb24o
dmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RZKTsKLSAgICBpZiAoIWludGVyc2VjdFJlY3QuaXNFbXB0
eSgpKSB7Ci0gICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0gaW50ZXJzZWN0UmVj
dC5oZWlnaHQoKTsKKyAgICBpZiAoY29udGFpbnMpIHsKKyAgICAgICAgTGF5b3V0UmVjdCBleHBv
c2VSZWN0WSh2aXNpYmxlUmVjdC54KCksIGV4cG9zZVJlY3QueSgpLCB2aXNpYmxlUmVjdC53aWR0
aCgpLCBleHBvc2VSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RI
ZWlnaHQgPSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RZKS5oZWlnaHQoKTsK
ICAgICAgICAgaWYgKGludGVyc2VjdEhlaWdodCA9PSBleHBvc2VSZWN0LmhlaWdodCgpKSB7CiAg
ICAgICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUsIHVzZSB0aGUg
c3BlY2lmaWVkIHZpc2libGUgYmVoYXZpb3IuCiAgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25Z
LmdldFZpc2libGVCZWhhdmlvcigpOwpAQCAtMjcwOSwxMCArMjcwOCw5IEBAIExheW91dFJlY3Qg
UmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVj
dCwgY29uc3QgTGF5CiAgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFZpc2libGVCZWhh
dmlvcigpOwogICAgICAgICAgICAgaWYgKHNjcm9sbFkgPT0gU2Nyb2xsQWxpZ25tZW50OjpCZWhh
dmlvcjo6QWxpZ25DZW50ZXIpCiAgICAgICAgICAgICAgICAgc2Nyb2xsWSA9IFNjcm9sbEFsaWdu
bWVudDo6QmVoYXZpb3I6Ok5vU2Nyb2xsOwotICAgICAgICB9IGVsc2UgaWYgKGludGVyc2VjdEhl
aWdodCA+IDApIHsKKyAgICAgICAgfSBlbHNlIGlmIChpbnRlcnNlY3RIZWlnaHQgPiAwKQogICAg
ICAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwgdXNlIHRo
ZSBzcGVjaWZpZWQgcGFydGlhbCBiZWhhdmlvcgogICAgICAgICAgICAgc2Nyb2xsWSA9IGFsaWdu
WS5nZXRQYXJ0aWFsQmVoYXZpb3IoKTsKLSAgICAgICAgfQogICAgIH0KICAgICAvLyBJZiB3ZSdy
ZSB0cnlpbmcgdG8gYWxpZ24gdG8gdGhlIGNsb3Nlc3QgZWRnZSwgYW5kIHRoZSBleHBvc2VSZWN0
IGlzIGZ1cnRoZXIgZG93bgogICAgIC8vIHRoYW4gdGhlIHZpc2libGVSZWN0LCBhbmQgbm90IGJp
Z2dlciB0aGFuIHRoZSB2aXNpYmxlIGFyZWEsIHRoZW4gYWxpZ24gd2l0aCB0aGUgYm90dG9tLgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>457060</attachid>
            <date>2022-04-08 06:07:33 -0700</date>
            <delta_ts>2022-04-08 08:36:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220408140732.patch</filename>
            <type>text/plain</type>
            <size>6048</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTExN2M2MmU0M2UyNjdj
ZDI3MWFhY2Y1ZmExN2I4ODRkODIzM2Y5Yy4uMWZhZDNhMmQxODU2NjhhZDI2Y2I2OTM3MTgxNDhj
MmJkOTE0MDU1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTA0LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl
ckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpnZXRSZWN0VG9FeHBv
c2UgY29uc3QpOgorCiAyMDIyLTA0LTA3ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv
bT4KIAogICAgICAgICBbQ1NTIENvbnRhaW5lciBRdWVyaWVzXSBFdmFsdWF0ZSBhZ2FpbnN0IHNo
YWRvdy1pbmNsdWRpbmcgYW5jZXN0b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL0xheW91dFJlY3QuY3BwCmluZGV4IGNjZmZmOGJmMDkzN2EyNzczODQ4OWFjNzRiNDdi
ZDQwNGMzNWM3NGIuLjNjNTdmMmNmMzVjNGRkOGRlZmJlM2FiMmEwOTA4Yzc5NTQ1MGIyMzIgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuY3BwCkBA
IC01MCw2ICs1MCwxMiBAQCBib29sIExheW91dFJlY3Q6OmludGVyc2VjdHMoY29uc3QgTGF5b3V0
UmVjdCYgb3RoZXIpIGNvbnN0CiAgICAgICAgICYmIHkoKSA8IG90aGVyLm1heFkoKSAmJiBvdGhl
ci55KCkgPCBtYXhZKCk7CiB9CiAKK2Jvb2wgTGF5b3V0UmVjdDo6aW50ZXJzZWN0c0luY2x1ZGlu
Z0VtcHR5KGNvbnN0IExheW91dFJlY3QmIG90aGVyKSBjb25zdAoreworICAgIHJldHVybiB4KCkg
PCBvdGhlci5tYXhYKCkgJiYgb3RoZXIueCgpIDwgbWF4WCgpCisgICAgICAgICYmIHkoKSA8IG90
aGVyLm1heFkoKSAmJiBvdGhlci55KCkgPCBtYXhZKCk7Cit9CisKIGJvb2wgTGF5b3V0UmVjdDo6
Y29udGFpbnMoY29uc3QgTGF5b3V0UmVjdCYgb3RoZXIpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHgo
KSA8PSBvdGhlci54KCkgJiYgbWF4WCgpID49IG90aGVyLm1heFgoKQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oCmluZGV4IGFiNjI3MzhkOTE5YjdjYzFj
YTBjNDVmNzQ4Y2NhYTVjOTMxMzUyMmYuLjg2MWJiZmRjMTY3OTFmYTU2MTEyYTI4NWM2ZmQyM2I4
ZTM1NzM4OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xh
eW91dFJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRS
ZWN0LmgKQEAgLTE3OSw2ICsxNzksNyBAQCBwdWJsaWM6CiAgICAgfQogICAgIAogICAgIGJvb2wg
aW50ZXJzZWN0cyhjb25zdCBMYXlvdXRSZWN0JikgY29uc3Q7CisgICAgYm9vbCBpbnRlcnNlY3Rz
SW5jbHVkaW5nRW1wdHkoY29uc3QgTGF5b3V0UmVjdCYpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQ
T1JUIGJvb2wgY29udGFpbnMoY29uc3QgTGF5b3V0UmVjdCYpIGNvbnN0OwogCiAgICAgLy8gVGhp
cyBjaGVja3MgdG8gc2VlIGlmIHRoZSByZWN0IGNvbnRhaW5zIHgseSBpbiB0aGUgdHJhZGl0aW9u
YWwgc2Vuc2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5
ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCAx
ZjU1NmZiNmVhM2M4M2Q5NGRmMDVmYThjNDg4OWQzODFlZmY0MzBjLi5mNDAyNjllN2M4ZjIxYzM2
YTY5YjAzM2QzODBhNDJmN2M0NDI0YWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJMYXllci5jcHAKQEAgLTI2NTgsMTIgKzI2NTgsMTQgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXll
cjo6Z2V0UmVjdFRvRXhwb3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBM
YXkKICAgICAgICAgfQogICAgIH0KIAotICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUg
WCBiZWhhdmlvci4KICAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFggPSBhbGln
blguZ2V0SGlkZGVuQmVoYXZpb3IoKTsKLSAgICBMYXlvdXRSZWN0IGV4cG9zZVJlY3RYKGV4cG9z
ZVJlY3QueCgpLCB2aXNpYmxlUmVjdC55KCksIGV4cG9zZVJlY3Qud2lkdGgoKSwgdmlzaWJsZVJl
Y3QuaGVpZ2h0KCkpOwotICAgIExheW91dFJlY3QgaW50ZXJzZWN0UmVjdCA9IGludGVyc2VjdGlv
bih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFgpOwotICAgIGlmICghaW50ZXJzZWN0UmVjdC5pc0Vt
cHR5KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RXaWR0aCA9IGludGVyc2VjdFJl
Y3Qud2lkdGgoKTsKKyAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFkgPSBhbGln
blkuZ2V0SGlkZGVuQmVoYXZpb3IoKTsKKyAgICBib29sIGludGVyc2VjdHMgPSB2aXNpYmxlUmVj
dC5pbnRlcnNlY3RzSW5jbHVkaW5nRW1wdHkoZXhwb3NlUmVjdCk7CisKKyAgICAvLyBEZXRlcm1p
bmUgdGhlIGFwcHJvcHJpYXRlIFggYmVoYXZpb3IuCisgICAgaWYgKGludGVyc2VjdHMpIHsKKyAg
ICAgICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0WChleHBvc2VSZWN0LngoKSwgdmlzaWJsZVJlY3Qu
eSgpLCBleHBvc2VSZWN0LndpZHRoKCksIHZpc2libGVSZWN0LmhlaWdodCgpKTsKKyAgICAgICAg
TGF5b3V0VW5pdCBpbnRlcnNlY3RXaWR0aCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhw
b3NlUmVjdFgpLndpZHRoKCk7CiAgICAgICAgIGlmIChpbnRlcnNlY3RXaWR0aCA9PSBleHBvc2VS
ZWN0LndpZHRoKCkgfHwgKGFsaWduWC5sZWdhY3lIb3Jpem9udGFsVmlzaWJpbGl0eVRocmVzaG9s
ZEVuYWJsZWQoKSAmJiBpbnRlcnNlY3RXaWR0aCA+PSBNSU5fSU5URVJTRUNUX0ZPUl9SRVZFQUwp
KSB7CiAgICAgICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUsIHVz
ZSB0aGUgc3BlY2lmaWVkIHZpc2libGUgYmVoYXZpb3IuCiAgICAgICAgICAgICAvLyBJZiB0aGUg
cmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCBidXQgb3ZlciBhIGNlcnRhaW4gdGhyZXNo
b2xkLApAQCAtMjY3NCwxMCArMjY3Niw5IEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJl
Y3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgTGF5CiAgICAg
ICAgICAgICBzY3JvbGxYID0gYWxpZ25YLmdldFZpc2libGVCZWhhdmlvcigpOwogICAgICAgICAg
ICAgaWYgKHNjcm9sbFggPT0gU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25DZW50ZXIp
CiAgICAgICAgICAgICAgICAgc2Nyb2xsWCA9IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6Ok5v
U2Nyb2xsOwotICAgICAgICB9IGVsc2UgaWYgKGludGVyc2VjdFdpZHRoID4gMCkgeworICAgICAg
ICB9IGVsc2UgaWYgKGludGVyc2VjdFdpZHRoID4gMCkKICAgICAgICAgICAgIC8vIElmIHRoZSBy
ZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBub3QgYWJvdmUgdGhlIG1pbmltdW0g
dGhyZXNob2xkLCB1c2UgdGhlIHNwZWNpZmllZCBwYXJ0aWFsIGJlaGF2aW9yCiAgICAgICAgICAg
ICBzY3JvbGxYID0gYWxpZ25YLmdldFBhcnRpYWxCZWhhdmlvcigpOwotICAgICAgICB9CiAgICAg
fQogICAgIC8vIElmIHdlJ3JlIHRyeWluZyB0byBhbGlnbiB0byB0aGUgY2xvc2VzdCBlZGdlLCBh
bmQgdGhlIGV4cG9zZVJlY3QgaXMgZnVydGhlciByaWdodAogICAgIC8vIHRoYW4gdGhlIHZpc2li
bGVSZWN0LCBhbmQgbm90IGJpZ2dlciB0aGFuIHRoZSB2aXNpYmxlIGFyZWEsIHRoZW4gYWxpZ24g
d2l0aCB0aGUgcmlnaHQuCkBAIC0yNjk2LDExICsyNjk3LDkgQEAgTGF5b3V0UmVjdCBSZW5kZXJM
YXllcjo6Z2V0UmVjdFRvRXhwb3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25z
dCBMYXkKICAgICAgICAgeCA9IGV4cG9zZVJlY3QueCgpOwogCiAgICAgLy8gRGV0ZXJtaW5lIHRo
ZSBhcHByb3ByaWF0ZSBZIGJlaGF2aW9yLgotICAgIFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3Ig
c2Nyb2xsWSA9IGFsaWduWS5nZXRIaWRkZW5CZWhhdmlvcigpOwotICAgIExheW91dFJlY3QgZXhw
b3NlUmVjdFkodmlzaWJsZVJlY3QueCgpLCBleHBvc2VSZWN0LnkoKSwgdmlzaWJsZVJlY3Qud2lk
dGgoKSwgZXhwb3NlUmVjdC5oZWlnaHQoKSk7Ci0gICAgaW50ZXJzZWN0UmVjdCA9IGludGVyc2Vj
dGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFkpOwotICAgIGlmICghaW50ZXJzZWN0UmVjdC5p
c0VtcHR5KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RIZWlnaHQgPSBpbnRlcnNl
Y3RSZWN0LmhlaWdodCgpOworICAgIGlmIChpbnRlcnNlY3RzKSB7CisgICAgICAgIExheW91dFJl
Y3QgZXhwb3NlUmVjdFkodmlzaWJsZVJlY3QueCgpLCBleHBvc2VSZWN0LnkoKSwgdmlzaWJsZVJl
Y3Qud2lkdGgoKSwgZXhwb3NlUmVjdC5oZWlnaHQoKSk7CisgICAgICAgIExheW91dFVuaXQgaW50
ZXJzZWN0SGVpZ2h0ID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBvc2VSZWN0WSkuaGVp
Z2h0KCk7CiAgICAgICAgIGlmIChpbnRlcnNlY3RIZWlnaHQgPT0gZXhwb3NlUmVjdC5oZWlnaHQo
KSkgewogICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1
c2UgdGhlIHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgc2Nyb2xsWSA9
IGFsaWduWS5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKQEAgLTI3MDksMTAgKzI3MDgsOSBAQCBMYXlv
dXRSZWN0IFJlbmRlckxheWVyOjpnZXRSZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlz
aWJsZVJlY3QsIGNvbnN0IExheQogICAgICAgICAgICAgc2Nyb2xsWSA9IGFsaWduWS5nZXRWaXNp
YmxlQmVoYXZpb3IoKTsKICAgICAgICAgICAgIGlmIChzY3JvbGxZID09IFNjcm9sbEFsaWdubWVu
dDo6QmVoYXZpb3I6OkFsaWduQ2VudGVyKQogICAgICAgICAgICAgICAgIHNjcm9sbFkgPSBTY3Jv
bGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpOb1Njcm9sbDsKLSAgICAgICAgfSBlbHNlIGlmIChpbnRl
cnNlY3RIZWlnaHQgPiAwKSB7CisgICAgICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0SGVpZ2h0ID4g
MCkKICAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUs
IHVzZSB0aGUgc3BlY2lmaWVkIHBhcnRpYWwgYmVoYXZpb3IKICAgICAgICAgICAgIHNjcm9sbFkg
PSBhbGlnblkuZ2V0UGFydGlhbEJlaGF2aW9yKCk7Ci0gICAgICAgIH0KICAgICB9CiAgICAgLy8g
SWYgd2UncmUgdHJ5aW5nIHRvIGFsaWduIHRvIHRoZSBjbG9zZXN0IGVkZ2UsIGFuZCB0aGUgZXhw
b3NlUmVjdCBpcyBmdXJ0aGVyIGRvd24KICAgICAvLyB0aGFuIHRoZSB2aXNpYmxlUmVjdCwgYW5k
IG5vdCBiaWdnZXIgdGhhbiB0aGUgdmlzaWJsZSBhcmVhLCB0aGVuIGFsaWduIHdpdGggdGhlIGJv
dHRvbS4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>457074</attachid>
            <date>2022-04-08 08:36:32 -0700</date>
            <delta_ts>2022-04-13 00:51:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220408163631.patch</filename>
            <type>text/plain</type>
            <size>8304</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTExN2M2MmU0M2UyNjdj
ZDI3MWFhY2Y1ZmExN2I4ODRkODIzM2Y5Yy4uYzljYmViMjBiY2VlNmQ4M2EzY2EwMzU3M2U3MGNk
NWQxYTRiYjczNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTA0LTA4ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBtb3N0bHkgcmV2ZXJ0cyB0byB0aGUgY29kZSBh
cyBpdCB3YXMgYmVmb3JlIHIyOTA3NzAsIGJ1dCBhZGRzIGNvZGUgdG8KKyAgICAgICAgdHJlYXQg
bm9uLWludGVyc2VjdGlvbnMgYXMgaGlkZGVuLCBpbmNsdWRpbmcgemVybyB3aWR0aC9oZWlnaHQg
cmVjdHMuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3Nzb20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWwKKworICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlIGNvbnN0KToKKwogMjAyMi0wNC0wNyAgQW50dGkgS29p
dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NTUyBDb250YWluZXIgUXVlcmll
c10gRXZhbHVhdGUgYWdhaW5zdCBzaGFkb3ctaW5jbHVkaW5nIGFuY2VzdG9ycwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMWY1NTZmYjZlYTNjODNkOTRkZjA1
ZmE4YzQ4ODlkMzgxZWZmNDMwYy4uYjFkMDFhOWFjOWY3Mjg1Mjc0ZTJhZjc3ZDNlZWRkOGNkODFl
ODBiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yNjU4
LDEyICsyNjU4LDEzIEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShj
b25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgTGF5CiAgICAgICAgIH0KICAgICB9
CiAKLSAgICAvLyBEZXRlcm1pbmUgdGhlIGFwcHJvcHJpYXRlIFggYmVoYXZpb3IuCiAgICAgU2Ny
b2xsQWxpZ25tZW50OjpCZWhhdmlvciBzY3JvbGxYID0gYWxpZ25YLmdldEhpZGRlbkJlaGF2aW9y
KCk7Ci0gICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0WChleHBvc2VSZWN0LngoKSwgdmlzaWJsZVJl
Y3QueSgpLCBleHBvc2VSZWN0LndpZHRoKCksIHZpc2libGVSZWN0LmhlaWdodCgpKTsKLSAgICBM
YXlvdXRSZWN0IGludGVyc2VjdFJlY3QgPSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9z
ZVJlY3RYKTsKLSAgICBpZiAoIWludGVyc2VjdFJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIExh
eW91dFVuaXQgaW50ZXJzZWN0V2lkdGggPSBpbnRlcnNlY3RSZWN0LndpZHRoKCk7CisgICAgYm9v
bCBpbnRlcnNlY3RzID0gZXhwb3NlUmVjdC5tYXhYKCkgPj0gdmlzaWJsZVJlY3QueCgpICYmIGV4
cG9zZVJlY3QueCgpIDw9IHZpc2libGVSZWN0Lm1heFgoKTsKKworICAgIC8vIERldGVybWluZSB0
aGUgYXBwcm9wcmlhdGUgWCBiZWhhdmlvci4KKyAgICBpZiAoaW50ZXJzZWN0cykgeworICAgICAg
ICBMYXlvdXRSZWN0IGV4cG9zZVJlY3RYKGV4cG9zZVJlY3QueCgpLCB2aXNpYmxlUmVjdC55KCks
IGV4cG9zZVJlY3Qud2lkdGgoKSwgdmlzaWJsZVJlY3QuaGVpZ2h0KCkpOworICAgICAgICBMYXlv
dXRVbml0IGludGVyc2VjdFdpZHRoID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBvc2VS
ZWN0WCkud2lkdGgoKTsKICAgICAgICAgaWYgKGludGVyc2VjdFdpZHRoID09IGV4cG9zZVJlY3Qu
d2lkdGgoKSB8fCAoYWxpZ25YLmxlZ2FjeUhvcml6b250YWxWaXNpYmlsaXR5VGhyZXNob2xkRW5h
YmxlZCgpICYmIGludGVyc2VjdFdpZHRoID49IE1JTl9JTlRFUlNFQ1RfRk9SX1JFVkVBTCkpIHsK
ICAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgZnVsbHkgdmlzaWJsZSwgdXNlIHRo
ZSBzcGVjaWZpZWQgdmlzaWJsZSBiZWhhdmlvci4KICAgICAgICAgICAgIC8vIElmIHRoZSByZWN0
YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBvdmVyIGEgY2VydGFpbiB0aHJlc2hvbGQs
CkBAIC0yNjc0LDEwICsyNjc1LDkgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6Z2V0UmVjdFRv
RXhwb3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBMYXkKICAgICAgICAg
ICAgIHNjcm9sbFggPSBhbGlnblguZ2V0VmlzaWJsZUJlaGF2aW9yKCk7CiAgICAgICAgICAgICBp
ZiAoc2Nyb2xsWCA9PSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnbkNlbnRlcikKICAg
ICAgICAgICAgICAgICBzY3JvbGxYID0gU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6Tm9TY3Jv
bGw7Ci0gICAgICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGggPiAwKSB7CisgICAgICAgIH0g
ZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGggPiAwKQogICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3Rh
bmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwgYnV0IG5vdCBhYm92ZSB0aGUgbWluaW11bSB0aHJl
c2hvbGQsIHVzZSB0aGUgc3BlY2lmaWVkIHBhcnRpYWwgYmVoYXZpb3IKICAgICAgICAgICAgIHNj
cm9sbFggPSBhbGlnblguZ2V0UGFydGlhbEJlaGF2aW9yKCk7Ci0gICAgICAgIH0KICAgICB9CiAg
ICAgLy8gSWYgd2UncmUgdHJ5aW5nIHRvIGFsaWduIHRvIHRoZSBjbG9zZXN0IGVkZ2UsIGFuZCB0
aGUgZXhwb3NlUmVjdCBpcyBmdXJ0aGVyIHJpZ2h0CiAgICAgLy8gdGhhbiB0aGUgdmlzaWJsZVJl
Y3QsIGFuZCBub3QgYmlnZ2VyIHRoYW4gdGhlIHZpc2libGUgYXJlYSwgdGhlbiBhbGlnbiB3aXRo
IHRoZSByaWdodC4KQEAgLTI2OTUsMTIgKzI2OTUsMTMgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXll
cjo6Z2V0UmVjdFRvRXhwb3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBM
YXkKICAgICBlbHNlCiAgICAgICAgIHggPSBleHBvc2VSZWN0LngoKTsKIAotICAgIC8vIERldGVy
bWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhhdmlvci4KICAgICBTY3JvbGxBbGlnbm1lbnQ6OkJl
aGF2aW9yIHNjcm9sbFkgPSBhbGlnblkuZ2V0SGlkZGVuQmVoYXZpb3IoKTsKLSAgICBMYXlvdXRS
ZWN0IGV4cG9zZVJlY3RZKHZpc2libGVSZWN0LngoKSwgZXhwb3NlUmVjdC55KCksIHZpc2libGVS
ZWN0LndpZHRoKCksIGV4cG9zZVJlY3QuaGVpZ2h0KCkpOwotICAgIGludGVyc2VjdFJlY3QgPSBp
bnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RZKTsKLSAgICBpZiAoIWludGVyc2Vj
dFJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0g
aW50ZXJzZWN0UmVjdC5oZWlnaHQoKTsKKyAgICBpbnRlcnNlY3RzID0gZXhwb3NlUmVjdC5tYXhZ
KCkgPj0gdmlzaWJsZVJlY3QueSgpICYmIGV4cG9zZVJlY3QueSgpIDw9IHZpc2libGVSZWN0Lm1h
eFkoKTsKKworICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhhdmlvci4KKyAg
ICBpZiAoaW50ZXJzZWN0cykgeworICAgICAgICBMYXlvdXRSZWN0IGV4cG9zZVJlY3RZKHZpc2li
bGVSZWN0LngoKSwgZXhwb3NlUmVjdC55KCksIHZpc2libGVSZWN0LndpZHRoKCksIGV4cG9zZVJl
Y3QuaGVpZ2h0KCkpOworICAgICAgICBMYXlvdXRVbml0IGludGVyc2VjdEhlaWdodCA9IGludGVy
c2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFkpLmhlaWdodCgpOwogICAgICAgICBpZiAo
aW50ZXJzZWN0SGVpZ2h0ID09IGV4cG9zZVJlY3QuaGVpZ2h0KCkpIHsKICAgICAgICAgICAgIC8v
IElmIHRoZSByZWN0YW5nbGUgaXMgZnVsbHkgdmlzaWJsZSwgdXNlIHRoZSBzcGVjaWZpZWQgdmlz
aWJsZSBiZWhhdmlvci4KICAgICAgICAgICAgIHNjcm9sbFkgPSBhbGlnblkuZ2V0VmlzaWJsZUJl
aGF2aW9yKCk7CkBAIC0yNzA5LDEwICsyNzEwLDkgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6
Z2V0UmVjdFRvRXhwb3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBMYXkK
ICAgICAgICAgICAgIHNjcm9sbFkgPSBhbGlnblkuZ2V0VmlzaWJsZUJlaGF2aW9yKCk7CiAgICAg
ICAgICAgICBpZiAoc2Nyb2xsWSA9PSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpBbGlnbkNl
bnRlcikKICAgICAgICAgICAgICAgICBzY3JvbGxZID0gU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlv
cjo6Tm9TY3JvbGw7Ci0gICAgICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0SGVpZ2h0ID4gMCkgewor
ICAgICAgICB9IGVsc2UgaWYgKGludGVyc2VjdEhlaWdodCA+IDApCiAgICAgICAgICAgICAvLyBJ
ZiB0aGUgcmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCBw
YXJ0aWFsIGJlaGF2aW9yCiAgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFBhcnRpYWxC
ZWhhdmlvcigpOwotICAgICAgICB9CiAgICAgfQogICAgIC8vIElmIHdlJ3JlIHRyeWluZyB0byBh
bGlnbiB0byB0aGUgY2xvc2VzdCBlZGdlLCBhbmQgdGhlIGV4cG9zZVJlY3QgaXMgZnVydGhlciBk
b3duCiAgICAgLy8gdGhhbiB0aGUgdmlzaWJsZVJlY3QsIGFuZCBub3QgYmlnZ2VyIHRoYW4gdGhl
IHZpc2libGUgYXJlYSwgdGhlbiBhbGlnbiB3aXRoIHRoZSBib3R0b20uCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv
dzNjL0NoYW5nZUxvZwppbmRleCBjNjQzN2Q2M2UyMmM5Mjg0MDdmN2FmNjhlNzg0YzM4NDc3Nzg0
Njk2Li5iZTc2NGY1MDU2YjJlYjNlYTFlODE2MDFiMmE3YThkMzA0NmIyMzBkIDEwMDY0NAotLS0g
YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2lt
cG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wNC0wOCAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI5MDc3MCk6IGVs
ZW1lbnQuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCgpIHNjcm9sbHMgdG8gdG9wIGV2ZW4gd2hlbiBl
bGVtZW50IGlzIGFscmVhZHkgaW4gdmlld3BvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODk4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3
L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg
ICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXct
emVyby1oZWlnaHQtaXRlbS5odG1sOiBBZGRlZC4KKwogMjAyMi0wNC0wNyAgQW50dGkgS29pdmlz
dG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NTUyBDb250YWluZXIgUXVlcmllc10g
RXZhbHVhdGUgYWdhaW5zdCBzaGFkb3ctaW5jbHVkaW5nIGFuY2VzdG9ycwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmll
dy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xs
aW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2
NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGMzNjBi
ZDQ4MmUzODNiZTRmNmMyMjUyZjEwZGZkMzViNDg5M2M3OQotLS0gL2Rldi9udWxsCisrKyBiL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcv
c2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwz
IEBACisKK1BBU1Mgc2Nyb2xsSW50b1ZpZXcgb24gemVybyBoZWlnaHQgaXRlbQorCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Nv
bS12aWV3L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0LWl0ZW0uaHRtbCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50
b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA5NzNkYWRiMzVlMDMwNmNh
MTRkZTdjZjVkYjBmYzRiODQyNmJmNzAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9p
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92
aWV3LXplcm8taGVpZ2h0LWl0ZW0uaHRtbApAQCAtMCwwICsxLDUzIEBACis8IURPQ1RZUEUgaHRt
bD4KKzx0aXRsZT5DU1NPTSBWaWV3IC0gc2Nyb2xsSW50b1ZpZXcgZG9lcyBub3Qgc2Nyb2xsIHRv
IHplcm8gaGVpZ2h0IGl0ZW08L3RpdGxlPgorPG1ldGEgY2hhcnNldD0iVVRGLTgiPgorPGxpbmsg
cmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3Nzb20tdmlldy8jZG9t
LWVsZW1lbnQtc2Nyb2xsaW50b3ZpZXciPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhh
cm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3Ny
ZXBvcnQuanMiPjwvc2NyaXB0PgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJib3JkZXI6IDFweCBzb2xp
ZCBibGFjazsgaGVpZ2h0OiAzMDBweDsgd2lkdGg6IDIwMHB4OyBvdmVyZmxvdy15OiBhdXRvO3Zp
c2liaWxpdHk6IGhpZGRlbiIgaWQ9ImJveCI+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRp
dj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+Cisg
ICAgPGRpdiBpZD0idGV4dCI+LS0tIENsaWNraW5nIGhlcmUgc2hvdWxkIE5PVCBzY3JvbGwgdG8g
dG9wIC0tLTwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2Pgor
ICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwv
ZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+
dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAg
IDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2
PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4
dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxk
aXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorPC9kaXY+Cis8c2NyaXB0PgordGVz
dCgoKSA9PiB7Citib3guc2Nyb2xsVG9wID0gNDA7CisKK2xldCBkaXYgPSBkb2N1bWVudC5jcmVh
dGVFbGVtZW50KCJkaXYiKTsKK2Rpdi50ZXh0Q29udGVudCA9ICJkaXYiOwordGV4dC5wYXJlbnRO
b2RlLmluc2VydEJlZm9yZShkaXYsIHRleHQpOworCitsZXQgc3BhbiA9IGRvY3VtZW50LmNyZWF0
ZUVsZW1lbnQoInNwYW4iKTsKK3NwYW4udGFiSW5kZXggPSAwOworZGl2LmFwcGVuZChzcGFuKTsK
Kworc3Bhbi5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCk7CisKK2Fzc2VydF9lcXVhbHMoYm94LnNj
cm9sbFRvcCwgNDAsICdib3guc2Nyb2xsVG9wJyk7Cit9LCBgc2Nyb2xsSW50b1ZpZXcgb24gemVy
byBoZWlnaHQgaXRlbWApOworCis8L3NjcmlwdD4KKzwvYm9keT4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>457512</attachid>
            <date>2022-04-13 00:51:10 -0700</date>
            <delta_ts>2022-04-29 01:52:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220413085109.patch</filename>
            <type>text/plain</type>
            <size>8284</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyODAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ3OTFhNWU0NjY2OGM3
NTdjZjkyMDZiYzIwZTU2ODhkNzllOTlkYi4uZDc3ZTRkNDRlZTA3MGFhN2U1OTcwNTE4NzM3YjQ1
ZTc5ZTBmNmQ0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTA0LTEzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBtb3N0bHkgcmV2ZXJ0cyB0byB0aGUgY29kZSBh
cyBpdCB3YXMgYmVmb3JlIHIyOTA3NzAsIGJ1dCBhZGRzIGNvZGUgdG8KKyAgICAgICAgdHJlYXQg
bm9uLWludGVyc2VjdGlvbnMgYXMgaGlkZGVuLCBpbmNsdWRpbmcgemVybyB3aWR0aC9oZWlnaHQg
cmVjdHMuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3Nzb20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWwKKworICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k
ZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlIGNvbnN0KToKKwogMjAyMi0wNC0xMiAgQ2hyaXMgRHVt
ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIENyYXNoIHVuZGVyIENhY2hlZFJlc291
cmNlQ2xpZW50V2Fsa2VyPFdlYkNvcmU6OkNhY2hlZEltYWdlQ2xpZW50Pjo6bmV4dCgpCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBkMGUyOTdjNDJhNWJkZWQ2
ZjNiNjcxODZjNTNiMTdhYmY3M2ZmZjI4Li45NjIwODNkMjBmY2IwMDhmMTgwM2M2ZWI1MTk4OTNj
Yjg1NjRhZmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5
ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAg
LTI2NTUsMTIgKzI2NTUsMTMgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6Z2V0UmVjdFRvRXhw
b3NlKGNvbnN0IExheW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBMYXkKICAgICAgICAgfQog
ICAgIH0KIAotICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWCBiZWhhdmlvci4KICAg
ICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFggPSBhbGlnblguZ2V0SGlkZGVuQmVo
YXZpb3IoKTsKLSAgICBMYXlvdXRSZWN0IGV4cG9zZVJlY3RYKGV4cG9zZVJlY3QueCgpLCB2aXNp
YmxlUmVjdC55KCksIGV4cG9zZVJlY3Qud2lkdGgoKSwgdmlzaWJsZVJlY3QuaGVpZ2h0KCkpOwot
ICAgIExheW91dFJlY3QgaW50ZXJzZWN0UmVjdCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwg
ZXhwb3NlUmVjdFgpOwotICAgIGlmICghaW50ZXJzZWN0UmVjdC5pc0VtcHR5KCkpIHsKLSAgICAg
ICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RXaWR0aCA9IGludGVyc2VjdFJlY3Qud2lkdGgoKTsKKyAg
ICBib29sIGludGVyc2VjdHMgPSBleHBvc2VSZWN0Lm1heFgoKSA+PSB2aXNpYmxlUmVjdC54KCkg
JiYgZXhwb3NlUmVjdC54KCkgPD0gdmlzaWJsZVJlY3QubWF4WCgpOworCisgICAgLy8gRGV0ZXJt
aW5lIHRoZSBhcHByb3ByaWF0ZSBYIGJlaGF2aW9yLgorICAgIGlmIChpbnRlcnNlY3RzKSB7Cisg
ICAgICAgIExheW91dFJlY3QgZXhwb3NlUmVjdFgoZXhwb3NlUmVjdC54KCksIHZpc2libGVSZWN0
LnkoKSwgZXhwb3NlUmVjdC53aWR0aCgpLCB2aXNpYmxlUmVjdC5oZWlnaHQoKSk7CisgICAgICAg
IExheW91dFVuaXQgaW50ZXJzZWN0V2lkdGggPSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4
cG9zZVJlY3RYKS53aWR0aCgpOwogICAgICAgICBpZiAoaW50ZXJzZWN0V2lkdGggPT0gZXhwb3Nl
UmVjdC53aWR0aCgpIHx8IChhbGlnblgubGVnYWN5SG9yaXpvbnRhbFZpc2liaWxpdHlUaHJlc2hv
bGRFbmFibGVkKCkgJiYgaW50ZXJzZWN0V2lkdGggPj0gTUlOX0lOVEVSU0VDVF9GT1JfUkVWRUFM
KSkgewogICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1
c2UgdGhlIHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgLy8gSWYgdGhl
IHJlY3RhbmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwgYnV0IG92ZXIgYSBjZXJ0YWluIHRocmVz
aG9sZCwKQEAgLTI2NzEsMTAgKzI2NzIsOSBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpnZXRS
ZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IExheQogICAg
ICAgICAgICAgc2Nyb2xsWCA9IGFsaWduWC5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKICAgICAgICAg
ICAgIGlmIChzY3JvbGxYID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWduQ2VudGVy
KQogICAgICAgICAgICAgICAgIHNjcm9sbFggPSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpO
b1Njcm9sbDsKLSAgICAgICAgfSBlbHNlIGlmIChpbnRlcnNlY3RXaWR0aCA+IDApIHsKKyAgICAg
ICAgfSBlbHNlIGlmIChpbnRlcnNlY3RXaWR0aCA+IDApCiAgICAgICAgICAgICAvLyBJZiB0aGUg
cmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCBidXQgbm90IGFib3ZlIHRoZSBtaW5pbXVt
IHRocmVzaG9sZCwgdXNlIHRoZSBzcGVjaWZpZWQgcGFydGlhbCBiZWhhdmlvcgogICAgICAgICAg
ICAgc2Nyb2xsWCA9IGFsaWduWC5nZXRQYXJ0aWFsQmVoYXZpb3IoKTsKLSAgICAgICAgfQogICAg
IH0KICAgICAvLyBJZiB3ZSdyZSB0cnlpbmcgdG8gYWxpZ24gdG8gdGhlIGNsb3Nlc3QgZWRnZSwg
YW5kIHRoZSBleHBvc2VSZWN0IGlzIGZ1cnRoZXIgcmlnaHQKICAgICAvLyB0aGFuIHRoZSB2aXNp
YmxlUmVjdCwgYW5kIG5vdCBiaWdnZXIgdGhhbiB0aGUgdmlzaWJsZSBhcmVhLCB0aGVuIGFsaWdu
IHdpdGggdGhlIHJpZ2h0LgpAQCAtMjY5MiwxMiArMjY5MiwxMyBAQCBMYXlvdXRSZWN0IFJlbmRl
ckxheWVyOjpnZXRSZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNv
bnN0IExheQogICAgIGVsc2UKICAgICAgICAgeCA9IGV4cG9zZVJlY3QueCgpOwogCi0gICAgLy8g
RGV0ZXJtaW5lIHRoZSBhcHByb3ByaWF0ZSBZIGJlaGF2aW9yLgogICAgIFNjcm9sbEFsaWdubWVu
dDo6QmVoYXZpb3Igc2Nyb2xsWSA9IGFsaWduWS5nZXRIaWRkZW5CZWhhdmlvcigpOwotICAgIExh
eW91dFJlY3QgZXhwb3NlUmVjdFkodmlzaWJsZVJlY3QueCgpLCBleHBvc2VSZWN0LnkoKSwgdmlz
aWJsZVJlY3Qud2lkdGgoKSwgZXhwb3NlUmVjdC5oZWlnaHQoKSk7Ci0gICAgaW50ZXJzZWN0UmVj
dCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFkpOwotICAgIGlmICghaW50
ZXJzZWN0UmVjdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RIZWln
aHQgPSBpbnRlcnNlY3RSZWN0LmhlaWdodCgpOworICAgIGludGVyc2VjdHMgPSBleHBvc2VSZWN0
Lm1heFkoKSA+PSB2aXNpYmxlUmVjdC55KCkgJiYgZXhwb3NlUmVjdC55KCkgPD0gdmlzaWJsZVJl
Y3QubWF4WSgpOworCisgICAgLy8gRGV0ZXJtaW5lIHRoZSBhcHByb3ByaWF0ZSBZIGJlaGF2aW9y
LgorICAgIGlmIChpbnRlcnNlY3RzKSB7CisgICAgICAgIExheW91dFJlY3QgZXhwb3NlUmVjdFko
dmlzaWJsZVJlY3QueCgpLCBleHBvc2VSZWN0LnkoKSwgdmlzaWJsZVJlY3Qud2lkdGgoKSwgZXhw
b3NlUmVjdC5oZWlnaHQoKSk7CisgICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0g
aW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBvc2VSZWN0WSkuaGVpZ2h0KCk7CiAgICAgICAg
IGlmIChpbnRlcnNlY3RIZWlnaHQgPT0gZXhwb3NlUmVjdC5oZWlnaHQoKSkgewogICAgICAgICAg
ICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmll
ZCB2aXNpYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgc2Nyb2xsWSA9IGFsaWduWS5nZXRWaXNp
YmxlQmVoYXZpb3IoKTsKQEAgLTI3MDYsMTAgKzI3MDcsOSBAQCBMYXlvdXRSZWN0IFJlbmRlckxh
eWVyOjpnZXRSZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0
IExheQogICAgICAgICAgICAgc2Nyb2xsWSA9IGFsaWduWS5nZXRWaXNpYmxlQmVoYXZpb3IoKTsK
ICAgICAgICAgICAgIGlmIChzY3JvbGxZID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFs
aWduQ2VudGVyKQogICAgICAgICAgICAgICAgIHNjcm9sbFkgPSBTY3JvbGxBbGlnbm1lbnQ6OkJl
aGF2aW9yOjpOb1Njcm9sbDsKLSAgICAgICAgfSBlbHNlIGlmIChpbnRlcnNlY3RIZWlnaHQgPiAw
KSB7CisgICAgICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0SGVpZ2h0ID4gMCkKICAgICAgICAgICAg
IC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUsIHVzZSB0aGUgc3BlY2lm
aWVkIHBhcnRpYWwgYmVoYXZpb3IKICAgICAgICAgICAgIHNjcm9sbFkgPSBhbGlnblkuZ2V0UGFy
dGlhbEJlaGF2aW9yKCk7Ci0gICAgICAgIH0KICAgICB9CiAgICAgLy8gSWYgd2UncmUgdHJ5aW5n
IHRvIGFsaWduIHRvIHRoZSBjbG9zZXN0IGVkZ2UsIGFuZCB0aGUgZXhwb3NlUmVjdCBpcyBmdXJ0
aGVyIGRvd24KICAgICAvLyB0aGFuIHRoZSB2aXNpYmxlUmVjdCwgYW5kIG5vdCBiaWdnZXIgdGhh
biB0aGUgdmlzaWJsZSBhcmVhLCB0aGVuIGFsaWduIHdpdGggdGhlIGJvdHRvbS4KZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBv
cnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGU4NTRiMjAwZDM0YzY2NjUwYTA0NDMzNDlkMmNkYzEy
MmRhZWJiZDMuLjYxZmRkZjg5NTQ5NjcxNGZkNDAxYzAyMWFjYWIxMjE2ZGYzNGYwMzIgMTAwNjQ0
Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTA0LTEzICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcw
KTogZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3
aGVuIGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29t
LXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQ6IEFkZGVk
LgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3JvbGxpbnRv
dmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWw6IEFkZGVkLgorCiAyMDIyLTA0LTEyICBBc3VtdSBU
YWtpa2F3YSAgPGFzdW11QGlnYWxpYS5jb20+CiAKICAgICAgICAgQWxsb3cgV2FzbSBpbXBvcnQg
ZnJvbSBhIEpTIFdvcmtlciBtb2R1bGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVy
by1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0
LWl0ZW0tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBjMzYwYmQ0ODJlMzgzYmU0ZjZjMjI1MmYx
MGRmZDM1YjQ4OTNjNzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8t
aGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQQVNTIHNjcm9sbElu
dG9WaWV3IG9uIHplcm8gaGVpZ2h0IGl0ZW0KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3JvbGxpbnRvdmll
dy16ZXJvLWhlaWdodC1pdGVtLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0LWl0
ZW0uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi4wOTczZGFkYjM1ZTAzMDZjYTE0ZGU3Y2Y1ZGIwZmM0Yjg0MjZi
ZjcwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVt
Lmh0bWwKQEAgLTAsMCArMSw1MyBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NTT00gVmll
dyAtIHNjcm9sbEludG9WaWV3IGRvZXMgbm90IHNjcm9sbCB0byB6ZXJvIGhlaWdodCBpdGVtPC90
aXRsZT4KKzxtZXRhIGNoYXJzZXQ9IlVURi04Ij4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0
cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLXZpZXcvI2RvbS1lbGVtZW50LXNjcm9sbGludG92
aWV3Ij4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4K
KzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4K
Kzxib2R5PgorPGRpdiBzdHlsZT0iYm9yZGVyOiAxcHggc29saWQgYmxhY2s7IGhlaWdodDogMzAw
cHg7IHdpZHRoOiAyMDBweDsgb3ZlcmZsb3cteTogYXV0bzt2aXNpYmlsaXR5OiBoaWRkZW4iIGlk
PSJib3giPgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxk
aXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXYgaWQ9InRleHQiPi0t
LSBDbGlja2luZyBoZXJlIHNob3VsZCBOT1Qgc2Nyb2xsIHRvIHRvcCAtLS08L2Rpdj4KKyAgICA8
ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4K
KyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8
L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2
PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAg
ICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rp
dj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRl
eHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8
ZGl2PnRleHQ8L2Rpdj4KKzwvZGl2PgorPHNjcmlwdD4KK3Rlc3QoKCkgPT4geworYm94LnNjcm9s
bFRvcCA9IDQwOworCitsZXQgZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Citk
aXYudGV4dENvbnRlbnQgPSAiZGl2IjsKK3RleHQucGFyZW50Tm9kZS5pbnNlcnRCZWZvcmUoZGl2
LCB0ZXh0KTsKKworbGV0IHNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Citz
cGFuLnRhYkluZGV4ID0gMDsKK2Rpdi5hcHBlbmQoc3Bhbik7CisKK3NwYW4uc2Nyb2xsSW50b1Zp
ZXdJZk5lZWRlZCgpOworCithc3NlcnRfZXF1YWxzKGJveC5zY3JvbGxUb3AsIDQwLCAnYm94LnNj
cm9sbFRvcCcpOworfSwgYHNjcm9sbEludG9WaWV3IG9uIHplcm8gaGVpZ2h0IGl0ZW1gKTsKKwor
PC9zY3JpcHQ+Cis8L2JvZHk+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>458577</attachid>
            <date>2022-04-29 01:52:27 -0700</date>
            <delta_ts>2022-04-29 08:49:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220429095226.patch</filename>
            <type>text/plain</type>
            <size>6880</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzVlYjMzNmQ3NmFhMjlj
Yjk5YjRlMmFhZmE2YzU3ODRiZmU4YTcxNC4uYjdkYzZlNzc1NGZlNDY4MzUxMmE3ZDhkNzkwMmU3
NGJiNzQzNDc3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTA0LTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lt
b24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgbW9zdGx5IHJldmVydHMgdG8gdGhlIGNvZGUgYXMg
aXQgd2FzIGJlZm9yZSByMjkwNzcwLCBidXQgYWRkcyBjb2RlIHRvCisgICAgICAgIHRyZWF0IG5v
bi1pbnRlcnNlY3Rpb25zIGFzIGhpZGRlbiwgaW5jbHVkaW5nIHplcm8gd2lkdGgvaGVpZ2h0IHJl
Y3RzLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1sCisKKyAgICAg
ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
TGF5ZXI6OmdldFJlY3RUb0V4cG9zZSBjb25zdCk6CisKIDIwMjItMDQtMjkgIFlvdWVubiBGYWJs
ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEhUTUxNZWRpYUVsZW1lbnQgY2FuIGdl
dCBtdWx0aXBsZSBpbnRlcnJ1cHRpb25zIGZvciBpbnZpc2libGUgYXV0b3BsYXkKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGJiNGQzYTRlNDYyYmNjOTc1NjZl
ZmJhNDliOGQxODM5NzhjYTRhM2MuLjMwMzRiODgwZGFhNTBlNjliMWJlNzU1MzUwNTg5MWZkYTIy
NGQ3NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjY1
MSwxMiArMjY1MSwxMyBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpnZXRSZWN0VG9FeHBvc2Uo
Y29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IExheQogICAgICAgICB9CiAgICAg
fQogCi0gICAgLy8gRGV0ZXJtaW5lIHRoZSBhcHByb3ByaWF0ZSBYIGJlaGF2aW9yLgogICAgIFNj
cm9sbEFsaWdubWVudDo6QmVoYXZpb3Igc2Nyb2xsWCA9IGFsaWduWC5nZXRIaWRkZW5CZWhhdmlv
cigpOwotICAgIExheW91dFJlY3QgZXhwb3NlUmVjdFgoZXhwb3NlUmVjdC54KCksIHZpc2libGVS
ZWN0LnkoKSwgZXhwb3NlUmVjdC53aWR0aCgpLCB2aXNpYmxlUmVjdC5oZWlnaHQoKSk7Ci0gICAg
TGF5b3V0UmVjdCBpbnRlcnNlY3RSZWN0ID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBv
c2VSZWN0WCk7Ci0gICAgaWYgKCFpbnRlcnNlY3RSZWN0LmlzRW1wdHkoKSkgewotICAgICAgICBM
YXlvdXRVbml0IGludGVyc2VjdFdpZHRoID0gaW50ZXJzZWN0UmVjdC53aWR0aCgpOworICAgIGJv
b2wgaW50ZXJzZWN0c0luWCA9IGV4cG9zZVJlY3QubWF4WCgpID49IHZpc2libGVSZWN0LngoKSAm
JiBleHBvc2VSZWN0LngoKSA8PSB2aXNpYmxlUmVjdC5tYXhYKCk7CisKKyAgICAvLyBEZXRlcm1p
bmUgdGhlIGFwcHJvcHJpYXRlIFggYmVoYXZpb3IuCisgICAgaWYgKGludGVyc2VjdHNJblgpIHsK
KyAgICAgICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0WChleHBvc2VSZWN0LngoKSwgdmlzaWJsZVJl
Y3QueSgpLCBleHBvc2VSZWN0LndpZHRoKCksIHZpc2libGVSZWN0LmhlaWdodCgpKTsKKyAgICAg
ICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RXaWR0aCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwg
ZXhwb3NlUmVjdFgpLndpZHRoKCk7CiAgICAgICAgIGlmIChpbnRlcnNlY3RXaWR0aCA9PSBleHBv
c2VSZWN0LndpZHRoKCkgfHwgKGFsaWduWC5sZWdhY3lIb3Jpem9udGFsVmlzaWJpbGl0eVRocmVz
aG9sZEVuYWJsZWQoKSAmJiBpbnRlcnNlY3RXaWR0aCA+PSBNSU5fSU5URVJTRUNUX0ZPUl9SRVZF
QUwpKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUs
IHVzZSB0aGUgc3BlY2lmaWVkIHZpc2libGUgYmVoYXZpb3IuCiAgICAgICAgICAgICAvLyBJZiB0
aGUgcmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCBidXQgb3ZlciBhIGNlcnRhaW4gdGhy
ZXNob2xkLApAQCAtMjY4OCwxMiArMjY4OSwxMyBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpn
ZXRSZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IExheQog
ICAgIGVsc2UKICAgICAgICAgeCA9IGV4cG9zZVJlY3QueCgpOwogCi0gICAgLy8gRGV0ZXJtaW5l
IHRoZSBhcHByb3ByaWF0ZSBZIGJlaGF2aW9yLgogICAgIFNjcm9sbEFsaWdubWVudDo6QmVoYXZp
b3Igc2Nyb2xsWSA9IGFsaWduWS5nZXRIaWRkZW5CZWhhdmlvcigpOwotICAgIExheW91dFJlY3Qg
ZXhwb3NlUmVjdFkodmlzaWJsZVJlY3QueCgpLCBleHBvc2VSZWN0LnkoKSwgdmlzaWJsZVJlY3Qu
d2lkdGgoKSwgZXhwb3NlUmVjdC5oZWlnaHQoKSk7Ci0gICAgaW50ZXJzZWN0UmVjdCA9IGludGVy
c2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFkpOwotICAgIGlmICghaW50ZXJzZWN0UmVj
dC5pc0VtcHR5KCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RIZWlnaHQgPSBpbnRl
cnNlY3RSZWN0LmhlaWdodCgpOworICAgIGJvb2wgaW50ZXJzZWN0c0luWSA9IGV4cG9zZVJlY3Qu
bWF4WSgpID49IHZpc2libGVSZWN0LnkoKSAmJiBleHBvc2VSZWN0LnkoKSA8PSB2aXNpYmxlUmVj
dC5tYXhZKCk7CisKKyAgICAvLyBEZXRlcm1pbmUgdGhlIGFwcHJvcHJpYXRlIFkgYmVoYXZpb3Iu
CisgICAgaWYgKGludGVyc2VjdHNJblkpIHsKKyAgICAgICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0
WSh2aXNpYmxlUmVjdC54KCksIGV4cG9zZVJlY3QueSgpLCB2aXNpYmxlUmVjdC53aWR0aCgpLCBl
eHBvc2VSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RIZWlnaHQg
PSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RZKS5oZWlnaHQoKTsKICAgICAg
ICAgaWYgKGludGVyc2VjdEhlaWdodCA9PSBleHBvc2VSZWN0LmhlaWdodCgpKSB7CiAgICAgICAg
ICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUsIHVzZSB0aGUgc3BlY2lm
aWVkIHZpc2libGUgYmVoYXZpb3IuCiAgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFZp
c2libGVCZWhhdmlvcigpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No
YW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYjUxODQ4
OTAzODM5NTBmMDI4ZDg1YTRhMjNhMzJkMzdkMzRhZWE1Mi4uNmY5YWVkOGRlNjc4N2UyMjk0NTU0
NjVmNTExMGZlMWZhOGY4ZTg1OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj
L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0x
LDMgKzEsMTMgQEAKKzIwMjItMDQtMjkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBSRUdSRVNTSU9OKHIyOTA3NzApOiBlbGVtZW50LnNjcm9sbEludG9WaWV3SWZOZWVk
ZWQoKSBzY3JvbGxzIHRvIHRvcCBldmVuIHdoZW4gZWxlbWVudCBpcyBhbHJlYWR5IGluIHZpZXdw
b3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg5
ODUKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiB3ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQt
aXRlbS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3Nzb20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWw6IEFkZGVk
LgorCiAyMDIyLTA0LTI5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAg
ICAgICBNYWtlIHN1cmUgdG8gZmFpbCBpbXBvcnRTY3JpcHRzIGFzIHBlciBodHRwczovL3czYy5n
aXRodWIuaW8vU2VydmljZVdvcmtlci8jaW1wb3J0c2NyaXB0cyBzdGVwIDQKZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZp
ZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9s
bGludG92aWV3LXplcm8taGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBjMzYw
YmQ0ODJlMzgzYmU0ZjZjMjI1MmYxMGRmZDM1YjQ4OTNjNzkKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3
L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs
MyBAQAorCitQQVNTIHNjcm9sbEludG9WaWV3IG9uIHplcm8gaGVpZ2h0IGl0ZW0KKwpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
b20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWwgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGlu
dG92aWV3LXplcm8taGVpZ2h0LWl0ZW0uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wOTczZGFkYjM1ZTAzMDZj
YTE0ZGU3Y2Y1ZGIwZmM0Yjg0MjZiZjcwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3JvbGxpbnRv
dmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWwKQEAgLTAsMCArMSw1MyBAQAorPCFET0NUWVBFIGh0
bWw+Cis8dGl0bGU+Q1NTT00gVmlldyAtIHNjcm9sbEludG9WaWV3IGRvZXMgbm90IHNjcm9sbCB0
byB6ZXJvIGhlaWdodCBpdGVtPC90aXRsZT4KKzxtZXRhIGNoYXJzZXQ9IlVURi04Ij4KKzxsaW5r
IHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLXZpZXcvI2Rv
bS1lbGVtZW50LXNjcm9sbGludG92aWV3Ij4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3Ro
YXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNz
cmVwb3J0LmpzIj48L3NjcmlwdD4KKzxib2R5PgorPGRpdiBzdHlsZT0iYm9yZGVyOiAxcHggc29s
aWQgYmxhY2s7IGhlaWdodDogMzAwcHg7IHdpZHRoOiAyMDBweDsgb3ZlcmZsb3cteTogYXV0bzt2
aXNpYmlsaXR5OiBoaWRkZW4iIGlkPSJib3giPgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxk
aXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2Pgor
ICAgIDxkaXYgaWQ9InRleHQiPi0tLSBDbGlja2luZyBoZXJlIHNob3VsZCBOT1Qgc2Nyb2xsIHRv
IHRvcCAtLS08L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4K
KyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8
L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2
PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAg
ICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rp
dj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRl
eHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8
ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKzwvZGl2PgorPHNjcmlwdD4KK3Rl
c3QoKCkgPT4geworYm94LnNjcm9sbFRvcCA9IDQwOworCitsZXQgZGl2ID0gZG9jdW1lbnQuY3Jl
YXRlRWxlbWVudCgiZGl2Iik7CitkaXYudGV4dENvbnRlbnQgPSAiZGl2IjsKK3RleHQucGFyZW50
Tm9kZS5pbnNlcnRCZWZvcmUoZGl2LCB0ZXh0KTsKKworbGV0IHNwYW4gPSBkb2N1bWVudC5jcmVh
dGVFbGVtZW50KCJzcGFuIik7CitzcGFuLnRhYkluZGV4ID0gMDsKK2Rpdi5hcHBlbmQoc3Bhbik7
CisKK3NwYW4uc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCgpOworCithc3NlcnRfZXF1YWxzKGJveC5z
Y3JvbGxUb3AsIDQwLCAnYm94LnNjcm9sbFRvcCcpOworfSwgYHNjcm9sbEludG9WaWV3IG9uIHpl
cm8gaGVpZ2h0IGl0ZW1gKTsKKworPC9zY3JpcHQ+Cis8L2JvZHk+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>458590</attachid>
            <date>2022-04-29 08:49:20 -0700</date>
            <delta_ts>2022-04-29 10:22:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220429164919.patch</filename>
            <type>text/plain</type>
            <size>6634</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVkNGYxNDYxZDFlOWIy
OWI5MDYwZDhhNmVkMjg2ZmVmMjY4NDQwMi4uNjllMTc4ZDNlZTExNDY4MDk1ZWI2ZjgxOGVhOTMz
M2FjNDhkYjNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTA0LTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lt
b24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgbW9zdGx5IHJldmVydHMgdG8gdGhlIGNvZGUgYXMg
aXQgd2FzIGJlZm9yZSByMjkwNzcwLCBidXQgYWRkcyBjb2RlIHRvCisgICAgICAgIHRyZWF0IG5v
bi1pbnRlcnNlY3Rpb25zIGFzIGhpZGRlbiwgaW5jbHVkaW5nIHplcm8gd2lkdGgvaGVpZ2h0IHJl
Y3RzLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1sCisKKyAgICAg
ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
TGF5ZXI6OmdldFJlY3RUb0V4cG9zZSBjb25zdCk6CisKIDIwMjItMDQtMjkgIFRpbSBOZ3V5ZW4g
IDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYmFja2dyb3VuZC1jbGlwOiB0ZXh0IHRv
IENTU1Byb3BlcnRpZXMuanNvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j
cHAKaW5kZXggYmI0ZDNhNGU0NjJiY2M5NzU2NmVmYmE0OWI4ZDE4Mzk3OGNhNGEzYy4uODhkNmZl
ZWUxNWU0YTNjNDViYTFlNzM1NGY4Zjc4NWJiZGVhNDFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yNjUxLDEyICsyNjUxLDEyIEBAIExheW91dFJlY3Qg
UmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVj
dCwgY29uc3QgTGF5CiAgICAgICAgIH0KICAgICB9CiAKLSAgICAvLyBEZXRlcm1pbmUgdGhlIGFw
cHJvcHJpYXRlIFggYmVoYXZpb3IuCiAgICAgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvciBzY3Jv
bGxYID0gYWxpZ25YLmdldEhpZGRlbkJlaGF2aW9yKCk7Ci0gICAgTGF5b3V0UmVjdCBleHBvc2VS
ZWN0WChleHBvc2VSZWN0LngoKSwgdmlzaWJsZVJlY3QueSgpLCBleHBvc2VSZWN0LndpZHRoKCks
IHZpc2libGVSZWN0LmhlaWdodCgpKTsKLSAgICBMYXlvdXRSZWN0IGludGVyc2VjdFJlY3QgPSBp
bnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RYKTsKLSAgICBpZiAoIWludGVyc2Vj
dFJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0V2lkdGggPSBp
bnRlcnNlY3RSZWN0LndpZHRoKCk7CisgICAgYm9vbCBpbnRlcnNlY3RzSW5YID0gZXhwb3NlUmVj
dC5tYXhYKCkgPj0gdmlzaWJsZVJlY3QueCgpICYmIGV4cG9zZVJlY3QueCgpIDw9IHZpc2libGVS
ZWN0Lm1heFgoKTsKKworICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWCBiZWhhdmlv
ci4KKyAgICBpZiAoaW50ZXJzZWN0c0luWCkgeworICAgICAgICBMYXlvdXRVbml0IGludGVyc2Vj
dFdpZHRoID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBvc2VSZWN0KS53aWR0aCgpOwog
ICAgICAgICBpZiAoaW50ZXJzZWN0V2lkdGggPT0gZXhwb3NlUmVjdC53aWR0aCgpIHx8IChhbGln
blgubGVnYWN5SG9yaXpvbnRhbFZpc2liaWxpdHlUaHJlc2hvbGRFbmFibGVkKCkgJiYgaW50ZXJz
ZWN0V2lkdGggPj0gTUlOX0lOVEVSU0VDVF9GT1JfUkVWRUFMKSkgewogICAgICAgICAgICAgLy8g
SWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCB2aXNp
YmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBwYXJ0aWFs
bHkgdmlzaWJsZSwgYnV0IG92ZXIgYSBjZXJ0YWluIHRocmVzaG9sZCwKQEAgLTI2ODgsMTIgKzI2
ODgsMTIgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlKGNvbnN0IExh
eW91dFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBMYXkKICAgICBlbHNlCiAgICAgICAgIHggPSBl
eHBvc2VSZWN0LngoKTsKIAotICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhh
dmlvci4KICAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFkgPSBhbGlnblkuZ2V0
SGlkZGVuQmVoYXZpb3IoKTsKLSAgICBMYXlvdXRSZWN0IGV4cG9zZVJlY3RZKHZpc2libGVSZWN0
LngoKSwgZXhwb3NlUmVjdC55KCksIHZpc2libGVSZWN0LndpZHRoKCksIGV4cG9zZVJlY3QuaGVp
Z2h0KCkpOwotICAgIGludGVyc2VjdFJlY3QgPSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4
cG9zZVJlY3RZKTsKLSAgICBpZiAoIWludGVyc2VjdFJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAg
IExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0gaW50ZXJzZWN0UmVjdC5oZWlnaHQoKTsKKyAg
ICBib29sIGludGVyc2VjdHNJblkgPSBleHBvc2VSZWN0Lm1heFkoKSA+PSB2aXNpYmxlUmVjdC55
KCkgJiYgZXhwb3NlUmVjdC55KCkgPD0gdmlzaWJsZVJlY3QubWF4WSgpOworCisgICAgLy8gRGV0
ZXJtaW5lIHRoZSBhcHByb3ByaWF0ZSBZIGJlaGF2aW9yLgorICAgIGlmIChpbnRlcnNlY3RzSW5Z
KSB7CisgICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0gaW50ZXJzZWN0aW9uKHZp
c2libGVSZWN0LCBleHBvc2VSZWN0KS5oZWlnaHQoKTsKICAgICAgICAgaWYgKGludGVyc2VjdEhl
aWdodCA9PSBleHBvc2VSZWN0LmhlaWdodCgpKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGUgcmVj
dGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUsIHVzZSB0aGUgc3BlY2lmaWVkIHZpc2libGUgYmVoYXZp
b3IuCiAgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFZpc2libGVCZWhhdmlvcigpOwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl
c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYjUxODQ4OTAzODM5NTBmMDI4ZDg1YTRh
MjNhMzJkMzdkMzRhZWE1Mi4uNmY5YWVkOGRlNjc4N2UyMjk0NTU0NjVmNTExMGZlMWZhOGY4ZTg1
OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjIt
MDQtMjkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O
KHIyOTA3NzApOiBlbGVtZW50LnNjcm9sbEludG9WaWV3SWZOZWVkZWQoKSBzY3JvbGxzIHRvIHRv
cCBldmVuIHdoZW4gZWxlbWVudCBpcyBhbHJlYWR5IGluIHZpZXdwb3J0CisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg5ODUKKworICAgICAgICBSZXZp
ZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQ6
IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3Jv
bGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWw6IEFkZGVkLgorCiAyMDIyLTA0LTI5ICBZ
b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIHN1cmUgdG8g
ZmFpbCBpbXBvcnRTY3JpcHRzIGFzIHBlciBodHRwczovL3czYy5naXRodWIuaW8vU2VydmljZVdv
cmtlci8jaW1wb3J0c2NyaXB0cyBzdGVwIDQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXct
emVyby1oZWlnaHQtaXRlbS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8taGVp
Z2h0LWl0ZW0tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBjMzYwYmQ0ODJlMzgzYmU0ZjZjMjI1
MmYxMGRmZDM1YjQ4OTNjNzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXpl
cm8taGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBAQAorCitQQVNTIHNjcm9s
bEludG9WaWV3IG9uIHplcm8gaGVpZ2h0IGl0ZW0KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3JvbGxpbnRv
dmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0
LWl0ZW0uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wOTczZGFkYjM1ZTAzMDZjYTE0ZGU3Y2Y1ZGIwZmM0Yjg0
MjZiZjcwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1p
dGVtLmh0bWwKQEAgLTAsMCArMSw1MyBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+Q1NTT00g
VmlldyAtIHNjcm9sbEludG9WaWV3IGRvZXMgbm90IHNjcm9sbCB0byB6ZXJvIGhlaWdodCBpdGVt
PC90aXRsZT4KKzxtZXRhIGNoYXJzZXQ9IlVURi04Ij4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0i
aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzc29tLXZpZXcvI2RvbS1lbGVtZW50LXNjcm9sbGlu
dG92aWV3Ij4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3Njcmlw
dD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3Njcmlw
dD4KKzxib2R5PgorPGRpdiBzdHlsZT0iYm9yZGVyOiAxcHggc29saWQgYmxhY2s7IGhlaWdodDog
MzAwcHg7IHdpZHRoOiAyMDBweDsgb3ZlcmZsb3cteTogYXV0bzt2aXNpYmlsaXR5OiBoaWRkZW4i
IGlkPSJib3giPgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAg
IDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXY+dGV4dDwvZGl2PgorICAgIDxkaXYgaWQ9InRleHQi
Pi0tLSBDbGlja2luZyBoZXJlIHNob3VsZCBOT1Qgc2Nyb2xsIHRvIHRvcCAtLS08L2Rpdj4KKyAg
ICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rp
dj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRl
eHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8
ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4K
KyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8
L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2
PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAg
ICA8ZGl2PnRleHQ8L2Rpdj4KKzwvZGl2PgorPHNjcmlwdD4KK3Rlc3QoKCkgPT4geworYm94LnNj
cm9sbFRvcCA9IDQwOworCitsZXQgZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7
CitkaXYudGV4dENvbnRlbnQgPSAiZGl2IjsKK3RleHQucGFyZW50Tm9kZS5pbnNlcnRCZWZvcmUo
ZGl2LCB0ZXh0KTsKKworbGV0IHNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7
CitzcGFuLnRhYkluZGV4ID0gMDsKK2Rpdi5hcHBlbmQoc3Bhbik7CisKK3NwYW4uc2Nyb2xsSW50
b1ZpZXdJZk5lZWRlZCgpOworCithc3NlcnRfZXF1YWxzKGJveC5zY3JvbGxUb3AsIDQwLCAnYm94
LnNjcm9sbFRvcCcpOworfSwgYHNjcm9sbEludG9WaWV3IG9uIHplcm8gaGVpZ2h0IGl0ZW1gKTsK
KworPC9zY3JpcHQ+Cis8L2JvZHk+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>458592</attachid>
            <date>2022-04-29 10:22:48 -0700</date>
            <delta_ts>2022-04-29 23:08:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-238985-20220429182247.patch</filename>
            <type>text/plain</type>
            <size>6773</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzVkNGYxNDYxZDFlOWIy
OWI5MDYwZDhhNmVkMjg2ZmVmMjY4NDQwMi4uNjllMTc4ZDNlZTExNDY4MDk1ZWI2ZjgxOGVhOTMz
M2FjNDhkYjNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTA0LTI5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTog
ZWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVu
IGVsZW1lbnQgaXMgYWxyZWFkeSBpbiB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lt
b24gRnJhc2VyLgorCisgICAgICAgIFRoaXMgbW9zdGx5IHJldmVydHMgdG8gdGhlIGNvZGUgYXMg
aXQgd2FzIGJlZm9yZSByMjkwNzcwLCBidXQgYWRkcyBjb2RlIHRvCisgICAgICAgIHRyZWF0IG5v
bi1pbnRlcnNlY3Rpb25zIGFzIGhpZGRlbiwgaW5jbHVkaW5nIHplcm8gd2lkdGgvaGVpZ2h0IHJl
Y3RzLgorCisgICAgICAgIFRlc3Q6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1sCisKKyAgICAg
ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
TGF5ZXI6OmdldFJlY3RUb0V4cG9zZSBjb25zdCk6CisKIDIwMjItMDQtMjkgIFRpbSBOZ3V5ZW4g
IDxudGltQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYmFja2dyb3VuZC1jbGlwOiB0ZXh0IHRv
IENTU1Byb3BlcnRpZXMuanNvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j
cHAKaW5kZXggYmI0ZDNhNGU0NjJiY2M5NzU2NmVmYmE0OWI4ZDE4Mzk3OGNhNGEzYy4uOWI0MDc4
MjFlYjhhYTlkN2VhM2JjNWRiNzExNWVkODViZmFiNzc5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yNjUxLDEyICsyNjUxLDEyIEBAIExheW91dFJlY3Qg
UmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVj
dCwgY29uc3QgTGF5CiAgICAgICAgIH0KICAgICB9CiAKLSAgICAvLyBEZXRlcm1pbmUgdGhlIGFw
cHJvcHJpYXRlIFggYmVoYXZpb3IuCiAgICAgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvciBzY3Jv
bGxYID0gYWxpZ25YLmdldEhpZGRlbkJlaGF2aW9yKCk7Ci0gICAgTGF5b3V0UmVjdCBleHBvc2VS
ZWN0WChleHBvc2VSZWN0LngoKSwgdmlzaWJsZVJlY3QueSgpLCBleHBvc2VSZWN0LndpZHRoKCks
IHZpc2libGVSZWN0LmhlaWdodCgpKTsKLSAgICBMYXlvdXRSZWN0IGludGVyc2VjdFJlY3QgPSBp
bnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RYKTsKLSAgICBpZiAoIWludGVyc2Vj
dFJlY3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0V2lkdGggPSBp
bnRlcnNlY3RSZWN0LndpZHRoKCk7CisgICAgYm9vbCBpbnRlcnNlY3RzSW5YID0gZXhwb3NlUmVj
dC5tYXhYKCkgPj0gdmlzaWJsZVJlY3QueCgpICYmIGV4cG9zZVJlY3QueCgpIDw9IHZpc2libGVS
ZWN0Lm1heFgoKTsKKworICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWCBiZWhhdmlv
ci4KKyAgICBpZiAoaW50ZXJzZWN0c0luWCkgeworICAgICAgICBMYXlvdXRVbml0IGludGVyc2Vj
dFdpZHRoID0gc3RkOjptYXgoTGF5b3V0VW5pdCgpLCBzdGQ6Om1pbih2aXNpYmxlUmVjdC5tYXhY
KCksIGV4cG9zZVJlY3QubWF4WCgpKSAtIHN0ZDo6bWF4KHZpc2libGVSZWN0LngoKSwgZXhwb3Nl
UmVjdC54KCkpKTsKICAgICAgICAgaWYgKGludGVyc2VjdFdpZHRoID09IGV4cG9zZVJlY3Qud2lk
dGgoKSB8fCAoYWxpZ25YLmxlZ2FjeUhvcml6b250YWxWaXNpYmlsaXR5VGhyZXNob2xkRW5hYmxl
ZCgpICYmIGludGVyc2VjdFdpZHRoID49IE1JTl9JTlRFUlNFQ1RfRk9SX1JFVkVBTCkpIHsKICAg
ICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgZnVsbHkgdmlzaWJsZSwgdXNlIHRoZSBz
cGVjaWZpZWQgdmlzaWJsZSBiZWhhdmlvci4KICAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5n
bGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBvdmVyIGEgY2VydGFpbiB0aHJlc2hvbGQsCkBA
IC0yNjg4LDEyICsyNjg4LDEyIEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4
cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgTGF5CiAgICAgZWxzZQog
ICAgICAgICB4ID0gZXhwb3NlUmVjdC54KCk7CiAKLSAgICAvLyBEZXRlcm1pbmUgdGhlIGFwcHJv
cHJpYXRlIFkgYmVoYXZpb3IuCiAgICAgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvciBzY3JvbGxZ
ID0gYWxpZ25ZLmdldEhpZGRlbkJlaGF2aW9yKCk7Ci0gICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0
WSh2aXNpYmxlUmVjdC54KCksIGV4cG9zZVJlY3QueSgpLCB2aXNpYmxlUmVjdC53aWR0aCgpLCBl
eHBvc2VSZWN0LmhlaWdodCgpKTsKLSAgICBpbnRlcnNlY3RSZWN0ID0gaW50ZXJzZWN0aW9uKHZp
c2libGVSZWN0LCBleHBvc2VSZWN0WSk7Ci0gICAgaWYgKCFpbnRlcnNlY3RSZWN0LmlzRW1wdHko
KSkgewotICAgICAgICBMYXlvdXRVbml0IGludGVyc2VjdEhlaWdodCA9IGludGVyc2VjdFJlY3Qu
aGVpZ2h0KCk7CisgICAgYm9vbCBpbnRlcnNlY3RzSW5ZID0gZXhwb3NlUmVjdC5tYXhZKCkgPj0g
dmlzaWJsZVJlY3QueSgpICYmIGV4cG9zZVJlY3QueSgpIDw9IHZpc2libGVSZWN0Lm1heFkoKTsK
KworICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhhdmlvci4KKyAgICBpZiAo
aW50ZXJzZWN0c0luWSkgeworICAgICAgICBMYXlvdXRVbml0IGludGVyc2VjdEhlaWdodCA9IHN0
ZDo6bWF4KExheW91dFVuaXQoKSwgc3RkOjptaW4odmlzaWJsZVJlY3QubWF4WSgpLCBleHBvc2VS
ZWN0Lm1heFkoKSkgLSBzdGQ6Om1heCh2aXNpYmxlUmVjdC55KCksIGV4cG9zZVJlY3QueSgpKSk7
CiAgICAgICAgIGlmIChpbnRlcnNlY3RIZWlnaHQgPT0gZXhwb3NlUmVjdC5oZWlnaHQoKSkgewog
ICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhl
IHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgogICAgICAgICAgICAgc2Nyb2xsWSA9IGFsaWdu
WS5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4
IGI1MTg0ODkwMzgzOTUwZjAyOGQ4NWE0YTIzYTMyZDM3ZDM0YWVhNTIuLjZmOWFlZDhkZTY3ODdl
MjI5NDU1NDY1ZjUxMTBmZTFmYThmOGU4NTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv
ZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTA0LTI5ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5j
b20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjkwNzcwKTogZWxlbWVudC5zY3JvbGxJbnRvVmll
d0lmTmVlZGVkKCkgc2Nyb2xscyB0byB0b3AgZXZlbiB3aGVuIGVsZW1lbnQgaXMgYWxyZWFkeSBp
biB2aWV3cG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjM4OTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAg
ICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8t
aGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1s
OiBBZGRlZC4KKwogMjAyMi0wNC0yOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+
CiAKICAgICAgICAgTWFrZSBzdXJlIHRvIGZhaWwgaW1wb3J0U2NyaXB0cyBhcyBwZXIgaHR0cHM6
Ly93M2MuZ2l0aHViLmlvL1NlcnZpY2VXb3JrZXIvI2ltcG9ydHNjcmlwdHMgc3RlcCA0CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3NvbS12aWV3L3Njcm9sbGludG92aWV3LXplcm8taGVpZ2h0LWl0ZW0tZXhwZWN0ZWQudHh0IGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmll
dy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt
b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
Li4wYzM2MGJkNDgyZTM4M2JlNGY2YzIyNTJmMTBkZmQzNWI0ODkzYzc5Ci0tLSAvZGV2L251bGwK
KysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
b20tdmlldy9zY3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLWV4cGVjdGVkLnR4dApAQCAt
MCwwICsxLDMgQEAKKworUEFTUyBzY3JvbGxJbnRvVmlldyBvbiB6ZXJvIGhlaWdodCBpdGVtCisK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzc29tLXZpZXcvc2Nyb2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1sIGIvTGF5
b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nzb20tdmlldy9z
Y3JvbGxpbnRvdmlldy16ZXJvLWhlaWdodC1pdGVtLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDk3M2RhZGIz
NWUwMzA2Y2ExNGRlN2NmNWRiMGZjNGI4NDI2YmY3MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzc29tLXZpZXcvc2Ny
b2xsaW50b3ZpZXctemVyby1oZWlnaHQtaXRlbS5odG1sCkBAIC0wLDAgKzEsNTMgQEAKKzwhRE9D
VFlQRSBodG1sPgorPHRpdGxlPkNTU09NIFZpZXcgLSBzY3JvbGxJbnRvVmlldyBkb2VzIG5vdCBz
Y3JvbGwgdG8gemVybyBoZWlnaHQgaXRlbTwvdGl0bGU+Cis8bWV0YSBjaGFyc2V0PSJVVEYtOCI+
Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3NvbS12
aWV3LyNkb20tZWxlbWVudC1zY3JvbGxpbnRvdmlldyI+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNl
cy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0
aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8Ym9keT4KKzxkaXYgc3R5bGU9ImJvcmRlcjog
MXB4IHNvbGlkIGJsYWNrOyBoZWlnaHQ6IDMwMHB4OyB3aWR0aDogMjAwcHg7IG92ZXJmbG93LXk6
IGF1dG87dmlzaWJpbGl0eTogaGlkZGVuIiBpZD0iYm94Ij4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4K
KyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8L2Rpdj4KKyAgICA8ZGl2PnRleHQ8
L2Rpdj4KKyAgICA8ZGl2IGlkPSJ0ZXh0Ij4tLS0gQ2xpY2tpbmcgaGVyZSBzaG91bGQgTk9UIHNj
cm9sbCB0byB0b3AgLS0tPC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0
PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRp
dj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+Cisg
ICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9k
aXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50
ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAg
PGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+
CisgICAgPGRpdj50ZXh0PC9kaXY+CisgICAgPGRpdj50ZXh0PC9kaXY+Cis8L2Rpdj4KKzxzY3Jp
cHQ+Cit0ZXN0KCgpID0+IHsKK2JveC5zY3JvbGxUb3AgPSA0MDsKKworbGV0IGRpdiA9IGRvY3Vt
ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworZGl2LnRleHRDb250ZW50ID0gImRpdiI7Cit0ZXh0
LnBhcmVudE5vZGUuaW5zZXJ0QmVmb3JlKGRpdiwgdGV4dCk7CisKK2xldCBzcGFuID0gZG9jdW1l
bnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOworc3Bhbi50YWJJbmRleCA9IDA7CitkaXYuYXBwZW5k
KHNwYW4pOworCitzcGFuLnNjcm9sbEludG9WaWV3SWZOZWVkZWQoKTsKKworYXNzZXJ0X2VxdWFs
cyhib3guc2Nyb2xsVG9wLCA0MCwgJ2JveC5zY3JvbGxUb3AnKTsKK30sIGBzY3JvbGxJbnRvVmll
dyBvbiB6ZXJvIGhlaWdodCBpdGVtYCk7CisKKzwvc2NyaXB0PgorPC9ib2R5Pgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>