<?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>222854</bug_id>
          
          <creation_ts>2021-03-05 20:36:17 -0800</creation_ts>
          <short_desc>Nullopt crash in RenderFlexibleBox::computeInnerFlexBaseSizeForChild</short_desc>
          <delta_ts>2021-03-15 18:01:51 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Layout and Rendering</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Ryosuke Niwa">rniwa</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>bfulgham</cc>
    
    <cc>cgarcia</cc>
    
    <cc>ews-feeder</cc>
    
    <cc>fred.wang</cc>
    
    <cc>gpoo</cc>
    
    <cc>product-security</cc>
    
    <cc>rbuis</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1736738</commentid>
    <comment_count>0</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-03-05 20:36:17 -0800</bug_when>
    <thetext>e.g.

1   0x1a74a4089 WTFCrash
2   0x18cc53389 WTF::Optional&lt;WebCore::LayoutUnit&gt;::value() &amp;&amp;
3   0x18cd8df11 WebCore::RenderFlexibleBox::computeInnerFlexBaseSizeForChild(WebCore::RenderBox&amp;, WebCore::LayoutUnit)
4   0x18cd8e784 WebCore::RenderFlexibleBox::constructFlexItem(WebCore::RenderBox&amp;, bool)
5   0x18cd8989a WebCore::RenderFlexibleBox::layoutFlexItems(bool)
6   0x18cd893a4 WebCore::RenderFlexibleBox::layoutBlock(bool, WebCore::LayoutUnit)
7   0x18ccae529 WebCore::RenderBlock::layout()
8   0x18cc064cc WebCore::RenderElement::layoutIfNeeded()
9   0x18cd8e711 WebCore::RenderFlexibleBox::constructFlexItem(WebCore::RenderBox&amp;, bool)
10  0x18cd8989a WebCore::RenderFlexibleBox::layoutFlexItems(bool)
11  0x18cd893a4 WebCore::RenderFlexibleBox::layoutBlock(bool, WebCore::LayoutUnit)
12  0x18ccae529 WebCore::RenderBlock::layout()
13  0x18ccc94c2 WebCore::RenderBlockFlow::layoutBlockChild(WebCore::RenderBox&amp;, WebCore::RenderBlockFlow::MarginInfo&amp;, WebCore::LayoutUnit&amp;, WebCore::LayoutUnit&amp;)
14  0x18ccc7e04 WebCore::RenderBlockFlow::layoutBlockChildren(bool, WebCore::LayoutUnit&amp;)
15  0x18ccc6c83 WebCore::RenderBlockFlow::layoutBlock(bool, WebCore::LayoutUnit)
16  0x18ccae529 WebCore::RenderBlock::layout()
17  0x18cf472f3 WebCore::RenderView::layout()
18  0x18c4393c1 WebCore::FrameViewLayoutContext::layout()
19  0x18b6834b6 WebCore::Document::implicitClose()
20  0x18c232a7b WebCore::FrameLoader::checkCallImplicitClose()
21  0x18c2324aa WebCore::FrameLoader::checkCompleted()
22  0x18c230597 WebCore::FrameLoader::finishedParsing()
23  0x18b698026 WebCore::Document::finishedParsing()
24  0x18bdc2228 WebCore::HTMLConstructionSite::finishedParsing()
25  0x18be07f67 WebCore::HTMLTreeBuilder::finished()
26  0x18bdc9858 WebCore::HTMLDocumentParser::end()
27  0x18bdc7528 WebCore::HTMLDocumentParser::attemptToRunDeferredScriptsAndEnd()
28  0x18bdc7267 WebCore::HTMLDocumentParser::prepareToStopParsing()
29  0x18bdc98c2 WebCore::HTMLDocumentParser::attemptToEnd()
30  0x18bdc9989 WebCore::HTMLDocumentParser::finish()
31  0x18c20aaa4 WebCore::DocumentWriter::end()

&lt;rdar://problem/72991927&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736739</commentid>
    <comment_count>1</comment_count>
      <attachid>422471</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-03-05 20:36:49 -0800</bug_when>
    <thetext>Created attachment 422471
Test</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736740</commentid>
    <comment_count>2</comment_count>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2021-03-05 20:37:35 -0800</bug_when>
    <thetext>Reproduced with DumpRenderTree and WebKitTestRunner at r274025.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736761</commentid>
    <comment_count>3</comment_count>
      <attachid>422477</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-06 01:45:03 -0800</bug_when>
    <thetext>Created attachment 422477
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736986</commentid>
    <comment_count>4</comment_count>
      <attachid>422477</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-03-07 23:51:13 -0800</bug_when>
    <thetext>Comment on attachment 422477
Patch

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

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:933
&gt; +        return std::max(0_lu, computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis).valueOr(0_lu));

We&apos;re using value() unconditionally because this is the childMainSizeIsDefinite() branch. Why are we getting a nullopt here?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736988</commentid>
    <comment_count>5</comment_count>
      <attachid>422477</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-08 00:10:33 -0800</bug_when>
    <thetext>Comment on attachment 422477
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:933
&gt;&gt; +        return std::max(0_lu, computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis).valueOr(0_lu));
&gt; 
&gt; We&apos;re using value() unconditionally because this is the childMainSizeIsDefinite() branch. Why are we getting a nullopt here?

Because we are having a !mainAxisIsChildInlineAxis case, we can return a null opt in computeMainAxisExtentForChild:
        if (!height)
            return height;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737008</commentid>
    <comment_count>6</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2021-03-08 02:23:13 -0800</bug_when>
    <thetext>*** Bug 222716 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737988</commentid>
    <comment_count>7</comment_count>
      <attachid>422810</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 02:29:39 -0800</bug_when>
    <thetext>Created attachment 422810
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737990</commentid>
    <comment_count>8</comment_count>
      <attachid>422810</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-03-10 02:33:54 -0800</bug_when>
    <thetext>Comment on attachment 422810
Patch

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

&gt; Source/WebCore/rendering/RenderBox.cpp:3044
&gt; +    if (height.isIntrinsic() || height.isMinIntrinsic())

In this case you can use height.isLegacyIntrinsic()</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738013</commentid>
    <comment_count>9</comment_count>
      <attachid>422815</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 04:13:30 -0800</bug_when>
    <thetext>Created attachment 422815
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738014</commentid>
    <comment_count>10</comment_count>
      <attachid>422816</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 04:15:52 -0800</bug_when>
    <thetext>Created attachment 422816
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738020</commentid>
    <comment_count>11</comment_count>
      <attachid>422818</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 04:32:51 -0800</bug_when>
    <thetext>Created attachment 422818
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738025</commentid>
    <comment_count>12</comment_count>
      <attachid>422810</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 04:59:45 -0800</bug_when>
    <thetext>Comment on attachment 422810
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:3044
&gt;&gt; +    if (height.isIntrinsic() || height.isMinIntrinsic())
&gt; 
&gt; In this case you can use height.isLegacyIntrinsic()

Alas, private :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1738026</commentid>
    <comment_count>13</comment_count>
      <attachid>422819</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-10 05:02:47 -0800</bug_when>
    <thetext>Created attachment 422819
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739354</commentid>
    <comment_count>14</comment_count>
      <attachid>422819</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-03-15 03:48:06 -0700</bug_when>
    <thetext>Comment on attachment 422819
Patch

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

&gt; Source/WebCore/rendering/RenderBox.cpp:3025
&gt; +    if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent() || logicalHeightLength.isMinIntrinsic()) {

Now that you change this maybe we could modify a bit the if block because it&apos;s really confusing. I&apos;m talking about doing something like

if (intrinsicContentHeight &amp;&amp; style().boxSizing() == BoxSizing::BorderBox)
  return intrinsicContentHeight.value() + borderAndPaddingLogicalHeight();
return intrinsicContentHeight;

&gt; LayoutTests/fast/flexbox/indefinite-width-crash.html:2
&gt; +&lt;html&gt;&lt;head&gt;

Nit: both not needed as you&apos;re already using DOCTYPE

&gt; LayoutTests/fast/flexbox/indefinite-width-crash.html:10
&gt; +  };

Can we just use 0 as delay instead of 50?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739366</commentid>
    <comment_count>15</comment_count>
      <attachid>423156</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-15 04:32:54 -0700</bug_when>
    <thetext>Created attachment 423156
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739379</commentid>
    <comment_count>16</comment_count>
      <attachid>422819</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-03-15 05:17:33 -0700</bug_when>
    <thetext>Comment on attachment 422819
Patch

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

&gt;&gt; Source/WebCore/rendering/RenderBox.cpp:3025
&gt;&gt; +    if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent() || logicalHeightLength.isMinIntrinsic()) {
&gt; 
&gt; Now that you change this maybe we could modify a bit the if block because it&apos;s really confusing. I&apos;m talking about doing something like
&gt; 
&gt; if (intrinsicContentHeight &amp;&amp; style().boxSizing() == BoxSizing::BorderBox)
&gt;   return intrinsicContentHeight.value() + borderAndPaddingLogicalHeight();
&gt; return intrinsicContentHeight;

Done.

&gt;&gt; LayoutTests/fast/flexbox/indefinite-width-crash.html:2
&gt;&gt; +&lt;html&gt;&lt;head&gt;
&gt; 
&gt; Nit: both not needed as you&apos;re already using DOCTYPE

Removed.

&gt;&gt; LayoutTests/fast/flexbox/indefinite-width-crash.html:10
&gt;&gt; +  };
&gt; 
&gt; Can we just use 0 as delay instead of 50?

Yes, that works too, fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1739411</commentid>
    <comment_count>17</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-03-15 06:18:29 -0700</bug_when>
    <thetext>Committed r274419: &lt;https://commits.webkit.org/r274419&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 423156.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="0"
              isprivate="0"
          >
            <attachid>422471</attachid>
            <date>2021-03-05 20:36:49 -0800</date>
            <delta_ts>2021-03-05 20:36:49 -0800</delta_ts>
            <desc>Test</desc>
            <filename>72991927.html</filename>
            <type>text/html</type>
            <size>131</size>
            <attacher name="Ryosuke Niwa">rniwa</attacher>
            
              <data encoding="base64">PHN0eWxlPgogICogewogICAgZGlzcGxheTogZmxleDsKICAgIGZsZXgtZGlyZWN0aW9uOiBjb2x1
bW47CiAgICB3aWR0aDogbWluLWludHJpbnNpYzsKICAgIHdyaXRpbmctbW9kZTogdmVydGljYWwt
bHI7CiAgfQo8L3N0eWxlPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422477</attachid>
            <date>2021-03-06 01:45:03 -0800</date>
            <delta_ts>2021-03-10 02:29:34 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210306104502.patch</filename>
            <type>text/plain</type>
            <size>3733</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjczOTgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWFhOGVjNmE3ZmM1ZjJj
ZTc4ZTg0ZWZmY2MzMGU0Y2ZmNDhiMDcyNi4uYzA4NTU3OGQwOTYyMTFlZjZjNGYyZDc2ZmIxNzM4
MGM4NDk4ZmE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTA2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgY29tcHV0ZU1haW5BeGlz
RXh0ZW50Rm9yQ2hpbGQgZm9yIG51bGxvcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRoZSBtZXRob2QgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hp
bGQgY2FuIHJldHVybgorICAgICAgICBudWxsb3B0IGluIGNhc2UgdGhlIGV4dGVudCBpcyBpbmRl
ZmluaXRlLCBmYWxsIGJhY2sKKyAgICAgICAgdG8gemVybyBpbiB0aGF0IGNhc2UuCisKKyAgICAg
ICAgVGVzdDogZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbAorCisgICAg
ICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6
OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlSW5uZXJGbGV4QmFzZVNpemVGb3JDaGlsZCk6CisK
IDIwMjEtMDMtMDUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg
ICAgICAgc3RpY2t5IHBvc2l0aW9uIGluY29ycmVjdCBiZWhhdmlvciBpbiB0YWJsZSB3aXRoIGRp
cj1SVEwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw
CmluZGV4IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLjA3OTNkMTcx
N2YxZTViYzQ4YjkwYTRhNjAwNWU3ZGJkNTkxZGViZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtOTMwLDcgKzkzMCw3IEBAIExheW91
dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxk
KFJlbmRlckJveCYgY2hpbGQsCiB7CiAgICAgTGVuZ3RoIGZsZXhCYXNpcyA9IGZsZXhCYXNpc0Zv
ckNoaWxkKGNoaWxkKTsKICAgICBpZiAoY2hpbGRNYWluU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGZs
ZXhCYXNpcykpCi0gICAgICAgIHJldHVybiBzdGQ6Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNF
eHRlbnRGb3JDaGlsZChjaGlsZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgZmxleEJhc2lzKS52YWx1
ZSgpKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVNYWluQXhpc0V4dGVu
dEZvckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBmbGV4QmFzaXMpLnZhbHVlT3Io
MF9sdSkpOwogCiAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQpIHx8IGNoaWxkQ3Jv
c3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkgewogICAgICAgICBjb25z
dCBMZW5ndGgmIGNyb3NzU2l6ZUxlbmd0aCA9IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5P
clByZWZlcnJlZFNpemUsIGNoaWxkKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhMzU3ZjIxNDk1OTdjYzRkZWNlNTVkZWJk
NjYzOGM2YzYxNDQ0MTJiLi5jZjk1Y2ZhMTExMmJjOTBhNDkwMzE5NDgyZWI1YzgxZTEyODA4NDJj
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMtMDYgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBDaGVjayBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBm
b3IgbnVsbG9wdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjIyODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgQWRkIHRlc3QgZm9yIHRoaXMuCisKKyAgICAgICAgKiBmYXN0L2ZsZXhib3gvaW5kZWZpbml0
ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJv
eC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTA1ICBTaW1v
biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIHN0aWNreSBwb3Np
dGlvbiBpbmNvcnJlY3QgYmVoYXZpb3IgaW4gdGFibGUgd2l0aCBkaXI9UlRMCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1leHBlY3Rl
ZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1l
eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmMwNjYwY2Y3YTE5OWJkYzg4NTY5OTNkZDU3NzZjMmRl
ZGExMzU2ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRl
ZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitUaGlzIHRlc3Qg
c2hvdWxkIG5vdCBjcmFzaC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9p
bmRlZmluaXRlLXdpZHRoLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5k
ZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY3NDBkYjM3ODRlMjczNTgxMmRi
YzE5YmYyYmE1NTg3NDYzMjY4ODkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0
L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMjIgQEAKKzwh
RE9DVFlQRSBodG1sPgorPGh0bWw+PGhlYWQ+Cis8c2NyaXB0PgorICBvbmxvYWQgPSAoKSA9PiB7
CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAgICB0ZXN0UnVubmVyLmR1bXBBc1Rl
eHQoKTsKKyAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKyAgICBzZXRU
aW1lb3V0KGZ1bmN0aW9uKCkgeyBkb2N1bWVudC53cml0ZSgnVGhpcyB0ZXN0IHNob3VsZCBub3Qg
Y3Jhc2guJyk7IHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOyB9LCA1MCk7CisgIH07Cis8L3Njcmlw
dD4KKzxzdHlsZT4KKyogeworICAgIGRpc3BsYXk6IGZsZXg7CisgICAgZmxleC1kaXJlY3Rpb246
IGNvbHVtbjsKKyAgICB3aWR0aDogbWluLWludHJpbnNpYzsKKyAgICB3cml0aW5nLW1vZGU6IHZl
cnRpY2FsLWxyOworfQorPC9zdHlsZT4KKzwvaGVhZD48Ym9keT4KKzxwPlRoaXMgc2hvdWxkbid0
IGNyYXNoLjwvcD4KKzwvYm9keT48L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422810</attachid>
            <date>2021-03-10 02:29:39 -0800</date>
            <delta_ts>2021-03-10 04:13:23 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210310112938.patch</filename>
            <type>text/plain</type>
            <size>4511</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE2MzEyNWRmMTQzNDc3
MTAwNmRlNDcyMmI1MWM3YjZiMjgxMjY5Yi4uYTM2OGI4YzZmOTJmZWVhNjM3YTJlZGM4NTE4ZTUx
ZDA1YWE2NGE2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgY29tcHV0ZU1haW5BeGlz
RXh0ZW50Rm9yQ2hpbGQgZm9yIG51bGxvcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRyZWF0IG1pbi1pbnRyaW5zaWMgbGlrZSAqLWNvbnRlbnQgZm9y
IGludHJpbnNpYyBsb2dpY2FsCisgICAgICAgIGNvbnRlbnQgY2FsY3VsYXRpb25zLgorCisgICAg
ICAgIFRlc3Q6IGZhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLmh0bWwKKworICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
Qm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZyBjb25zdCk6Cisg
ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVDb250ZW50QW5kU2Nyb2xsYmFyTG9n
aWNhbEhlaWdodFVzaW5nIGNvbnN0KToKKwogMjAyMS0wMy0xMCAgVGltIEhvcnRvbiAgPHRpbW90
aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWxlYXNlIGFzc2VydGlvbiBmYWlsdXJl
cyB1bmRlciBFZGl0b3I6OnNjYW5TZWxlY3Rpb25Gb3JUZWxlcGhvbmVOdW1iZXJzCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDVkY2ViYWFiZWQ5NGY3NzE2M2E3ZjRi
M2RiMDVjZjE2MzRhZWVjZjQuLjM4Y2FmZjUxZjE2MjE2NGE0MjAwYWQ4YzNkMTI1NDgyODJmNmM3
NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zMDIyLDcgKzMw
MjIsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNM
b2dpY2FsQ29udGVudEhlaWdodFVzaW5nKExlbmd0aAogewogICAgIC8vIEZJWE1FOiBUaGUgQ1NT
IHNpemluZyBzcGVjIGlzIGNvbnNpZGVyaW5nIGNoYW5naW5nIHdoYXQgbWluLWNvbnRlbnQvbWF4
LWNvbnRlbnQgc2hvdWxkIHJlc29sdmUgdG8uCiAgICAgLy8gSWYgdGhhdCBoYXBwZW5zLCB0aGlz
IGNvZGUgd2lsbCBoYXZlIHRvIGNoYW5nZS4KLSAgICBpZiAobG9naWNhbEhlaWdodExlbmd0aC5p
c01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWF4Q29udGVudCgpIHx8IGxv
Z2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkpIHsKKyAgICBpZiAobG9naWNhbEhlaWdo
dExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWF4Q29udGVu
dCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkgfHwgbG9naWNhbEhlaWdo
dExlbmd0aC5pc01pbkludHJpbnNpYygpKSB7CiAgICAgICAgIGlmICghaW50cmluc2ljQ29udGVu
dEhlaWdodCkKICAgICAgICAgICAgIHJldHVybiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0OwogICAg
ICAgICBpZiAoc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJvcmRlckJveCkKQEAg
LTMwNDEsNyArMzA0MSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0
ZUNvbnRlbnRBbmRTY3JvbGxiYXJMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6CiAgICAgICAgIHJldHVy
biBoZWlnaHRUeXBlID09IE1pblNpemUgPyBPcHRpb25hbDxMYXlvdXRVbml0PigwKSA6IFdURjo6
bnVsbG9wdDsKICAgICAvLyBGSVhNRTogVGhlIENTUyBzaXppbmcgc3BlYyBpcyBjb25zaWRlcmlu
ZyBjaGFuZ2luZyB3aGF0IG1pbi1jb250ZW50L21heC1jb250ZW50IHNob3VsZCByZXNvbHZlIHRv
LgogICAgIC8vIElmIHRoYXQgaGFwcGVucywgdGhpcyBjb2RlIHdpbGwgaGF2ZSB0byBjaGFuZ2Uu
Ci0gICAgaWYgKGhlaWdodC5pc0ludHJpbnNpYygpKQorICAgIGlmIChoZWlnaHQuaXNJbnRyaW5z
aWMoKSB8fCBoZWlnaHQuaXNNaW5JbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVJ
bnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nKGhlaWdodCwgaW50cmluc2ljQ29udGVu
dEhlaWdodCwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSk7CiAgICAgaWYgKGhlaWdo
dC5pc0ZpeGVkKCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGhlaWdodC52YWx1ZSgpKTsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA4NTJlMzMxNTRjMWRlYTRmYzY1YTBhYmYzOWRhNGYyNDU5YmFkYmY2Li4zNmZkZmVh
ODQyZDRiYzM4NTZlZmY1YjM5MjVlZGU4NTEzMDg4YWEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK
KzIwMjEtMDMtMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBDaGVj
ayBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBmb3IgbnVsbG9wdAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODU0CisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIHRoaXMuCisK
KyAgICAgICAgKiBmYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50
eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNo
Lmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTA5ICBWZW5reSBEYXNzICA8eWFyYW5hbWF2ZW5rYXRh
cmFtYW5hQGFwcGxlLmNvbT4KIAogICAgICAgICBOdWxscHRyIGNyYXNoIGluIE5vZGU6OmlzVGV4
dE5vZGUoKSB2aWEgQXBwbHlCbG9ja0VsZW1lbnRDb21tYW5kOjplbmRPZk5leHRQYXJhZ3JhcGhT
cGxpdHRpbmdUZXh0Tm9kZXNJZk5lZWRlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9m
bGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv
ZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl
IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAuLmZjMDY2MGNmN2ExOTliZGM4ODU2OTkzZGQ1Nzc2YzJkZWRhMTM1NmQKLS0tIC9kZXYvbnVs
bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1l
eHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorVGhpcyB0ZXN0IHNob3VsZCBub3QgY3Jhc2guCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFz
aC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gu
aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi42NzQwZGIzNzg0ZTI3MzU4MTJkYmMxOWJmMmJhNTU4NzQ2MzI2ODg5
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUt
d2lkdGgtY3Jhc2guaHRtbApAQCAtMCwwICsxLDIyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s
PjxoZWFkPgorPHNjcmlwdD4KKyAgb25sb2FkID0gKCkgPT4geworICAgIGlmICh3aW5kb3cudGVz
dFJ1bm5lcikgeworICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICB0ZXN0UnVu
bmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9CisgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsg
ZG9jdW1lbnQud3JpdGUoJ1RoaXMgdGVzdCBzaG91bGQgbm90IGNyYXNoLicpOyB0ZXN0UnVubmVy
Lm5vdGlmeURvbmUoKTsgfSwgNTApOworICB9OworPC9zY3JpcHQ+Cis8c3R5bGU+CisqIHsKKyAg
ICBkaXNwbGF5OiBmbGV4OworICAgIGZsZXgtZGlyZWN0aW9uOiBjb2x1bW47CisgICAgd2lkdGg6
IG1pbi1pbnRyaW5zaWM7CisgICAgd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsKK30KKzwvc3R5
bGU+Cis8L2hlYWQ+PGJvZHk+Cis8cD5UaGlzIHNob3VsZG4ndCBjcmFzaC48L3A+Cis8L2JvZHk+
PC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422815</attachid>
            <date>2021-03-10 04:13:30 -0800</date>
            <delta_ts>2021-03-10 04:15:45 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210310131328.patch</filename>
            <type>text/plain</type>
            <size>4985</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgwOTFhMjdmOTc2OTEz
NWM5MWMzNjZlYjJlZmQ0NmMwYzhjYTg2Yy4uMGI4OTQwOTA2ZTNlNTdkODYwNWIwMjk4YTNiNDgz
ZDhkZDM4OGIyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2hlY2sgY29tcHV0ZU1haW5BeGlz
RXh0ZW50Rm9yQ2hpbGQgZm9yIG51bGxvcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v
cmcvc2hvd19idWcuY2dpP2lkPTIyMjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo
T09QUyEpLgorCisgICAgICAgIFRyZWF0IG1pbi1pbnRyaW5zaWMgbGlrZSAqLWNvbnRlbnQgZm9y
IGludHJpbnNpYyBsb2dpY2FsCisgICAgICAgIGNvbnRlbnQgY2FsY3VsYXRpb25zLgorCisgICAg
ICAgIFRlc3Q6IGZhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLmh0bWwKKworICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
Qm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nIGNvbnN0KToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0
VXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlQ29udGVu
dEFuZFNjcm9sbGJhckxvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDMtMTAgIENv
bW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3
ZWQsIHJldmVydGluZyByMjc0MTY2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw
cAppbmRleCA1ZGNlYmFhYmVkOTRmNzcxNjNhN2Y0YjNkYjA1Y2YxNjM0YWVlY2Y0Li4xODE0MTIw
NmYzODA2NzE3MjRjMjQ5NDNlOWI2ZTgzZDBlYTg5Y2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp
bmcvUmVuZGVyQm94LmNwcApAQCAtMjY0Nyw3ICsyNjQ3LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJC
b3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBl
LCBMZW4KICAgICAgICAgcmV0dXJuIGFkanVzdEJvcmRlckJveExvZ2ljYWxXaWR0aEZvckJveFNp
emluZyh2YWx1ZUZvckxlbmd0aChsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCks
IGxvZ2ljYWxXaWR0aC50eXBlKCkpOwogICAgIH0KIAotICAgIGlmIChsb2dpY2FsV2lkdGguaXNJ
bnRyaW5zaWMoKSB8fCBsb2dpY2FsV2lkdGguaXNNaW5JbnRyaW5zaWMoKSkKKyAgICBpZiAobG9n
aWNhbFdpZHRoLmlzTGVnYWN5SW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlSW50
cmluc2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdpZHRoLCBhdmFpbGFibGVMb2dpY2FsV2lk
dGgsIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKSk7CiAKICAgICBMYXlvdXRVbml0IG1h
cmdpblN0YXJ0OwpAQCAtMzAyMiw3ICszMDIyLDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVu
ZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZyhMZW5ndGgK
IHsKICAgICAvLyBGSVhNRTogVGhlIENTUyBzaXppbmcgc3BlYyBpcyBjb25zaWRlcmluZyBjaGFu
Z2luZyB3aGF0IG1pbi1jb250ZW50L21heC1jb250ZW50IHNob3VsZCByZXNvbHZlIHRvLgogICAg
IC8vIElmIHRoYXQgaGFwcGVucywgdGhpcyBjb2RlIHdpbGwgaGF2ZSB0byBjaGFuZ2UuCi0gICAg
aWYgKGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNhbEhlaWdodExl
bmd0aC5pc01heENvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzRml0Q29udGVudCgp
KSB7CisgICAgaWYgKGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNNaW5Db250ZW50KCkgfHwgbG9naWNh
bEhlaWdodExlbmd0aC5pc01heENvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzRml0
Q29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNNaW5JbnRyaW5zaWMoKSkgewogICAg
ICAgICBpZiAoIWludHJpbnNpY0NvbnRlbnRIZWlnaHQpCiAgICAgICAgICAgICByZXR1cm4gaW50
cmluc2ljQ29udGVudEhlaWdodDsKICAgICAgICAgaWYgKHN0eWxlKCkuYm94U2l6aW5nKCkgPT0g
Qm94U2l6aW5nOjpCb3JkZXJCb3gpCkBAIC0zMDQxLDcgKzMwNDEsNyBAQCBPcHRpb25hbDxMYXlv
dXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVDb250ZW50QW5kU2Nyb2xsYmFyTG9naWNhbEhlaWdo
dFVzaW5nKFNpegogICAgICAgICByZXR1cm4gaGVpZ2h0VHlwZSA9PSBNaW5TaXplID8gT3B0aW9u
YWw8TGF5b3V0VW5pdD4oMCkgOiBXVEY6Om51bGxvcHQ7CiAgICAgLy8gRklYTUU6IFRoZSBDU1Mg
c2l6aW5nIHNwZWMgaXMgY29uc2lkZXJpbmcgY2hhbmdpbmcgd2hhdCBtaW4tY29udGVudC9tYXgt
Y29udGVudCBzaG91bGQgcmVzb2x2ZSB0by4KICAgICAvLyBJZiB0aGF0IGhhcHBlbnMsIHRoaXMg
Y29kZSB3aWxsIGhhdmUgdG8gY2hhbmdlLgotICAgIGlmIChoZWlnaHQuaXNJbnRyaW5zaWMoKSkK
KyAgICBpZiAoaGVpZ2h0LmlzaXNMZWdhY3lJbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNv
bXB1dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nKGhlaWdodCwgaW50cmluc2lj
Q29udGVudEhlaWdodCwgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSk7CiAgICAgaWYg
KGhlaWdodC5pc0ZpeGVkKCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGhlaWdodC52YWx1
ZSgpKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No
YW5nZUxvZwppbmRleCA3YmQ3Zjc0YjU5MTFkYTAwYzI0M2YyMWFkNzE3ZDE4Yjg4ODYwYzg3Li4w
ZWM0NjU0ZDA3OWQxNjRhNzJjZmRjYWI1OGZjMTE2ZjdhMmIxMGEzIDEwMDY0NAotLS0gYS9MYXlv
dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs
MTUgQEAKKzIwMjEtMDMtMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAg
ICBDaGVjayBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCBmb3IgbnVsbG9wdAorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODU0CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIHRo
aXMuCisKKyAgICAgICAgKiBmYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1leHBl
Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRo
LWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIxLTAzLTEwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u
QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgZ2V0VXNlck1lZGlhIGRlbmllZCByZXF1ZXN0
cyBpZiB1c2VyIGdyYW50cyBhIG5ldyBnZXRVc2VyTWVkaWEgcmVxdWVzdApkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQu
dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhw
ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZjMDY2MGNmN2ExOTliZGM4ODU2OTkzZGQ1Nzc2YzJkZWRh
MTM1NmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZp
bml0ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorVGhpcyB0ZXN0IHNo
b3VsZCBub3QgY3Jhc2guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5k
ZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVm
aW5pdGUtd2lkdGgtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42NzQwZGIzNzg0ZTI3MzU4MTJkYmMx
OWJmMmJhNTU4NzQ2MzI2ODg5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9m
bGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbApAQCAtMCwwICsxLDIyIEBACis8IURP
Q1RZUEUgaHRtbD4KKzxodG1sPjxoZWFkPgorPHNjcmlwdD4KKyAgb25sb2FkID0gKCkgPT4gewor
ICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0
KCk7CisgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB9CisgICAgc2V0VGlt
ZW91dChmdW5jdGlvbigpIHsgZG9jdW1lbnQud3JpdGUoJ1RoaXMgdGVzdCBzaG91bGQgbm90IGNy
YXNoLicpOyB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsgfSwgNTApOworICB9OworPC9zY3JpcHQ+
Cis8c3R5bGU+CisqIHsKKyAgICBkaXNwbGF5OiBmbGV4OworICAgIGZsZXgtZGlyZWN0aW9uOiBj
b2x1bW47CisgICAgd2lkdGg6IG1pbi1pbnRyaW5zaWM7CisgICAgd3JpdGluZy1tb2RlOiB2ZXJ0
aWNhbC1scjsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+PGJvZHk+Cis8cD5UaGlzIHNob3VsZG4ndCBj
cmFzaC48L3A+Cis8L2JvZHk+PC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422816</attachid>
            <date>2021-03-10 04:15:52 -0800</date>
            <delta_ts>2021-03-10 04:32:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210310131550.patch</filename>
            <type>text/plain</type>
            <size>4959</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgwOTFhMjdmOTc2OTEz
NWM5MWMzNjZlYjJlZmQ0NmMwYzhjYTg2Yy4uNjA2Mzk2Zjc5ZTk4YWNlOWE0ZDU0ZTVlZDcwYjQ5
NDk1ZDQyMDNiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBs
aWtlICotY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBsaWtlICotY29udGVudCBmb3IgaW50cmluc2ljIGxv
Z2ljYWwKKyAgICAgICAgY29udGVudCBjYWxjdWxhdGlvbnMuCisKKyAgICAgICAgVGVzdDogZmFz
dC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbAorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVM
b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZyBjb25zdCk6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVDb250ZW50QW5kU2Nyb2xsYmFy
TG9naWNhbEhlaWdodFVzaW5nIGNvbnN0KToKKwogMjAyMS0wMy0xMCAgQ29tbWl0IFF1ZXVlICA8
Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5n
IHIyNzQxNjYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDVkY2Vi
YWFiZWQ5NGY3NzE2M2E3ZjRiM2RiMDVjZjE2MzRhZWVjZjQuLjE4MTQxMjA2ZjM4MDY3MTcyNGMy
NDk0M2U5YjZlODNkMGVhODljZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwCkBAIC0yNjQ3LDcgKzI2NDcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxv
Z2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbgogICAgICAg
ICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9y
TGVuZ3RoKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKSwgbG9naWNhbFdpZHRo
LnR5cGUoKSk7CiAgICAgfQogCi0gICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8
IGxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQorICAgIGlmIChsb2dpY2FsV2lkdGguaXNM
ZWdhY3lJbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs
V2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgYm9yZGVyQW5k
UGFkZGluZ0xvZ2ljYWxXaWR0aCgpKTsKIAogICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQ7CkBA
IC0zMDIyLDcgKzMwMjIsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1
dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nKExlbmd0aAogewogICAgIC8vIEZJ
WE1FOiBUaGUgQ1NTIHNpemluZyBzcGVjIGlzIGNvbnNpZGVyaW5nIGNoYW5naW5nIHdoYXQgbWlu
LWNvbnRlbnQvbWF4LWNvbnRlbnQgc2hvdWxkIHJlc29sdmUgdG8uCiAgICAgLy8gSWYgdGhhdCBo
YXBwZW5zLCB0aGlzIGNvZGUgd2lsbCBoYXZlIHRvIGNoYW5nZS4KLSAgICBpZiAobG9naWNhbEhl
aWdodExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWF4Q29u
dGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkpIHsKKyAgICBpZiAo
bG9naWNhbEhlaWdodExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3Ro
LmlzTWF4Q29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkgfHwg
bG9naWNhbEhlaWdodExlbmd0aC5pc01pbkludHJpbnNpYygpKSB7CiAgICAgICAgIGlmICghaW50
cmluc2ljQ29udGVudEhlaWdodCkKICAgICAgICAgICAgIHJldHVybiBpbnRyaW5zaWNDb250ZW50
SGVpZ2h0OwogICAgICAgICBpZiAoc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJv
cmRlckJveCkKQEAgLTMwNDEsNyArMzA0MSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRl
ckJveDo6Y29tcHV0ZUNvbnRlbnRBbmRTY3JvbGxiYXJMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6CiAg
ICAgICAgIHJldHVybiBoZWlnaHRUeXBlID09IE1pblNpemUgPyBPcHRpb25hbDxMYXlvdXRVbml0
PigwKSA6IFdURjo6bnVsbG9wdDsKICAgICAvLyBGSVhNRTogVGhlIENTUyBzaXppbmcgc3BlYyBp
cyBjb25zaWRlcmluZyBjaGFuZ2luZyB3aGF0IG1pbi1jb250ZW50L21heC1jb250ZW50IHNob3Vs
ZCByZXNvbHZlIHRvLgogICAgIC8vIElmIHRoYXQgaGFwcGVucywgdGhpcyBjb2RlIHdpbGwgaGF2
ZSB0byBjaGFuZ2UuCi0gICAgaWYgKGhlaWdodC5pc0ludHJpbnNpYygpKQorICAgIGlmIChoZWln
aHQuaXNpc0xlZ2FjeUludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0ZUludHJpbnNp
Y0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcoaGVpZ2h0LCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0
LCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpKTsKICAgICBpZiAoaGVpZ2h0LmlzRml4
ZWQoKSkKICAgICAgICAgcmV0dXJuIExheW91dFVuaXQoaGVpZ2h0LnZhbHVlKCkpOwpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4
IDdiZDdmNzRiNTkxMWRhMDBjMjQzZjIxYWQ3MTdkMThiODg4NjBjODcuLjExNDY1MDM1NGNiYTA0
ZjdiMDQ1ZTA5MzRmNmU0ZjM2OWU3YTEwZGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0w
My0xMCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRyZWF0IG1pbi1p
bnRyaW5zaWMgbGlrZSAqLWNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyMjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0aGlzLgorCisgICAgICAgICogZmFzdC9mbGV4
Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg
KiBmYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAy
MS0wMy0xMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt
b3ZlIGdldFVzZXJNZWRpYSBkZW5pZWQgcmVxdWVzdHMgaWYgdXNlciBncmFudHMgYSBuZXcgZ2V0
VXNlck1lZGlhIHJlcXVlc3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9p
bmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZmxl
eGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw
MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mYzA2
NjBjZjdhMTk5YmRjODg1Njk5M2RkNTc3NmMyZGVkYTEzNTZkCi0tLSAvZGV2L251bGwKKysrIGIv
TGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQu
dHh0CkBAIC0wLDAgKzEgQEAKK1RoaXMgdGVzdCBzaG91bGQgbm90IGNyYXNoLgpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbCBi
L0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLmh0bWwKbmV3
IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMC4uNjc0MGRiMzc4NGUyNzM1ODEyZGJjMTliZjJiYTU1ODc0NjMyNjg4OQotLS0gL2Rl
di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNy
YXNoLmh0bWwKQEAgLTAsMCArMSwyMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD48aGVhZD4K
KzxzY3JpcHQ+CisgIG9ubG9hZCA9ICgpID0+IHsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIp
IHsKKyAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgdGVzdFJ1bm5lci53YWl0
VW50aWxEb25lKCk7CisgICAgfQorICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7IGRvY3VtZW50
LndyaXRlKCdUaGlzIHRlc3Qgc2hvdWxkIG5vdCBjcmFzaC4nKTsgdGVzdFJ1bm5lci5ub3RpZnlE
b25lKCk7IH0sIDUwKTsKKyAgfTsKKzwvc2NyaXB0PgorPHN0eWxlPgorKiB7CisgICAgZGlzcGxh
eTogZmxleDsKKyAgICBmbGV4LWRpcmVjdGlvbjogY29sdW1uOworICAgIHdpZHRoOiBtaW4taW50
cmluc2ljOworICAgIHdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7Cit9Cis8L3N0eWxlPgorPC9o
ZWFkPjxib2R5PgorPHA+VGhpcyBzaG91bGRuJ3QgY3Jhc2guPC9wPgorPC9ib2R5PjwvaHRtbD4K
</data>
<flag name="commit-queue"
          id="441998"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422818</attachid>
            <date>2021-03-10 04:32:51 -0800</date>
            <delta_ts>2021-03-10 05:05:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210310133250.patch</filename>
            <type>text/plain</type>
            <size>4957</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgwOTFhMjdmOTc2OTEz
NWM5MWMzNjZlYjJlZmQ0NmMwYzhjYTg2Yy4uNjA2Mzk2Zjc5ZTk4YWNlOWE0ZDU0ZTVlZDcwYjQ5
NDk1ZDQyMDNiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBs
aWtlICotY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBsaWtlICotY29udGVudCBmb3IgaW50cmluc2ljIGxv
Z2ljYWwKKyAgICAgICAgY29udGVudCBjYWxjdWxhdGlvbnMuCisKKyAgICAgICAgVGVzdDogZmFz
dC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbAorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVM
b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyQm94Ojpjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZyBjb25zdCk6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVDb250ZW50QW5kU2Nyb2xsYmFy
TG9naWNhbEhlaWdodFVzaW5nIGNvbnN0KToKKwogMjAyMS0wMy0xMCAgQ29tbWl0IFF1ZXVlICA8
Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5n
IHIyNzQxNjYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDVkY2Vi
YWFiZWQ5NGY3NzE2M2E3ZjRiM2RiMDVjZjE2MzRhZWVjZjQuLmU5ZWUzMmQ5MWQyNmFkOTBjOTJl
MjViNDM0NDFlMzM2M2U0MjFmNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwCkBAIC0yNjQ3LDcgKzI2NDcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxv
Z2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbgogICAgICAg
ICByZXR1cm4gYWRqdXN0Qm9yZGVyQm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHZhbHVlRm9y
TGVuZ3RoKGxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlTG9naWNhbFdpZHRoKSwgbG9naWNhbFdpZHRo
LnR5cGUoKSk7CiAgICAgfQogCi0gICAgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpIHx8
IGxvZ2ljYWxXaWR0aC5pc01pbkludHJpbnNpYygpKQorICAgIGlmIChsb2dpY2FsV2lkdGguaXNM
ZWdhY3lJbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs
V2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgYm9yZGVyQW5k
UGFkZGluZ0xvZ2ljYWxXaWR0aCgpKTsKIAogICAgIExheW91dFVuaXQgbWFyZ2luU3RhcnQ7CkBA
IC0zMDIyLDcgKzMwMjIsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1
dGVJbnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nKExlbmd0aAogewogICAgIC8vIEZJ
WE1FOiBUaGUgQ1NTIHNpemluZyBzcGVjIGlzIGNvbnNpZGVyaW5nIGNoYW5naW5nIHdoYXQgbWlu
LWNvbnRlbnQvbWF4LWNvbnRlbnQgc2hvdWxkIHJlc29sdmUgdG8uCiAgICAgLy8gSWYgdGhhdCBo
YXBwZW5zLCB0aGlzIGNvZGUgd2lsbCBoYXZlIHRvIGNoYW5nZS4KLSAgICBpZiAobG9naWNhbEhl
aWdodExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWF4Q29u
dGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkpIHsKKyAgICBpZiAo
bG9naWNhbEhlaWdodExlbmd0aC5pc01pbkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3Ro
LmlzTWF4Q29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkgfHwg
bG9naWNhbEhlaWdodExlbmd0aC5pc01pbkludHJpbnNpYygpKSB7CiAgICAgICAgIGlmICghaW50
cmluc2ljQ29udGVudEhlaWdodCkKICAgICAgICAgICAgIHJldHVybiBpbnRyaW5zaWNDb250ZW50
SGVpZ2h0OwogICAgICAgICBpZiAoc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBCb3hTaXppbmc6OkJv
cmRlckJveCkKQEAgLTMwNDEsNyArMzA0MSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRl
ckJveDo6Y29tcHV0ZUNvbnRlbnRBbmRTY3JvbGxiYXJMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6CiAg
ICAgICAgIHJldHVybiBoZWlnaHRUeXBlID09IE1pblNpemUgPyBPcHRpb25hbDxMYXlvdXRVbml0
PigwKSA6IFdURjo6bnVsbG9wdDsKICAgICAvLyBGSVhNRTogVGhlIENTUyBzaXppbmcgc3BlYyBp
cyBjb25zaWRlcmluZyBjaGFuZ2luZyB3aGF0IG1pbi1jb250ZW50L21heC1jb250ZW50IHNob3Vs
ZCByZXNvbHZlIHRvLgogICAgIC8vIElmIHRoYXQgaGFwcGVucywgdGhpcyBjb2RlIHdpbGwgaGF2
ZSB0byBjaGFuZ2UuCi0gICAgaWYgKGhlaWdodC5pc0ludHJpbnNpYygpKQorICAgIGlmIChoZWln
aHQuaXNMZWdhY3lJbnRyaW5zaWMoKSkKICAgICAgICAgcmV0dXJuIGNvbXB1dGVJbnRyaW5zaWNM
b2dpY2FsQ29udGVudEhlaWdodFVzaW5nKGhlaWdodCwgaW50cmluc2ljQ29udGVudEhlaWdodCwg
Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSk7CiAgICAgaWYgKGhlaWdodC5pc0ZpeGVk
KCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0KGhlaWdodC52YWx1ZSgpKTsKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3
YmQ3Zjc0YjU5MTFkYTAwYzI0M2YyMWFkNzE3ZDE4Yjg4ODYwYzg3Li4xMTQ2NTAzNTRjYmEwNGY3
YjA0NWUwOTM0ZjZlNGYzNjllN2ExMGRhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDMt
MTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBUcmVhdCBtaW4taW50
cmluc2ljIGxpa2UgKi1jb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjI4NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBBZGQgdGVzdCBmb3IgdGhpcy4KKworICAgICAgICAqIGZhc3QvZmxleGJv
eC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog
ZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjEt
MDMtMTAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92
ZSBnZXRVc2VyTWVkaWEgZGVuaWVkIHJlcXVlc3RzIGlmIHVzZXIgZ3JhbnRzIGEgbmV3IGdldFVz
ZXJNZWRpYSByZXF1ZXN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5k
ZWZpbml0ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhi
b3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2
NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmMwNjYw
Y2Y3YTE5OWJkYzg4NTY5OTNkZDU3NzZjMmRlZGExMzU2ZAotLS0gL2Rldi9udWxsCisrKyBiL0xh
eW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4
dApAQCAtMCwwICsxIEBACitUaGlzIHRlc3Qgc2hvdWxkIG5vdCBjcmFzaC4KZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLmh0bWwgYi9M
YXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sCm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLjY3NDBkYjM3ODRlMjczNTgxMmRiYzE5YmYyYmE1NTg3NDYzMjY4ODkKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFz
aC5odG1sCkBAIC0wLDAgKzEsMjIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+PGhlYWQ+Cis8
c2NyaXB0PgorICBvbmxvYWQgPSAoKSA9PiB7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7
CisgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgIHRlc3RSdW5uZXIud2FpdFVu
dGlsRG9uZSgpOworICAgIH0KKyAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBkb2N1bWVudC53
cml0ZSgnVGhpcyB0ZXN0IHNob3VsZCBub3QgY3Jhc2guJyk7IHRlc3RSdW5uZXIubm90aWZ5RG9u
ZSgpOyB9LCA1MCk7CisgIH07Cis8L3NjcmlwdD4KKzxzdHlsZT4KKyogeworICAgIGRpc3BsYXk6
IGZsZXg7CisgICAgZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKKyAgICB3aWR0aDogbWluLWludHJp
bnNpYzsKKyAgICB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOworfQorPC9zdHlsZT4KKzwvaGVh
ZD48Ym9keT4KKzxwPlRoaXMgc2hvdWxkbid0IGNyYXNoLjwvcD4KKzwvYm9keT48L2h0bWw+Cg==
</data>
<flag name="commit-queue"
          id="442002"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422819</attachid>
            <date>2021-03-10 05:02:47 -0800</date>
            <delta_ts>2021-03-15 04:32:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210310140245.patch</filename>
            <type>text/plain</type>
            <size>4398</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTgwOTFhMjdmOTc2OTEz
NWM5MWMzNjZlYjJlZmQ0NmMwYzhjYTg2Yy4uYzIxZGU3ZjA5NTA3YzU2ZGIwOTU3MTRhMTVlZTUy
M2ZlMzY2NjBkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBs
aWtlICotY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBsaWtlICotY29udGVudCBmb3IgaW50cmluc2ljIGxv
Z2ljYWwKKyAgICAgICAgY29udGVudCBjYWxjdWxhdGlvbnMuCisKKyAgICAgICAgVGVzdDogZmFz
dC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbAorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVJ
bnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNv
cmU6OlJlbmRlckJveDo6Y29tcHV0ZUNvbnRlbnRBbmRTY3JvbGxiYXJMb2dpY2FsSGVpZ2h0VXNp
bmcgY29uc3QpOgorCiAyMDIxLTAzLTEwICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Vi
a2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NDE2Ni4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNWRjZWJhYWJlZDk0Zjc3MTYzYTdm
NGIzZGIwNWNmMTYzNGFlZWNmNC4uMzhjYWZmNTFmMTYyMTY0YTQyMDBhZDhjM2QxMjU0ODI4MmY2
Yzc0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTMwMjIsNyAr
MzAyMiw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckJveDo6Y29tcHV0ZUludHJpbnNp
Y0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcoTGVuZ3RoCiB7CiAgICAgLy8gRklYTUU6IFRoZSBD
U1Mgc2l6aW5nIHNwZWMgaXMgY29uc2lkZXJpbmcgY2hhbmdpbmcgd2hhdCBtaW4tY29udGVudC9t
YXgtY29udGVudCBzaG91bGQgcmVzb2x2ZSB0by4KICAgICAvLyBJZiB0aGF0IGhhcHBlbnMsIHRo
aXMgY29kZSB3aWxsIGhhdmUgdG8gY2hhbmdlLgotICAgIGlmIChsb2dpY2FsSGVpZ2h0TGVuZ3Ro
LmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNNYXhDb250ZW50KCkgfHwg
bG9naWNhbEhlaWdodExlbmd0aC5pc0ZpdENvbnRlbnQoKSkgeworICAgIGlmIChsb2dpY2FsSGVp
Z2h0TGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNNYXhDb250
ZW50KCkgfHwgbG9naWNhbEhlaWdodExlbmd0aC5pc0ZpdENvbnRlbnQoKSB8fCBsb2dpY2FsSGVp
Z2h0TGVuZ3RoLmlzTWluSW50cmluc2ljKCkpIHsKICAgICAgICAgaWYgKCFpbnRyaW5zaWNDb250
ZW50SGVpZ2h0KQogICAgICAgICAgICAgcmV0dXJuIGludHJpbnNpY0NvbnRlbnRIZWlnaHQ7CiAg
ICAgICAgIGlmIChzdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94KQpA
QCAtMzA0MSw3ICszMDQxLDcgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyQm94Ojpjb21w
dXRlQ29udGVudEFuZFNjcm9sbGJhckxvZ2ljYWxIZWlnaHRVc2luZyhTaXoKICAgICAgICAgcmV0
dXJuIGhlaWdodFR5cGUgPT0gTWluU2l6ZSA/IE9wdGlvbmFsPExheW91dFVuaXQ+KDApIDogV1RG
OjpudWxsb3B0OwogICAgIC8vIEZJWE1FOiBUaGUgQ1NTIHNpemluZyBzcGVjIGlzIGNvbnNpZGVy
aW5nIGNoYW5naW5nIHdoYXQgbWluLWNvbnRlbnQvbWF4LWNvbnRlbnQgc2hvdWxkIHJlc29sdmUg
dG8uCiAgICAgLy8gSWYgdGhhdCBoYXBwZW5zLCB0aGlzIGNvZGUgd2lsbCBoYXZlIHRvIGNoYW5n
ZS4KLSAgICBpZiAoaGVpZ2h0LmlzSW50cmluc2ljKCkpCisgICAgaWYgKGhlaWdodC5pc0ludHJp
bnNpYygpIHx8IGhlaWdodC5pc01pbkludHJpbnNpYygpKQogICAgICAgICByZXR1cm4gY29tcHV0
ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcoaGVpZ2h0LCBpbnRyaW5zaWNDb250
ZW50SGVpZ2h0LCBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpKTsKICAgICBpZiAoaGVp
Z2h0LmlzRml4ZWQoKSkKICAgICAgICAgcmV0dXJuIExheW91dFVuaXQoaGVpZ2h0LnZhbHVlKCkp
OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCmluZGV4IDdiZDdmNzRiNTkxMWRhMDBjMjQzZjIxYWQ3MTdkMThiODg4NjBjODcuLjExNDY1
MDM1NGNiYTA0ZjdiMDQ1ZTA5MzRmNmU0ZjM2OWU3YTEwZGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA
QAorMjAyMS0wMy0xMCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRy
ZWF0IG1pbi1pbnRyaW5zaWMgbGlrZSAqLWNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjg1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB0aGlzLgorCisgICAgICAgICog
ZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4K
KyAgICAgICAgKiBmYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sOiBBZGRl
ZC4KKwogMjAyMS0wMy0xMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAg
ICAgICAgUmVtb3ZlIGdldFVzZXJNZWRpYSBkZW5pZWQgcmVxdWVzdHMgaWYgdXNlciBncmFudHMg
YSBuZXcgZ2V0VXNlck1lZGlhIHJlcXVlc3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv
ZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmls
ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwLi5mYzA2NjBjZjdhMTk5YmRjODg1Njk5M2RkNTc3NmMyZGVkYTEzNTZkCi0tLSAvZGV2L251
bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2gt
ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1RoaXMgdGVzdCBzaG91bGQgbm90IGNyYXNoLgpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jh
c2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdpZHRoLWNyYXNo
Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMC4uNjc0MGRiMzc4NGUyNzM1ODEyZGJjMTliZjJiYTU1ODc0NjMyNjg4
OQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRl
LXdpZHRoLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt
bD48aGVhZD4KKzxzY3JpcHQ+CisgIG9ubG9hZCA9ICgpID0+IHsKKyAgICBpZiAod2luZG93LnRl
c3RSdW5uZXIpIHsKKyAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgdGVzdFJ1
bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgfQorICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7
IGRvY3VtZW50LndyaXRlKCdUaGlzIHRlc3Qgc2hvdWxkIG5vdCBjcmFzaC4nKTsgdGVzdFJ1bm5l
ci5ub3RpZnlEb25lKCk7IH0sIDUwKTsKKyAgfTsKKzwvc2NyaXB0PgorPHN0eWxlPgorKiB7Cisg
ICAgZGlzcGxheTogZmxleDsKKyAgICBmbGV4LWRpcmVjdGlvbjogY29sdW1uOworICAgIHdpZHRo
OiBtaW4taW50cmluc2ljOworICAgIHdyaXRpbmctbW9kZTogdmVydGljYWwtbHI7Cit9Cis8L3N0
eWxlPgorPC9oZWFkPjxib2R5PgorPHA+VGhpcyBzaG91bGRuJ3QgY3Jhc2guPC9wPgorPC9ib2R5
PjwvaHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>423156</attachid>
            <date>2021-03-15 04:32:54 -0700</date>
            <delta_ts>2021-03-15 06:18:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222854-20210315123253.patch</filename>
            <type>text/plain</type>
            <size>4607</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NDEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU2MmZiMzlhM2VlYTc0
MDQ4NDEwZmEwMGFmYTM4OThlMDI1Mjg3MC4uOWQ3ZGUxM2Y4YjkzNzBkNTg4Mjc5MGQ5NTIyMTc0
MThiM2I0YzcwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTE1ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgbWluLWludHJpbnNpYyBs
aWtlICotY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIyODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5pbi4K
KworICAgICAgICBUcmVhdCBtaW4taW50cmluc2ljIGxpa2UgKi1jb250ZW50IGZvciBpbnRyaW5z
aWMgbG9naWNhbAorICAgICAgICBjb250ZW50IGNhbGN1bGF0aW9ucy4KKworICAgICAgICBUZXN0
OiBmYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sCisKKyAgICAgICAgKiBy
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t
cHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcgY29uc3QpOgorICAgICAgICAo
V2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlQ29udGVudEFuZFNjcm9sbGJhckxvZ2ljYWxIZWln
aHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDMtMTUgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVu
QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzAxODUpIFtHVEtdIFNvbWUgd2Vi
Z2wgZmFpbHVyZXMgYWZ0ZXIgbXVsdGl2YWx1ZSBzZXR0ZXIgcmVmYWN0b3IKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggMmQxNTYxMDc5OTI1MGVlNWZhMTIyMTFhMzcw
OWJjZDZhNTIzOTgyNS4uZWRmOGQ1MzgyNGYxZjkyNDFmMzRlMGM4ODQxMWYxYmM1NjI0MmFmNSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTMwMjIsMTAgKzMwMjIs
OCBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dp
Y2FsQ29udGVudEhlaWdodFVzaW5nKExlbmd0aAogewogICAgIC8vIEZJWE1FOiBUaGUgQ1NTIHNp
emluZyBzcGVjIGlzIGNvbnNpZGVyaW5nIGNoYW5naW5nIHdoYXQgbWluLWNvbnRlbnQvbWF4LWNv
bnRlbnQgc2hvdWxkIHJlc29sdmUgdG8uCiAgICAgLy8gSWYgdGhhdCBoYXBwZW5zLCB0aGlzIGNv
ZGUgd2lsbCBoYXZlIHRvIGNoYW5nZS4KLSAgICBpZiAobG9naWNhbEhlaWdodExlbmd0aC5pc01p
bkNvbnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWF4Q29udGVudCgpIHx8IGxvZ2lj
YWxIZWlnaHRMZW5ndGguaXNGaXRDb250ZW50KCkpIHsKLSAgICAgICAgaWYgKCFpbnRyaW5zaWND
b250ZW50SGVpZ2h0KQotICAgICAgICAgICAgcmV0dXJuIGludHJpbnNpY0NvbnRlbnRIZWlnaHQ7
Ci0gICAgICAgIGlmIChzdHlsZSgpLmJveFNpemluZygpID09IEJveFNpemluZzo6Qm9yZGVyQm94
KQorICAgIGlmIChsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWluQ29udGVudCgpIHx8IGxvZ2ljYWxI
ZWlnaHRMZW5ndGguaXNNYXhDb250ZW50KCkgfHwgbG9naWNhbEhlaWdodExlbmd0aC5pc0ZpdENv
bnRlbnQoKSB8fCBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzTWluSW50cmluc2ljKCkpIHsKKyAgICAg
ICAgaWYgKGludHJpbnNpY0NvbnRlbnRIZWlnaHQgJiYgc3R5bGUoKS5ib3hTaXppbmcoKSA9PSBC
b3hTaXppbmc6OkJvcmRlckJveCkKICAgICAgICAgICAgIHJldHVybiBpbnRyaW5zaWNDb250ZW50
SGVpZ2h0LnZhbHVlKCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogICAgICAg
ICByZXR1cm4gaW50cmluc2ljQ29udGVudEhlaWdodDsKICAgICB9CkBAIC0zMDQxLDcgKzMwMzks
NyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1dGVDb250ZW50QW5kU2Ny
b2xsYmFyTG9naWNhbEhlaWdodFVzaW5nKFNpegogICAgICAgICByZXR1cm4gaGVpZ2h0VHlwZSA9
PSBNaW5TaXplID8gT3B0aW9uYWw8TGF5b3V0VW5pdD4oMCkgOiBXVEY6Om51bGxvcHQ7CiAgICAg
Ly8gRklYTUU6IFRoZSBDU1Mgc2l6aW5nIHNwZWMgaXMgY29uc2lkZXJpbmcgY2hhbmdpbmcgd2hh
dCBtaW4tY29udGVudC9tYXgtY29udGVudCBzaG91bGQgcmVzb2x2ZSB0by4KICAgICAvLyBJZiB0
aGF0IGhhcHBlbnMsIHRoaXMgY29kZSB3aWxsIGhhdmUgdG8gY2hhbmdlLgotICAgIGlmIChoZWln
aHQuaXNJbnRyaW5zaWMoKSkKKyAgICBpZiAoaGVpZ2h0LmlzSW50cmluc2ljKCkgfHwgaGVpZ2h0
LmlzTWluSW50cmluc2ljKCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlSW50cmluc2ljTG9naWNh
bENvbnRlbnRIZWlnaHRVc2luZyhoZWlnaHQsIGludHJpbnNpY0NvbnRlbnRIZWlnaHQsIGJvcmRl
ckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkpOwogICAgIGlmIChoZWlnaHQuaXNGaXhlZCgpKQog
ICAgICAgICByZXR1cm4gTGF5b3V0VW5pdChoZWlnaHQudmFsdWUoKSk7CmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2Y4YTll
MGY2ZDZhYzZjOGU4YzAwNTUxZGJkNjNiYmMwNTkwN2MwMi4uZWM3NWFkMDQyYmJjNDMyN2Q3ZjUz
NmQ2MDY5OTA3ZDZhYmI1N2RhNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr
KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAzLTE1ICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgbWluLWludHJpbnNp
YyBsaWtlICotY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjIyODU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5p
bi4KKworICAgICAgICBBZGQgdGVzdCBmb3IgdGhpcy4KKworICAgICAgICAqIGZhc3QvZmxleGJv
eC9pbmRlZmluaXRlLXdpZHRoLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog
ZmFzdC9mbGV4Ym94L2luZGVmaW5pdGUtd2lkdGgtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMjEt
MDMtMTQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBQcmV2
ZW50IGR5bmFtaWMgaW1wb3J0IGluIHNlcnZpY2Ugd29ya2VyCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50eHQgYi9M
YXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13aWR0aC1jcmFzaC1leHBlY3RlZC50
eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMC4uZmMwNjYwY2Y3YTE5OWJkYzg4NTY5OTNkZDU3NzZjMmRlZGExMzU2ZAot
LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRlLXdp
ZHRoLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitUaGlzIHRlc3Qgc2hvdWxkIG5v
dCBjcmFzaC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbmRlZmluaXRl
LXdpZHRoLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gvaW5kZWZpbml0ZS13
aWR0aC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE2ZmU0MmFmY2Q4Mjk5ZGY4YzBjOTRjNjQzYTEz
NDg5ZTlmZGJlNzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZsZXhib3gv
aW5kZWZpbml0ZS13aWR0aC1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMjEgQEAKKzwhRE9DVFlQRSBo
dG1sPgorPHNjcmlwdD4KKyAgb25sb2FkID0gKCkgPT4geworICAgIGlmICh3aW5kb3cudGVzdFJ1
bm5lcikgeworICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICB0ZXN0UnVubmVy
LndhaXRVbnRpbERvbmUoKTsKKyAgICB9CisgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsgZG9j
dW1lbnQud3JpdGUoJ1RoaXMgdGVzdCBzaG91bGQgbm90IGNyYXNoLicpOyB0ZXN0UnVubmVyLm5v
dGlmeURvbmUoKTsgfSwgMCk7CisgIH07Cis8L3NjcmlwdD4KKzxzdHlsZT4KKyogeworICAgIGRp
c3BsYXk6IGZsZXg7CisgICAgZmxleC1kaXJlY3Rpb246IGNvbHVtbjsKKyAgICB3aWR0aDogbWlu
LWludHJpbnNpYzsKKyAgICB3cml0aW5nLW1vZGU6IHZlcnRpY2FsLWxyOworfQorPC9zdHlsZT4K
Kzxib2R5PgorPHA+VGhpcyBzaG91bGRuJ3QgY3Jhc2guPC9wPgorPC9ib2R5Pgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>