<?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>224538</bug_id>
          
          <creation_ts>2021-04-14 03:47:03 -0700</creation_ts>
          <short_desc>[css-grid] last-baseline shouldn&apos;t affect baseline alignment</short_desc>
          <delta_ts>2021-04-21 06:34:22 -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>CSS</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>zsun</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>changseok</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jfernandez</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>rego</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1750066</commentid>
    <comment_count>0</comment_count>
    <who name="">zsun</who>
    <bug_when>2021-04-14 03:47:03 -0700</bug_when>
    <thetext>Spec link:
https://github.com/w3c/csswg-drafts/issues/5293

A couple of subtests have failed in css/css-grid/alignment/grid-baseline-004.html after an update from 
https://github.com/web-platform-tests/wpt/commit/e3698c7bb3c309df69134e9bc0a375f00535e226</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750263</commentid>
    <comment_count>1</comment_count>
      <attachid>426028</attachid>
    <who name="">zsun</who>
    <bug_when>2021-04-14 11:55:05 -0700</bug_when>
    <thetext>Created attachment 426028
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750971</commentid>
    <comment_count>2</comment_count>
      <attachid>426028</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-04-16 00:52:32 -0700</bug_when>
    <thetext>Comment on attachment 426028
Patch

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

&gt; Source/WebCore/rendering/RenderGrid.cpp:1246
&gt; +    return isBaselinePosition(align) &amp;&amp; align != ItemPosition::LastBaseline &amp;&amp; !hasAutoMargins;

I don&apos;t think this is correct. The purpose of this function was to determine whether a grid item has or not a value for the CSS Box Alignment properties that may imply it participates in baseline alignment (this would depend on other factors too). Hence, last-baseline is a valid value for this purpose.

If I&apos;ve understood the CSS WG resolution, what we want is to prevent last-baseline to affect how we compute the grid container&apos;s baseline, which the algorithm described in the spec states that we should consider grid items participating in baseline alignment &quot;along the first row&quot;. That indeed implies excluding items with last-baseline value, but only for this specific purpose. 

I&apos;d rather add the logic to exclude the last-baseline value as part of the algorithm implemented in  RenderGrid::firstLineBaseline.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751001</commentid>
    <comment_count>3</comment_count>
      <attachid>426201</attachid>
    <who name="">zsun</who>
    <bug_when>2021-04-16 02:57:52 -0700</bug_when>
    <thetext>Created attachment 426201
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751002</commentid>
    <comment_count>4</comment_count>
    <who name="">zsun</who>
    <bug_when>2021-04-16 02:58:23 -0700</bug_when>
    <thetext>(In reply to Javier Fernandez from comment #2)
&gt; Comment on attachment 426028 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=426028&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/rendering/RenderGrid.cpp:1246
&gt; &gt; +    return isBaselinePosition(align) &amp;&amp; align != ItemPosition::LastBaseline &amp;&amp; !hasAutoMargins;
&gt; 
&gt; I don&apos;t think this is correct. The purpose of this function was to determine
&gt; whether a grid item has or not a value for the CSS Box Alignment properties
&gt; that may imply it participates in baseline alignment (this would depend on
&gt; other factors too). Hence, last-baseline is a valid value for this purpose.
&gt; 
&gt; If I&apos;ve understood the CSS WG resolution, what we want is to prevent
&gt; last-baseline to affect how we compute the grid container&apos;s baseline, which
&gt; the algorithm described in the spec states that we should consider grid
&gt; items participating in baseline alignment &quot;along the first row&quot;. That indeed
&gt; implies excluding items with last-baseline value, but only for this specific
&gt; purpose. 
&gt; 
&gt; I&apos;d rather add the logic to exclude the last-baseline value as part of the
&gt; algorithm implemented in  RenderGrid::firstLineBaseline.

Code updated. Thank you!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751546</commentid>
    <comment_count>5</comment_count>
      <attachid>426201</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-04-17 20:59:15 -0700</bug_when>
    <thetext>Comment on attachment 426201
Patch

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

&gt; Source/WebCore/rendering/RenderGrid.cpp:1272
&gt; +            if (isBaselineAlignmentForChild(*child) &amp;&amp; !(alignSelfForChild(*child).position() == ItemPosition::LastBaseline || justifySelfForChild(*child).position() == ItemPosition::LastBaseline)) {

Is this the most elegant way to write it? I have trouble understanding the code. Also, consider the Demorgan’s Law equivalent:

    if (isBaselineAlignmentForChild(*child) &amp;&amp; alignSelfForChild(*child).position() != ItemPosition::LastBaseline &amp;&amp; justifySelfForChild(*child).position() != ItemPosition::LastBaseline) {

Maybe another named helper function like isBaselineAlignmentForChild could make the code more readable, although I don’t know what I’d name it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751704</commentid>
    <comment_count>6</comment_count>
      <attachid>426399</attachid>
    <who name="">zsun</who>
    <bug_when>2021-04-19 01:49:49 -0700</bug_when>
    <thetext>Created attachment 426399
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1751858</commentid>
    <comment_count>7</comment_count>
      <attachid>426399</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-04-19 10:41:40 -0700</bug_when>
    <thetext>Comment on attachment 426399
Patch

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

&gt; Source/WebCore/rendering/RenderGrid.cpp:1277
&gt; +            if (isBaselineAlignmentForChild(*child) &amp;&amp; !iSelfAlignmentForChildAtLastBaseline(*child)) {

If you let me suggest something, I&apos;d rather create a new function in GridBaselineAlignment.h for checking only first-line baseline (although such keyword doesn&apos;t exist formally in the spec). Then, we can pass that function as an argument for RenderGrid::isBaselineAlignmentForChild (perhaps use a template here ?). Something like this:

static inline bool isFirstBaselinePosition(ItemPosition position) { return position == ItemPosition::Baseline; }

template &lt;typename F&gt;
bool RenderGrid::isBaselineAlignmentForChild(const RenderBox&amp; child, F isBaseline) const;

template &lt;typename F&gt;
bool RenderGrid::isBaselineAlignmentForChild(const RenderBox&amp; child, GridAxis baselineAxis, F isBaseline) const;

Then, we can make the non-template versions of these 2 methods so that they use the &quot;isBaselinePosition&quot; function we already have. This way we don&apos;t need to apply any change on the many callers of isBaselineAlignmentForChild. 

For the case we are changing the behavior in this patch, we would use the new isFirstBaseline call we are defining now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752231</commentid>
    <comment_count>8</comment_count>
      <attachid>426539</attachid>
    <who name="">zsun</who>
    <bug_when>2021-04-20 05:18:33 -0700</bug_when>
    <thetext>Created attachment 426539
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752411</commentid>
    <comment_count>9</comment_count>
      <attachid>426539</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-04-20 14:05:15 -0700</bug_when>
    <thetext>Comment on attachment 426539
Patch

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

&gt; Source/WebCore/rendering/RenderGrid.cpp:1236
&gt; +bool RenderGrid::isBaselineAlignmentForChild(const RenderBox&amp; child, F isBaseline) const

As we discussed privately, perhaps this approach is not the ideal one. We can achieve the same using an enumeration instead of the function argument, so that we can figure whether first baseline, last baseline or both are valid values. 
We can define the new argument to default to &quot;both&quot;, which is the common case and it&apos;d avoid to change any of the other callers. What do you think ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752690</commentid>
    <comment_count>10</comment_count>
      <attachid>426665</attachid>
    <who name="">zsun</who>
    <bug_when>2021-04-21 03:36:44 -0700</bug_when>
    <thetext>Created attachment 426665
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752692</commentid>
    <comment_count>11</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-21 03:47:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/76948720&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752700</commentid>
    <comment_count>12</comment_count>
      <attachid>426665</attachid>
    <who name="Javier Fernandez">jfernandez</who>
    <bug_when>2021-04-21 04:19:52 -0700</bug_when>
    <thetext>Comment on attachment 426665
Patch

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

r=me

&gt; Source/WebCore/rendering/RenderGrid.cpp:1246
&gt; +    bool isBaseline = allowed == FirstLine? isFirstBaselinePosition(align) : isBaselinePosition(align);

nit: there must be a space between FirstLine and the &quot;?&quot; symbol.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752701</commentid>
    <comment_count>13</comment_count>
      <attachid>426670</attachid>
    <who name="">zsun</who>
    <bug_when>2021-04-21 04:22:01 -0700</bug_when>
    <thetext>Created attachment 426670
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1752714</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-21 06:34:20 -0700</bug_when>
    <thetext>Committed r276356 (236834@main): &lt;https://commits.webkit.org/236834@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 426670.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426028</attachid>
            <date>2021-04-14 11:55:05 -0700</date>
            <delta_ts>2021-04-16 02:57:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224538-20210414195504.patch</filename>
            <type>text/plain</type>
            <size>8174</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzFkNTgxNjYxOThl
ZGY1YmMwZDEwNjM3ZTQ5ZjI2NmQwOGY4NC4uNWFlODZjNzIyZTg3ZDM3MDUzMWMyN2U5ZGJiMjVk
NWJiOGM4ODhhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTE0ICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBsYXN0LWJhc2Vs
aW5lIHNob3VsZG4ndCBhZmZlY3QgYmFzZWxpbmUgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzgKKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NvcmRpbmcgdG8gZGlzY3Vzc2lvbnMg
YXQgaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzUyOTMsCisgICAg
ICAgICJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBzaG91bGQgbm90IGludGVyZmVyZSB3aXRo
IGJhc2VsaW5lIGFsaWdubWVudCBpbgorICAgICAgICBmaXJzdCByb3cuIFRoaXMgY2hhbmdlIGlz
IHRvIG1ha2Ugc3VyZSB0aGlzIGlzIGNoZWNrZWQgd2hpbGUgZGVjaWRpbmcKKyAgICAgICAgd2hl
dGhlciBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBhbGlnbm1lbnQuICAKKworICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckdyaWQ6OmlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCBjb25zdCk6CisKIDIwMjEtMDQtMTQg
IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIERv
IG5vdCByZXNldCBjb21wdXRlZCBzdHlsZSBmb3IgZWxlbWVudCBjaGlsZHJlbiB3aXRoIGRpc3Bs
YXkgY29udGVudHMgc3R5bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApp
bmRleCBlZjUwNzY4NTU3ZGRiNDY5ODU0ODMzNWI0NzJkZDA2YWU4ZWI5YjFjLi43ZDNlYjUwMjM0
ODA4MTZhYmQ5MmE1ODFiYTc4NzlhMjRkODQxZmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckdyaWQuY3BwCkBAIC0xMjQzLDcgKzEyNDMsNyBAQCBib29sIFJlbmRlckdyaWQ6Omlz
QmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBHcmlkQXhp
cyBiYQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgSXRlbVBvc2l0aW9uIGFsaWduID0gc2Vs
ZkFsaWdubWVudEZvckNoaWxkKGJhc2VsaW5lQXhpcywgY2hpbGQpLnBvc2l0aW9uKCk7CiAgICAg
Ym9vbCBoYXNBdXRvTWFyZ2lucyA9IGJhc2VsaW5lQXhpcyA9PSBHcmlkQ29sdW1uQXhpcyA/IGhh
c0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNoaWxkKSA6IGhhc0F1dG9NYXJnaW5zSW5Sb3dBeGlz
KGNoaWxkKTsKLSAgICByZXR1cm4gaXNCYXNlbGluZVBvc2l0aW9uKGFsaWduKSAmJiAhaGFzQXV0
b01hcmdpbnM7CisgICAgcmV0dXJuIGlzQmFzZWxpbmVQb3NpdGlvbihhbGlnbikgJiYgYWxpZ24g
IT0gSXRlbVBvc2l0aW9uOjpMYXN0QmFzZWxpbmUgJiYgIWhhc0F1dG9NYXJnaW5zOwogfQogCiAv
LyBGSVhNRTogVGhpcyBsb2dpYyBpcyBzaGFyZWQgYnkgUmVuZGVyRmxleGlibGVCb3gsIHNvIGl0
IG1pZ2h0IGJlIHJlZmFjdG9yZWQgc29tZWhvdy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0No
YW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZGVlYmE0ZDE4NjgyMmZmOTYw
YjlkYTk0NWZlZjYzNWU5MDNlNmNlLi42OTdmODA1NTY3ZDc2MmZjOTQyMWI4MmJhZDZiMTAwMDRm
NTg3MzNiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDQtMTQgIFppcmFuIFN1biAgPHpz
dW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWdyaWRdIGxhc3QtYmFzZWxpbmUgc2hvdWxk
bid0IGFmZmVjdCBiYXNlbGluZSBhbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNC0xMyAg
SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVUF0gTWVkaWFT
b3VyY2UuYWRkU291cmNlQnVmZmVyKCkgd2lsbCB0aHJvdyBpZiBnaXZlbiB0aGUgc2FtZSBwYXJh
bWV0ZXIgYXMgYSBwcmV2aW91cyBjYWxsIHRvIEhUTUxNZWRpYUVsZW1lbnQuY2FuUGxheVR5cGUo
KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMTM2ZjFjNTM2ZTY1YTFmMmEzMzI2
YzBmMjI1NTA3YjU0NjQyNzg0OS4uNmZhZjRiOWJiZDI5OGNkZTI1YWZhOTU2ODdkYjE4YzE1ODUz
YWUxMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw
MjEtMDQtMTQgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWdy
aWRdIGxhc3QtYmFzZWxpbmUgc2hvdWxkbid0IGFmZmVjdCBiYXNlbGluZSBhbGlnbm1lbnQKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUzOAorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0
ZWQudHh0OgorCiAyMDIxLTA0LTEzICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAg
ICAgICAgW2Nzcy1ncmlkXSBJbmNvcnJlY3QgdHJhY2sgc2l6aW5nIHdoZW4gdXNpbmcgcmVsYXRp
dmUgc2l6ZWQgaXRlbXMgaW4gJ2F1dG8nIGNvbHVtbiB0cmFja3MKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmlu
ZGV4IDE2OGM5NjdlYzMzZjkzMDZiNWE3ZjE1ZjAxNWUzNTZiZDUxODU3YzYuLmEyNjUyYmNmNGM5
NjhlNDZmMmQ3NmM4YmFhMjNhN2I0NzQxNWEwMGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDA3
OSw4ICs0MDc5LDYgQEAgd2Via2l0Lm9yZy9iLzIxMjI0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC0KIHdlYmtpdC5vcmcvYi8yMTIy
NDYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50
L2dyaWQtaXRlbS1taXhlZC1iYXNlbGluZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxMjI0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1pdGVtLW1peGVkLWJhc2VsaW5lLTAwMy5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjEyMjQ2IGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWl0ZW0tbWl4ZWQtYmFzZWxp
bmUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTIyNDYgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQt
c2VsZi1hbGlnbm1lbnQtYmFzZWxpbmUtd2l0aC1ncmlkLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCi13ZWJraXQub3JnL2IvMjEyMjQ2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLXNlbGYtYWxpZ25tZW50LWJhc2VsaW5lLXdp
dGgtZ3JpZC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxMjI0
NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQv
Z3JpZC1zZWxmLWFsaWdubWVudC1iYXNlbGluZS13aXRoLWdyaWQtMDAzLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTIyNDYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQtc2VsZi1hbGlnbm1lbnQtYmFzZWxp
bmUtd2l0aC1ncmlkLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjEyMjQ2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQt
bW9kZWwvZ3JpZC1hcmVhcy1vdmVyZmxvd2luZy1ncmlkLWNvbnRhaW5lci0wMDEuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQtYmFzZWxpbmUtMDA0
LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLTAwNC1leHBlY3RlZC50eHQK
aW5kZXggMTgzYWEzNjFlOWRjMGIzZjI1NDM0ZTI1YTYzZTgyYjU1NTUzZTRiYi4uYzE2YWRkNGJh
YmE4NzNkOTRjMDNhYzA4M2NmM2EzNzcwMDFhNzc5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dy
aWQtYmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGlu
ZS0wMDQtZXhwZWN0ZWQudHh0CkBAIC01LDQ3ICs1LDExIEBAIFBBU1MgLmdyaWQsIGNvbnRhaW5l
ciAzCiBQQVNTIC5ncmlkLCBjb250YWluZXIgNAogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDUKIFBB
U1MgLmdyaWQsIGNvbnRhaW5lciA2Ci1GQUlMIC5ncmlkLCBjb250YWluZXIgNyBhc3NlcnRfZXF1
YWxzOgotPGRpdiBjbGFzcz0iY29udGFpbmVyIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0ODAiIGRh
dGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNjUiPgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIg
ZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNDAiPgotICAgICAgICA8ZGl2IGNsYXNz
PSJmaXJzdFJvd0ZpcnN0Q29sdW1uIHRhcmdldCIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZz
ZXQteT0iMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90aENvbHVtbiIg
ZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAgICA8ZGl2
IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4gc3R5bGUyIiBzdHlsZT0iYWxpZ24tc2VsZjogbGFz
dCBiYXNlbGluZSIgZGF0YS1vZmZzZXQteD0iMCI+PC9kaXY+Ci0gICAgPC9kaXY+Ci0gICAgPGRp
diBjbGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIxNjAiIGRhdGEtb2Zmc2V0LXk9
IjAiPgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4gdGFyZ2V0IiBkYXRh
LW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xh
c3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9
IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4iIGRhdGEt
b2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAgICA8L2Rpdj4KLSAgICA8
ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjMyMCIgZGF0YS1vZmZzZXQt
eT0iNTUiPgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4gdGFyZ2V0IiBk
YXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgICAgIDxkaXYg
Y2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0
LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4iIGRh
dGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjEwIj48L2Rpdj4KLSAgICA8L2Rpdj4KLTwv
ZGl2Pgotb2Zmc2V0VG9wIGV4cGVjdGVkIDQwIGJ1dCBnb3QgNTAKK1BBU1MgLmdyaWQsIGNvbnRh
aW5lciA3CiBQQVNTIC5ncmlkLCBjb250YWluZXIgOAogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDkK
IFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxMAotRkFJTCAuZ3JpZCwgY29udGFpbmVyIDExIGFzc2Vy
dF9lcXVhbHM6Ci08ZGl2IGNsYXNzPSJjb250YWluZXIiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQ4
MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE2NSI+Ci0gICAgPGRpdiBjbGFzcz0iZ3JpZCB0d29S
b3dzIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSI1NSI+Ci0gICAgICAgIDxkaXYg
Y2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0
LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4gYWxp
Z25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHlsZT0id2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDIwcHg7
IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgICAgIDxk
aXYgY2xhc3M9ImJvdGhSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZz
ZXQteT0iMTAiPjwvZGl2PgotICAgIDwvZGl2PgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93
cyIgZGF0YS1vZmZzZXQteD0iMTYwIiBkYXRhLW9mZnNldC15PSI0MCI+Ci0gICAgICAgIDxkaXYg
Y2xhc3M9ImJvdGhSb3dGaXJzdENvbHVtbiBzdHlsZTIiIHN0eWxlPSJhbGlnbi1zZWxmOiBsYXN0
IGJhc2VsaW5lIiBkYXRhLW9mZnNldC14PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0i
Zmlyc3RSb3dGaXJzdENvbHVtbiBhbGlnblNlbGZCYXNlbGluZSB0YXJnZXQiIHN0eWxlPSJ3aWR0
aDogNTBweDsgaGVpZ2h0OiA1MHB4OyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0i
MCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90aENvbHVtbiIgZGF0YS1v
ZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgIDwvZGl2PgotICAgIDxk
aXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMzIwIiBkYXRhLW9mZnNldC15
PSIwIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1uIiBkYXRhLW9mZnNl
dC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZp
cnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwv
ZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4gYWxpZ25TZWxmQmFz
ZWxpbmUgdGFyZ2V0IiBzdHlsZT0id2lkdGg6IDQwcHg7IGhlaWdodDogODBweDsiIGRhdGEtb2Zm
c2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjEwIj48L2Rpdj4KLSAgICA8L2Rpdj4KLTwvZGl2Pgot
b2Zmc2V0VG9wIGV4cGVjdGVkIDQwIGJ1dCBnb3QgNTAKK1BBU1MgLmdyaWQsIGNvbnRhaW5lciAx
MQogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDEyCiBQQVNTIC5ncmlkLCBjb250YWluZXIgMTMKIFBB
U1MgLmdyaWQsIGNvbnRhaW5lciAxNAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426201</attachid>
            <date>2021-04-16 02:57:52 -0700</date>
            <delta_ts>2021-04-19 01:49:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224538-20210416105750.patch</filename>
            <type>text/plain</type>
            <size>6137</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzFkNTgxNjYxOThl
ZGY1YmMwZDEwNjM3ZTQ5ZjI2NmQwOGY4NC4uOGFhZDMwNDM1ZGNlZDhkMTY5MTczYmY3NjNhNTNk
ZjkyNWU0NWY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTE0ICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBsYXN0LWJhc2Vs
aW5lIHNob3VsZG4ndCBhZmZlY3QgYmFzZWxpbmUgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzgKKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY2NvcmRpbmcgdG8gZGlzY3Vzc2lvbnMg
YXQgaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzUyOTMsCisgICAg
ICAgICJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBzaG91bGQgbm90IGludGVyZmVyZSB3aXRo
IGJhc2VsaW5lIGFsaWdubWVudCBpbgorICAgICAgICBmaXJzdCByb3cuIFRoaXMgY2hhbmdlIGlz
IHRvIG1ha2Ugc3VyZSB0aGlzIGlzIGNoZWNrZWQgd2hpbGUgZGVjaWRpbmcKKyAgICAgICAgd2hl
dGhlciBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBhbGlnbm1lbnQuICAKKworICAg
ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckdyaWQ6OmZpcnN0TGluZUJhc2VsaW5lIGNvbnN0KToKKwogMjAyMS0wNC0xNCAgQ2FybG9zIEdh
cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgRG8gbm90IHJlc2V0
IGNvbXB1dGVkIHN0eWxlIGZvciBlbGVtZW50IGNoaWxkcmVuIHdpdGggZGlzcGxheSBjb250ZW50
cyBzdHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGVmNTA3
Njg1NTdkZGI0Njk4NTQ4MzM1YjQ3MmRkMDZhZThlYjliMWMuLjI1OTJjMTBiN2JhOTdjOTRlZTZl
MTJkN2ZjZjIzYWZmMGI0ZGFhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp
ZC5jcHAKQEAgLTEyNjksNyArMTI2OSw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckdy
aWQ6OmZpcnN0TGluZUJhc2VsaW5lKCkgY29uc3QKICAgICAgICAgZm9yIChhdXRvJiBjaGlsZCA6
IG1fZ3JpZC5jZWxsKDAsIGNvbHVtbikpIHsKICAgICAgICAgICAgIEFTU0VSVChjaGlsZC5nZXQo
KSk7CiAgICAgICAgICAgICAvLyBJZiBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBh
bGlnbm1lbnQsIHdlIHNlbGVjdCBzdWNoIGl0ZW0uCi0gICAgICAgICAgICBpZiAoaXNCYXNlbGlu
ZUFsaWdubWVudEZvckNoaWxkKCpjaGlsZCkpIHsKKyAgICAgICAgICAgIGlmIChpc0Jhc2VsaW5l
QWxpZ25tZW50Rm9yQ2hpbGQoKmNoaWxkKSAmJiAhKGFsaWduU2VsZkZvckNoaWxkKCpjaGlsZCku
cG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246Okxhc3RCYXNlbGluZSB8fCBqdXN0aWZ5U2VsZkZv
ckNoaWxkKCpjaGlsZCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246Okxhc3RCYXNlbGluZSkp
IHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogc2VsZi1iYXNlbGluZSBhbmQgY29udGVudC1i
YXNlbGluZSBhbGlnbm1lbnQgbm90IGltcGxlbWVudGVkIHlldC4KICAgICAgICAgICAgICAgICBi
YXNlbGluZUNoaWxkID0gY2hpbGQuZ2V0KCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAxMzZmMWM1MzZlNjVhMWYyYTMzMjZjMGYyMjU1
MDdiNTQ2NDI3ODQ5Li42ZmFmNGI5YmJkMjk4Y2RlMjVhZmE5NTY4N2RiMThjMTU4NTNhZTEzIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNC0x
NCAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3JpZF0gbGFz
dC1iYXNlbGluZSBzaG91bGRuJ3QgYWZmZWN0IGJhc2VsaW5lIGFsaWdubWVudAorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTM4CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLTAwNC1leHBlY3RlZC50eHQ6
CisKIDIwMjEtMDQtMTMgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBb
Y3NzLWdyaWRdIEluY29ycmVjdCB0cmFjayBzaXppbmcgd2hlbiB1c2luZyByZWxhdGl2ZSBzaXpl
ZCBpdGVtcyBpbiAnYXV0bycgY29sdW1uIHRyYWNrcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dy
aWQtYmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLTAw
NC1leHBlY3RlZC50eHQKaW5kZXggMTgzYWEzNjFlOWRjMGIzZjI1NDM0ZTI1YTYzZTgyYjU1NTUz
ZTRiYi4uYzE2YWRkNGJhYmE4NzNkOTRjMDNhYzA4M2NmM2EzNzcwMDFhNzc5YSAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdy
aWQvYWxpZ25tZW50L2dyaWQtYmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1l
bnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0ZWQudHh0CkBAIC01LDQ3ICs1LDExIEBAIFBBU1Mg
LmdyaWQsIGNvbnRhaW5lciAzCiBQQVNTIC5ncmlkLCBjb250YWluZXIgNAogUEFTUyAuZ3JpZCwg
Y29udGFpbmVyIDUKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciA2Ci1GQUlMIC5ncmlkLCBjb250YWlu
ZXIgNyBhc3NlcnRfZXF1YWxzOgotPGRpdiBjbGFzcz0iY29udGFpbmVyIiBkYXRhLWV4cGVjdGVk
LXdpZHRoPSI0ODAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNjUiPgotICAgIDxkaXYgY2xhc3M9
ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNDAiPgotICAg
ICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIHRhcmdldCIgZGF0YS1vZmZzZXQt
eD0iMCIgZGF0YS1vZmZzZXQteT0iMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0
Um93Qm90aENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2
PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4gc3R5bGUyIiBzdHlsZT0i
YWxpZ24tc2VsZjogbGFzdCBiYXNlbGluZSIgZGF0YS1vZmZzZXQteD0iMCI+PC9kaXY+Ci0gICAg
PC9kaXY+Ci0gICAgPGRpdiBjbGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIxNjAi
IGRhdGEtb2Zmc2V0LXk9IjAiPgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1
bW4gdGFyZ2V0IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0g
ICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAi
IGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0Jv
dGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAg
ICA8L2Rpdj4KLSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjMy
MCIgZGF0YS1vZmZzZXQteT0iNTUiPgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhD
b2x1bW4gdGFyZ2V0IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+
Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9
IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93
Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjEwIj48L2Rpdj4K
LSAgICA8L2Rpdj4KLTwvZGl2Pgotb2Zmc2V0VG9wIGV4cGVjdGVkIDQwIGJ1dCBnb3QgNTAKK1BB
U1MgLmdyaWQsIGNvbnRhaW5lciA3CiBQQVNTIC5ncmlkLCBjb250YWluZXIgOAogUEFTUyAuZ3Jp
ZCwgY29udGFpbmVyIDkKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxMAotRkFJTCAuZ3JpZCwgY29u
dGFpbmVyIDExIGFzc2VydF9lcXVhbHM6Ci08ZGl2IGNsYXNzPSJjb250YWluZXIiIGRhdGEtZXhw
ZWN0ZWQtd2lkdGg9IjQ4MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE2NSI+Ci0gICAgPGRpdiBj
bGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSI1NSI+
Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9
IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJv
d0JvdGhDb2x1bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHlsZT0id2lkdGg6IDEwMHB4
OyBoZWlnaHQ6IDIwcHg7IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9k
aXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImJvdGhSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQt
eD0iMCIgZGF0YS1vZmZzZXQteT0iMTAiPjwvZGl2PgotICAgIDwvZGl2PgotICAgIDxkaXYgY2xh
c3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMTYwIiBkYXRhLW9mZnNldC15PSI0MCI+
Ci0gICAgICAgIDxkaXYgY2xhc3M9ImJvdGhSb3dGaXJzdENvbHVtbiBzdHlsZTIiIHN0eWxlPSJh
bGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBkYXRhLW9mZnNldC14PSIwIj48L2Rpdj4KLSAgICAg
ICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dGaXJzdENvbHVtbiBhbGlnblNlbGZCYXNlbGluZSB0YXJn
ZXQiIHN0eWxlPSJ3aWR0aDogNTBweDsgaGVpZ2h0OiA1MHB4OyIgZGF0YS1vZmZzZXQteD0iMCIg
ZGF0YS1vZmZzZXQteT0iMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90
aENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAg
IDwvZGl2PgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMzIw
IiBkYXRhLW9mZnNldC15PSIwIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29s
dW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgICAg
IDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEt
b2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1
bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHlsZT0id2lkdGg6IDQwcHg7IGhlaWdodDog
ODBweDsiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjEwIj48L2Rpdj4KLSAgICA8
L2Rpdj4KLTwvZGl2Pgotb2Zmc2V0VG9wIGV4cGVjdGVkIDQwIGJ1dCBnb3QgNTAKK1BBU1MgLmdy
aWQsIGNvbnRhaW5lciAxMQogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDEyCiBQQVNTIC5ncmlkLCBj
b250YWluZXIgMTMKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxNAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426399</attachid>
            <date>2021-04-19 01:49:49 -0700</date>
            <delta_ts>2021-04-20 05:18:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224538-20210419094947.patch</filename>
            <type>text/plain</type>
            <size>7314</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzFkNTgxNjYxOThl
ZGY1YmMwZDEwNjM3ZTQ5ZjI2NmQwOGY4NC4uODU1YjU4ZWNjZmVkMzdkMjJjNTQ2MTg3ZDA0N2Ew
YmYzODg5M2U1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTE0ICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBsYXN0LWJhc2Vs
aW5lIHNob3VsZG4ndCBhZmZlY3QgYmFzZWxpbmUgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzgKKworICAgICAgICBSZXZpZXdl
ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBY2NvcmRpbmcgdG8gZGlzY3Vzc2lvbnMgYXQg
aHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzUyOTMsCisgICAgICAg
ICJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIGJh
c2VsaW5lIGFsaWdubWVudCBpbgorICAgICAgICBmaXJzdCByb3cuIFRoaXMgY2hhbmdlIGlzIHRv
IG1ha2Ugc3VyZSB0aGlzIGlzIGNoZWNrZWQgd2hpbGUgZGVjaWRpbmcKKyAgICAgICAgd2hldGhl
ciBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBhbGlnbm1lbnQuICAKKworICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy
aWQ6OmZpcnN0TGluZUJhc2VsaW5lIGNvbnN0KToKKwogMjAyMS0wNC0xNCAgQ2FybG9zIEdhcmNp
YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgRG8gbm90IHJlc2V0IGNv
bXB1dGVkIHN0eWxlIGZvciBlbGVtZW50IGNoaWxkcmVuIHdpdGggZGlzcGxheSBjb250ZW50cyBz
dHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3Bw
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGVmNTA3Njg1
NTdkZGI0Njk4NTQ4MzM1YjQ3MmRkMDZhZThlYjliMWMuLjZhMTFmZjc2ZjYzMDdhMDUwODQ1Yzli
YTgzMjExM2M0MjBlNTJiY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5j
cHAKQEAgLTEyMzIsNiArMTIzMiwxMSBAQCB2b2lkIFJlbmRlckdyaWQ6OnVwZGF0ZUF1dG9NYXJn
aW5zSW5Db2x1bW5BeGlzSWZOZWVkZWQoUmVuZGVyQm94JiBjaGlsZCkKICAgICB9CiB9CiAKK2Jv
b2wgUmVuZGVyR3JpZDo6aVNlbGZBbGlnbm1lbnRGb3JDaGlsZEF0TGFzdEJhc2VsaW5lKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Cit7CisgICAgcmV0dXJuIGFsaWduU2VsZkZvckNoaWxk
KGNoaWxkKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6TGFzdEJhc2VsaW5lIHx8IGp1c3Rp
ZnlTZWxmRm9yQ2hpbGQoY2hpbGQpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpMYXN0QmFz
ZWxpbmU7Cit9CisKIGJvb2wgUmVuZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGlzQmFzZWxpbmVB
bGlnbm1lbnRGb3JDaGlsZChjaGlsZCwgR3JpZFJvd0F4aXMpIHx8IGlzQmFzZWxpbmVBbGlnbm1l
bnRGb3JDaGlsZChjaGlsZCwgR3JpZENvbHVtbkF4aXMpOwpAQCAtMTI2OSw3ICsxMjc0LDcgQEAg
T3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyR3JpZDo6Zmlyc3RMaW5lQmFzZWxpbmUoKSBjb25z
dAogICAgICAgICBmb3IgKGF1dG8mIGNoaWxkIDogbV9ncmlkLmNlbGwoMCwgY29sdW1uKSkgewog
ICAgICAgICAgICAgQVNTRVJUKGNoaWxkLmdldCgpKTsKICAgICAgICAgICAgIC8vIElmIGFuIGl0
ZW0gcGFydGljaXBhdGVzIGluIGJhc2VsaW5lIGFsaWdubWVudCwgd2Ugc2VsZWN0IHN1Y2ggaXRl
bS4KLSAgICAgICAgICAgIGlmIChpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoKmNoaWxkKSkg
eworICAgICAgICAgICAgaWYgKGlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCgqY2hpbGQpICYm
ICFpU2VsZkFsaWdubWVudEZvckNoaWxkQXRMYXN0QmFzZWxpbmUoKmNoaWxkKSkgewogICAgICAg
ICAgICAgICAgIC8vIEZJWE1FOiBzZWxmLWJhc2VsaW5lIGFuZCBjb250ZW50LWJhc2VsaW5lIGFs
aWdubWVudCBub3QgaW1wbGVtZW50ZWQgeWV0LgogICAgICAgICAgICAgICAgIGJhc2VsaW5lQ2hp
bGQgPSBjaGlsZC5nZXQoKTsKICAgICAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDFkYmU5MWM3OGU2ZjZmNDA4NGIwNmQ0OWI0ZTAzMmM4
NDFlN2Q0Y2UuLjBjMTg2NThkZTJhY2Y5MTcxODEwZmJmYTkwNGE2Y2JkNjY3MzAzYzMgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtMTMzLDYgKzEzMyw4IEBAIHByaXZh
dGU6CiAgICAgdm9pZCBsYXlvdXRHcmlkSXRlbXMoKTsKICAgICB2b2lkIHBvcHVsYXRlR3JpZFBv
c2l0aW9uc0ZvckRpcmVjdGlvbihHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pOwogCisgICAgYm9v
bCBpU2VsZkFsaWdubWVudEZvckNoaWxkQXRMYXN0QmFzZWxpbmUoY29uc3QgUmVuZGVyQm94JiBj
aGlsZCkgY29uc3Q7CisKICAgICBMYXlvdXRVbml0IHJlc29sdmVBdXRvU3RhcnRHcmlkUG9zaXRp
b24oR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uKSBjb25zdDsKICAgICBMYXlvdXRVbml0IHJlc29s
dmVBdXRvRW5kR3JpZFBvc2l0aW9uKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbikgY29uc3Q7CiAg
ICAgTGF5b3V0VW5pdCBncmlkQXJlYUJyZWFkdGhGb3JPdXRPZkZsb3dDaGlsZChjb25zdCBSZW5k
ZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu
Z2VMb2cKaW5kZXggMTM2ZjFjNTM2ZTY1YTFmMmEzMzI2YzBmMjI1NTA3YjU0NjQyNzg0OS4uMTRl
NjhkZWMzZWQ4NDYzOTk1ZjQ1YmFhMzhmYTg2NzhlOTMxYTE0ZCAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDQtMTQgIFppcmFuIFN1biAgPHpz
dW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWdyaWRdIGxhc3QtYmFzZWxpbmUgc2hvdWxk
bid0IGFmZmVjdCBiYXNlbGluZSBhbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUzOAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu
IEFkbGVyLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGln
bm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA0LTEzICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBJbmNvcnJlY3Qg
dHJhY2sgc2l6aW5nIHdoZW4gdXNpbmcgcmVsYXRpdmUgc2l6ZWQgaXRlbXMgaW4gJ2F1dG8nIGNv
bHVtbiB0cmFja3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLTAwNC1leHBl
Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0ZWQudHh0CmluZGV4
IDE4M2FhMzYxZTlkYzBiM2YyNTQzNGUyNWE2M2U4MmI1NTU1M2U0YmIuLmMxNmFkZDRiYWJhODcz
ZDk0YzAzYWMwODNjZjNhMzc3MDAxYTc3OWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJh
c2VsaW5lLTAwNC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQtYmFzZWxpbmUtMDA0
LWV4cGVjdGVkLnR4dApAQCAtNSw0NyArNSwxMSBAQCBQQVNTIC5ncmlkLCBjb250YWluZXIgMwog
UEFTUyAuZ3JpZCwgY29udGFpbmVyIDQKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciA1CiBQQVNTIC5n
cmlkLCBjb250YWluZXIgNgotRkFJTCAuZ3JpZCwgY29udGFpbmVyIDcgYXNzZXJ0X2VxdWFsczoK
LTxkaXYgY2xhc3M9ImNvbnRhaW5lciIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDgwIiBkYXRhLWV4
cGVjdGVkLWhlaWdodD0iMTY1Ij4KLSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEt
b2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjQwIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmly
c3RSb3dGaXJzdENvbHVtbiB0YXJnZXQiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9
IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4iIGRhdGEt
b2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFz
cz0iYm90aFJvd0ZpcnN0Q29sdW1uIHN0eWxlMiIgc3R5bGU9ImFsaWduLXNlbGY6IGxhc3QgYmFz
ZWxpbmUiIGRhdGEtb2Zmc2V0LXg9IjAiPjwvZGl2PgotICAgIDwvZGl2PgotICAgIDxkaXYgY2xh
c3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMTYwIiBkYXRhLW9mZnNldC15PSIwIj4K
LSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIHRhcmdldCIgZGF0YS1vZmZz
ZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJm
aXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIj48
L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1uIiBkYXRhLW9mZnNl
dC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgPC9kaXY+Ci0gICAgPGRpdiBj
bGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIzMjAiIGRhdGEtb2Zmc2V0LXk9IjU1
Ij4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1uIHRhcmdldCIgZGF0YS1v
ZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNz
PSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIw
Ij48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9m
ZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0gICAgPC9kaXY+Ci08L2Rpdj4K
LW9mZnNldFRvcCBleHBlY3RlZCA0MCBidXQgZ290IDUwCitQQVNTIC5ncmlkLCBjb250YWluZXIg
NwogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDgKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciA5CiBQQVNT
IC5ncmlkLCBjb250YWluZXIgMTAKLUZBSUwgLmdyaWQsIGNvbnRhaW5lciAxMSBhc3NlcnRfZXF1
YWxzOgotPGRpdiBjbGFzcz0iY29udGFpbmVyIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0ODAiIGRh
dGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNjUiPgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIg
ZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNTUiPgotICAgICAgICA8ZGl2IGNsYXNz
PSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIw
Ij48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1uIGFsaWduU2Vs
ZkJhc2VsaW5lIHRhcmdldCIgc3R5bGU9IndpZHRoOiAxMDBweDsgaGVpZ2h0OiAyMHB4OyIgZGF0
YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAgICA8ZGl2IGNs
YXNzPSJib3RoUm93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9
IjEwIj48L2Rpdj4KLSAgICA8L2Rpdj4KLSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRh
dGEtb2Zmc2V0LXg9IjE2MCIgZGF0YS1vZmZzZXQteT0iNDAiPgotICAgICAgICA8ZGl2IGNsYXNz
PSJib3RoUm93Rmlyc3RDb2x1bW4gc3R5bGUyIiBzdHlsZT0iYWxpZ24tc2VsZjogbGFzdCBiYXNl
bGluZSIgZGF0YS1vZmZzZXQteD0iMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0
Um93Rmlyc3RDb2x1bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHlsZT0id2lkdGg6IDUw
cHg7IGhlaWdodDogNTBweDsiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwv
ZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0
LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAgICA8L2Rpdj4KLSAgICA8ZGl2IGNs
YXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjMyMCIgZGF0YS1vZmZzZXQteT0iMCI+
Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90aENvbHVtbiIgZGF0YS1vZmZzZXQteD0i
MCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJv
d0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIj48L2Rpdj4K
LSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIGFsaWduU2VsZkJhc2VsaW5l
IHRhcmdldCIgc3R5bGU9IndpZHRoOiA0MHB4OyBoZWlnaHQ6IDgwcHg7IiBkYXRhLW9mZnNldC14
PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0gICAgPC9kaXY+Ci08L2Rpdj4KLW9mZnNl
dFRvcCBleHBlY3RlZCA0MCBidXQgZ290IDUwCitQQVNTIC5ncmlkLCBjb250YWluZXIgMTEKIFBB
U1MgLmdyaWQsIGNvbnRhaW5lciAxMgogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDEzCiBQQVNTIC5n
cmlkLCBjb250YWluZXIgMTQK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426539</attachid>
            <date>2021-04-20 05:18:33 -0700</date>
            <delta_ts>2021-04-21 03:36:39 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224538-20210420131832.patch</filename>
            <type>text/plain</type>
            <size>9492</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzFkNTgxNjYxOThl
ZGY1YmMwZDEwNjM3ZTQ5ZjI2NmQwOGY4NC4uYTk2MzdlZmFiZmFiMmI5MmE4ZWJlZDQ4ZGM2ODM2
NzRkNjA1MTdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA0LTE0ICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBsYXN0LWJhc2Vs
aW5lIHNob3VsZG4ndCBhZmZlY3QgYmFzZWxpbmUgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzgKKworICAgICAgICBSZXZpZXdl
ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBY2NvcmRpbmcgdG8gZGlzY3Vzc2lvbnMgYXQg
aHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzUyOTMsCisgICAgICAg
ICJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIGJh
c2VsaW5lIGFsaWdubWVudCBpbgorICAgICAgICBmaXJzdCByb3cuIFRoaXMgY2hhbmdlIGlzIHRv
IG1ha2Ugc3VyZSB0aGlzIGlzIGNoZWNrZWQgd2hpbGUgZGVjaWRpbmcKKyAgICAgICAgd2hldGhl
ciBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBhbGlnbm1lbnQuICAKKworICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy
aWQ6OmZpcnN0TGluZUJhc2VsaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy
aWQ6OmlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJHcmlkOjppc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQgY29uc3QpOiAgICAgICAg
CisKIDIwMjEtMDQtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t
PgogCiAgICAgICAgIERvIG5vdCByZXNldCBjb21wdXRlZCBzdHlsZSBmb3IgZWxlbWVudCBjaGls
ZHJlbiB3aXRoIGRpc3BsYXkgY29udGVudHMgc3R5bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9HcmlkQmFzZWxpbmVBbGlnbm1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9HcmlkQmFzZWxpbmVBbGlnbm1lbnQuaAppbmRleCA1OGUzZmM2YmMxYmVmOGEzYThm
N2M0MzZlYmM0YmNlZmNkNGY0OWYzLi5jNjZhMGRhYjAyOTIwYTc1MzAxYzgxZjg0ZWZjMTU3MDhj
M2ZlMWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZEJhc2VsaW5l
QWxpZ25tZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRCYXNlbGluZUFs
aWdubWVudC5oCkBAIC0xMjMsNiArMTIzLDExIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0Jhc2Vs
aW5lUG9zaXRpb24oSXRlbVBvc2l0aW9uIHBvc2l0aW9uKQogICAgIHJldHVybiBwb3NpdGlvbiA9
PSBJdGVtUG9zaXRpb246OkJhc2VsaW5lIHx8IHBvc2l0aW9uID09IEl0ZW1Qb3NpdGlvbjo6TGFz
dEJhc2VsaW5lOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNGaXJzdEJhc2VsaW5lUG9zaXRp
b24oSXRlbVBvc2l0aW9uIHBvc2l0aW9uKQoreworICAgIHJldHVybiBwb3NpdGlvbiA9PSBJdGVt
UG9zaXRpb246OkJhc2VsaW5lOworfQorCiAvLyBUaGlzIGlzIHRoZSBjbGFzcyB0aGF0IGltcGxl
bWVudHMgdGhlIEJhc2VsaW5lIEFsaWdubWVudCBsb2dpYywgdXNpbmcgaW50ZXJuYWxseSB0aGUg
QmFzZWxpbmVDb250ZXh0IGFuZAogLy8gQmFzZWxpbmVHcm91cGQgY2xhc3NlcyAoZGVzY3JpYmVk
IGFib3ZlKS4KIC8vCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
R3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXgg
ZWY1MDc2ODU1N2RkYjQ2OTg1NDgzMzViNDcyZGQwNmFlOGViOWIxYy4uZmFmNmIyYzg3OGVjNDM1
ZjcxOTUyOGRiYjdkZTNhMmI4NjA5OTdiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJHcmlkLmNwcApAQCAtMTIzMiwxOCArMTIzMiwzMCBAQCB2b2lkIFJlbmRlckdyaWQ6OnVwZGF0
ZUF1dG9NYXJnaW5zSW5Db2x1bW5BeGlzSWZOZWVkZWQoUmVuZGVyQm94JiBjaGlsZCkKICAgICB9
CiB9CiAKLWJvb2wgUmVuZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0Cit0ZW1wbGF0ZSA8dHlwZW5hbWUgRj4KK2Jvb2wgUmVu
ZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hp
bGQsIEYgaXNCYXNlbGluZSkgY29uc3QKIHsKLSAgICByZXR1cm4gaXNCYXNlbGluZUFsaWdubWVu
dEZvckNoaWxkKGNoaWxkLCBHcmlkUm93QXhpcykgfHwgaXNCYXNlbGluZUFsaWdubWVudEZvckNo
aWxkKGNoaWxkLCBHcmlkQ29sdW1uQXhpcyk7CisgICAgcmV0dXJuIGlzQmFzZWxpbmVBbGlnbm1l
bnRGb3JDaGlsZChjaGlsZCwgR3JpZFJvd0F4aXMsIGlzQmFzZWxpbmUpIHx8IGlzQmFzZWxpbmVB
bGlnbm1lbnRGb3JDaGlsZChjaGlsZCwgR3JpZENvbHVtbkF4aXMsIGlzQmFzZWxpbmUpOwogfQog
Ci1ib29sIFJlbmRlckdyaWQ6OmlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZChjb25zdCBSZW5k
ZXJCb3gmIGNoaWxkLCBHcmlkQXhpcyBiYXNlbGluZUF4aXMpIGNvbnN0Cit0ZW1wbGF0ZSA8dHlw
ZW5hbWUgRj4KK2Jvb2wgUmVuZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNv
bnN0IFJlbmRlckJveCYgY2hpbGQsIEdyaWRBeGlzIGJhc2VsaW5lQXhpcywgRiBpc0Jhc2VsaW5l
KSBjb25zdAogewogICAgIGlmIChjaGlsZC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKICAgICAg
ICAgcmV0dXJuIGZhbHNlOwogICAgIEl0ZW1Qb3NpdGlvbiBhbGlnbiA9IHNlbGZBbGlnbm1lbnRG
b3JDaGlsZChiYXNlbGluZUF4aXMsIGNoaWxkKS5wb3NpdGlvbigpOwogICAgIGJvb2wgaGFzQXV0
b01hcmdpbnMgPSBiYXNlbGluZUF4aXMgPT0gR3JpZENvbHVtbkF4aXMgPyBoYXNBdXRvTWFyZ2lu
c0luQ29sdW1uQXhpcyhjaGlsZCkgOiBoYXNBdXRvTWFyZ2luc0luUm93QXhpcyhjaGlsZCk7Ci0g
ICAgcmV0dXJuIGlzQmFzZWxpbmVQb3NpdGlvbihhbGlnbikgJiYgIWhhc0F1dG9NYXJnaW5zOwor
ICAgIHJldHVybiBpc0Jhc2VsaW5lKGFsaWduKSAmJiAhaGFzQXV0b01hcmdpbnM7Cit9CisKK2Jv
b2wgUmVuZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGls
ZChjaGlsZCwgR3JpZFJvd0F4aXMpIHx8IGlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZChjaGls
ZCwgR3JpZENvbHVtbkF4aXMpOworfQorCitib29sIFJlbmRlckdyaWQ6OmlzQmFzZWxpbmVBbGln
bm1lbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBHcmlkQXhpcyBiYXNlbGluZUF4
aXMpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZChjaGls
ZCwgYmFzZWxpbmVBeGlzLCBpc0Jhc2VsaW5lUG9zaXRpb24pOwogfQogCiAvLyBGSVhNRTogVGhp
cyBsb2dpYyBpcyBzaGFyZWQgYnkgUmVuZGVyRmxleGlibGVCb3gsIHNvIGl0IG1pZ2h0IGJlIHJl
ZmFjdG9yZWQgc29tZWhvdy4KQEAgLTEyNjksNyArMTI4MSw3IEBAIE9wdGlvbmFsPExheW91dFVu
aXQ+IFJlbmRlckdyaWQ6OmZpcnN0TGluZUJhc2VsaW5lKCkgY29uc3QKICAgICAgICAgZm9yIChh
dXRvJiBjaGlsZCA6IG1fZ3JpZC5jZWxsKDAsIGNvbHVtbikpIHsKICAgICAgICAgICAgIEFTU0VS
VChjaGlsZC5nZXQoKSk7CiAgICAgICAgICAgICAvLyBJZiBhbiBpdGVtIHBhcnRpY2lwYXRlcyBp
biBiYXNlbGluZSBhbGlnbm1lbnQsIHdlIHNlbGVjdCBzdWNoIGl0ZW0uCi0gICAgICAgICAgICBp
ZiAoaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKCpjaGlsZCkpIHsKKyAgICAgICAgICAgIGlm
IChpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoKmNoaWxkLCBpc0ZpcnN0QmFzZWxpbmVQb3Np
dGlvbikpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogc2VsZi1iYXNlbGluZSBhbmQgY29u
dGVudC1iYXNlbGluZSBhbGlnbm1lbnQgbm90IGltcGxlbWVudGVkIHlldC4KICAgICAgICAgICAg
ICAgICBiYXNlbGluZUNoaWxkID0gY2hpbGQuZ2V0KCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCAxZGJlOTFjNzhlNmY2ZjQw
ODRiMDZkNDliNGUwMzJjODQxZTdkNGNlLi5mZDVmMDg2MjM3YjMyOGYxZGMzMzhhZmYyMWEzM2Rl
ZDA5OGY1ZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp
ZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTc3LDYg
Kzc3LDggQEAgcHVibGljOgogICAgIHZvaWQgdXBkYXRlR3JpZEFyZWFMb2dpY2FsU2l6ZShSZW5k
ZXJCb3gmLCBPcHRpb25hbDxMYXlvdXRVbml0PiB3aWR0aCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4g
aGVpZ2h0KSBjb25zdDsKICAgICBib29sIGlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZChjb25z
dCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBib29sIGlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGls
ZChjb25zdCBSZW5kZXJCb3gmLCBHcmlkQXhpcykgY29uc3Q7CisgICAgdGVtcGxhdGUgPHR5cGVu
YW1lIEY+IGJvb2wgaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYg
Y2hpbGQsIEYgaXNCYXNlbGluZSkgY29uc3Q7CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIEY+IGJv
b2wgaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIEdy
aWRBeGlzIGJhc2VsaW5lQXhpcywgRiBpc0Jhc2VsaW5lKSBjb25zdDsKIAogICAgIFN0eWxlU2Vs
ZkFsaWdubWVudERhdGEgc2VsZkFsaWdubWVudEZvckNoaWxkKEdyaWRBeGlzLCBjb25zdCBSZW5k
ZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKIApkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMTM2ZjFjNTM2ZTY1YTFmMmEzMzI2YzBmMjI1NTA3YjU0
NjQyNzg0OS4uMTRlNjhkZWMzZWQ4NDYzOTk1ZjQ1YmFhMzhmYTg2NzhlOTMxYTE0ZCAxMDA2NDQK
LS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDQtMTQgIFpp
cmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWdyaWRdIGxhc3QtYmFz
ZWxpbmUgc2hvdWxkbid0IGFmZmVjdCBiYXNlbGluZSBhbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6
Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUzOAorCisgICAgICAgIFJldmll
d2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0ZWQudHh0OgorCiAyMDIx
LTA0LTEzICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlk
XSBJbmNvcnJlY3QgdHJhY2sgc2l6aW5nIHdoZW4gdXNpbmcgcmVsYXRpdmUgc2l6ZWQgaXRlbXMg
aW4gJ2F1dG8nIGNvbHVtbiB0cmFja3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2Vs
aW5lLTAwNC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0
ZWQudHh0CmluZGV4IDE4M2FhMzYxZTlkYzBiM2YyNTQzNGUyNWE2M2U4MmI1NTU1M2U0YmIuLmMx
NmFkZDRiYWJhODczZDk0YzAzYWMwODNjZjNhMzc3MDAxYTc3OWEgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdu
bWVudC9ncmlkLWJhc2VsaW5lLTAwNC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQt
YmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4dApAQCAtNSw0NyArNSwxMSBAQCBQQVNTIC5ncmlkLCBj
b250YWluZXIgMwogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDQKIFBBU1MgLmdyaWQsIGNvbnRhaW5l
ciA1CiBQQVNTIC5ncmlkLCBjb250YWluZXIgNgotRkFJTCAuZ3JpZCwgY29udGFpbmVyIDcgYXNz
ZXJ0X2VxdWFsczoKLTxkaXYgY2xhc3M9ImNvbnRhaW5lciIgZGF0YS1leHBlY3RlZC13aWR0aD0i
NDgwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTY1Ij4KLSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3
b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjQwIj4KLSAgICAgICAgPGRp
diBjbGFzcz0iZmlyc3RSb3dGaXJzdENvbHVtbiB0YXJnZXQiIGRhdGEtb2Zmc2V0LXg9IjAiIGRh
dGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhD
b2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAgICAg
ICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIHN0eWxlMiIgc3R5bGU9ImFsaWduLXNl
bGY6IGxhc3QgYmFzZWxpbmUiIGRhdGEtb2Zmc2V0LXg9IjAiPjwvZGl2PgotICAgIDwvZGl2Pgot
ICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMTYwIiBkYXRhLW9m
ZnNldC15PSIwIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIHRhcmdl
dCIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTAiPjwvZGl2PgotICAgICAgICA8
ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9m
ZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1u
IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgPC9kaXY+
Ci0gICAgPGRpdiBjbGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIzMjAiIGRhdGEt
b2Zmc2V0LXk9IjU1Ij4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1uIHRh
cmdldCIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAg
ICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRh
LW9mZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29s
dW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0gICAgPC9k
aXY+Ci08L2Rpdj4KLW9mZnNldFRvcCBleHBlY3RlZCA0MCBidXQgZ290IDUwCitQQVNTIC5ncmlk
LCBjb250YWluZXIgNwogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDgKIFBBU1MgLmdyaWQsIGNvbnRh
aW5lciA5CiBQQVNTIC5ncmlkLCBjb250YWluZXIgMTAKLUZBSUwgLmdyaWQsIGNvbnRhaW5lciAx
MSBhc3NlcnRfZXF1YWxzOgotPGRpdiBjbGFzcz0iY29udGFpbmVyIiBkYXRhLWV4cGVjdGVkLXdp
ZHRoPSI0ODAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNjUiPgotICAgIDxkaXYgY2xhc3M9Imdy
aWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNTUiPgotICAgICAg
ICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRh
LW9mZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29s
dW1uIGFsaWduU2VsZkJhc2VsaW5lIHRhcmdldCIgc3R5bGU9IndpZHRoOiAxMDBweDsgaGVpZ2h0
OiAyMHB4OyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAg
ICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRh
dGEtb2Zmc2V0LXk9IjEwIj48L2Rpdj4KLSAgICA8L2Rpdj4KLSAgICA8ZGl2IGNsYXNzPSJncmlk
IHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjE2MCIgZGF0YS1vZmZzZXQteT0iNDAiPgotICAgICAg
ICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4gc3R5bGUyIiBzdHlsZT0iYWxpZ24tc2Vs
ZjogbGFzdCBiYXNlbGluZSIgZGF0YS1vZmZzZXQteD0iMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYg
Y2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHls
ZT0id2lkdGg6IDUwcHg7IGhlaWdodDogNTBweDsiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zm
c2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4i
IGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAgICA8L2Rpdj4K
LSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjMyMCIgZGF0YS1v
ZmZzZXQteT0iMCI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90aENvbHVtbiIgZGF0
YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAgICA8ZGl2IGNs
YXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15
PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIGFsaWdu
U2VsZkJhc2VsaW5lIHRhcmdldCIgc3R5bGU9IndpZHRoOiA0MHB4OyBoZWlnaHQ6IDgwcHg7IiBk
YXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0gICAgPC9kaXY+Ci08
L2Rpdj4KLW9mZnNldFRvcCBleHBlY3RlZCA0MCBidXQgZ290IDUwCitQQVNTIC5ncmlkLCBjb250
YWluZXIgMTEKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxMgogUEFTUyAuZ3JpZCwgY29udGFpbmVy
IDEzCiBQQVNTIC5ncmlkLCBjb250YWluZXIgMTQK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426665</attachid>
            <date>2021-04-21 03:36:44 -0700</date>
            <delta_ts>2021-04-21 04:21:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224538-20210421113643.patch</filename>
            <type>text/plain</type>
            <size>8774</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzFkNTgxNjYxOThl
ZGY1YmMwZDEwNjM3ZTQ5ZjI2NmQwOGY4NC4uM2Y2YTJlNmI1OTAwMTdkMTc3MjM2OTg2YTU0Zjc3
ZjRkNTY3MTU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTE0ICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBsYXN0LWJhc2Vs
aW5lIHNob3VsZG4ndCBhZmZlY3QgYmFzZWxpbmUgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzgKKworICAgICAgICBSZXZpZXdl
ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBY2NvcmRpbmcgdG8gZGlzY3Vzc2lvbnMgYXQg
aHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzUyOTMsCisgICAgICAg
ICJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIGJh
c2VsaW5lIGFsaWdubWVudCBpbgorICAgICAgICBmaXJzdCByb3cuIFRoaXMgY2hhbmdlIGlzIHRv
IG1ha2Ugc3VyZSB0aGlzIGlzIGNoZWNrZWQgd2hpbGUgZGVjaWRpbmcKKyAgICAgICAgd2hldGhl
ciBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBhbGlnbm1lbnQuICAKKworICAgICAg
ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy
aWQ6OmZpcnN0TGluZUJhc2VsaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdy
aWQ6OmlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCBjb25zdCk6CisKIDIwMjEtMDQtMTQgIENh
cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIERvIG5v
dCByZXNldCBjb21wdXRlZCBzdHlsZSBmb3IgZWxlbWVudCBjaGlsZHJlbiB3aXRoIGRpc3BsYXkg
Y29udGVudHMgc3R5bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Hcmlk
QmFzZWxpbmVBbGlnbm1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkQmFzZWxp
bmVBbGlnbm1lbnQuaAppbmRleCA1OGUzZmM2YmMxYmVmOGEzYThmN2M0MzZlYmM0YmNlZmNkNGY0
OWYzLi4zMGUwZWM4ZmNkYjQwYTBlM2YyZTAwN2RhNjY0OTBiZjlkMDc3YzVlIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZEJhc2VsaW5lQWxpZ25tZW50LmgKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRCYXNlbGluZUFsaWdubWVudC5oCkBAIC0xMTgs
MTEgKzExOCwxOCBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxCYXNlbGluZUdyb3VwPiBtX3NoYXJl
ZEdyb3VwczsKIH07CiAKK2VudW0gQWxsb3dlZEJhc2VMaW5lIHtGaXJzdExpbmUsIExhc3RMaW5l
LCBCb3RoTGluZXN9OworCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNCYXNlbGluZVBvc2l0aW9uKEl0
ZW1Qb3NpdGlvbiBwb3NpdGlvbikKIHsKICAgICByZXR1cm4gcG9zaXRpb24gPT0gSXRlbVBvc2l0
aW9uOjpCYXNlbGluZSB8fCBwb3NpdGlvbiA9PSBJdGVtUG9zaXRpb246Okxhc3RCYXNlbGluZTsK
IH0KIAorc3RhdGljIGlubGluZSBib29sIGlzRmlyc3RCYXNlbGluZVBvc2l0aW9uKEl0ZW1Qb3Np
dGlvbiBwb3NpdGlvbikKK3sKKyAgICByZXR1cm4gcG9zaXRpb24gPT0gSXRlbVBvc2l0aW9uOjpC
YXNlbGluZTsKK30KKwogLy8gVGhpcyBpcyB0aGUgY2xhc3MgdGhhdCBpbXBsZW1lbnRzIHRoZSBC
YXNlbGluZSBBbGlnbm1lbnQgbG9naWMsIHVzaW5nIGludGVybmFsbHkgdGhlIEJhc2VsaW5lQ29u
dGV4dCBhbmQKIC8vIEJhc2VsaW5lR3JvdXBkIGNsYXNzZXMgKGRlc2NyaWJlZCBhYm92ZSkuCiAv
LwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGVmNTA3Njg1NTdk
ZGI0Njk4NTQ4MzM1YjQ3MmRkMDZhZThlYjliMWMuLjYzZTFmMjdkZTFkMTlkMzEwNDAzYTQwNmYy
YjAyMWNlZTNlZTg0YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAK
QEAgLTEyMzcsMTMgKzEyMzcsMTQgQEAgYm9vbCBSZW5kZXJHcmlkOjppc0Jhc2VsaW5lQWxpZ25t
ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICByZXR1cm4gaXNC
YXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNoaWxkLCBHcmlkUm93QXhpcykgfHwgaXNCYXNlbGlu
ZUFsaWdubWVudEZvckNoaWxkKGNoaWxkLCBHcmlkQ29sdW1uQXhpcyk7CiB9CiAKLWJvb2wgUmVu
ZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hp
bGQsIEdyaWRBeGlzIGJhc2VsaW5lQXhpcykgY29uc3QKK2Jvb2wgUmVuZGVyR3JpZDo6aXNCYXNl
bGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIEdyaWRBeGlzIGJh
c2VsaW5lQXhpcywgQWxsb3dlZEJhc2VMaW5lIGFsbG93ZWQpIGNvbnN0CiB7CiAgICAgaWYgKGNo
aWxkLmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg
SXRlbVBvc2l0aW9uIGFsaWduID0gc2VsZkFsaWdubWVudEZvckNoaWxkKGJhc2VsaW5lQXhpcywg
Y2hpbGQpLnBvc2l0aW9uKCk7CiAgICAgYm9vbCBoYXNBdXRvTWFyZ2lucyA9IGJhc2VsaW5lQXhp
cyA9PSBHcmlkQ29sdW1uQXhpcyA/IGhhc0F1dG9NYXJnaW5zSW5Db2x1bW5BeGlzKGNoaWxkKSA6
IGhhc0F1dG9NYXJnaW5zSW5Sb3dBeGlzKGNoaWxkKTsKLSAgICByZXR1cm4gaXNCYXNlbGluZVBv
c2l0aW9uKGFsaWduKSAmJiAhaGFzQXV0b01hcmdpbnM7CisgICAgYm9vbCBpc0Jhc2VsaW5lID0g
YWxsb3dlZCA9PSBGaXJzdExpbmU/IGlzRmlyc3RCYXNlbGluZVBvc2l0aW9uKGFsaWduKSA6IGlz
QmFzZWxpbmVQb3NpdGlvbihhbGlnbik7CisgICAgcmV0dXJuIGlzQmFzZWxpbmUgJiYgIWhhc0F1
dG9NYXJnaW5zOwogfQogCiAvLyBGSVhNRTogVGhpcyBsb2dpYyBpcyBzaGFyZWQgYnkgUmVuZGVy
RmxleGlibGVCb3gsIHNvIGl0IG1pZ2h0IGJlIHJlZmFjdG9yZWQgc29tZWhvdy4KQEAgLTEyNjks
NyArMTI3MCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckdyaWQ6OmZpcnN0TGluZUJh
c2VsaW5lKCkgY29uc3QKICAgICAgICAgZm9yIChhdXRvJiBjaGlsZCA6IG1fZ3JpZC5jZWxsKDAs
IGNvbHVtbikpIHsKICAgICAgICAgICAgIEFTU0VSVChjaGlsZC5nZXQoKSk7CiAgICAgICAgICAg
ICAvLyBJZiBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBhbGlnbm1lbnQsIHdlIHNl
bGVjdCBzdWNoIGl0ZW0uCi0gICAgICAgICAgICBpZiAoaXNCYXNlbGluZUFsaWdubWVudEZvckNo
aWxkKCpjaGlsZCkpIHsKKyAgICAgICAgICAgIGlmIChpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hp
bGQoKmNoaWxkLCBHcmlkQ29sdW1uQXhpcywgRmlyc3RMaW5lKSkgewogICAgICAgICAgICAgICAg
IC8vIEZJWE1FOiBzZWxmLWJhc2VsaW5lIGFuZCBjb250ZW50LWJhc2VsaW5lIGFsaWdubWVudCBu
b3QgaW1wbGVtZW50ZWQgeWV0LgogICAgICAgICAgICAgICAgIGJhc2VsaW5lQ2hpbGQgPSBjaGls
ZC5nZXQoKTsKICAgICAgICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD
b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyR3JpZC5oCmluZGV4IDFkYmU5MWM3OGU2ZjZmNDA4NGIwNmQ0OWI0ZTAzMmM4NDFlN2Q0Y2Uu
LmVmYjEwNjQzM2I0NzM1MGYxYjMxOWM4M2YwNmFmNGQ0ZjIwZWFjODkgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtNzYsNyArNzYsNyBAQCBwdWJsaWM6CiAKICAgICB2
b2lkIHVwZGF0ZUdyaWRBcmVhTG9naWNhbFNpemUoUmVuZGVyQm94JiwgT3B0aW9uYWw8TGF5b3V0
VW5pdD4gd2lkdGgsIE9wdGlvbmFsPExheW91dFVuaXQ+IGhlaWdodCkgY29uc3Q7CiAgICAgYm9v
bCBpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7Ci0g
ICAgYm9vbCBpc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiwgR3Jp
ZEF4aXMpIGNvbnN0OworICAgIGJvb2wgaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0
IFJlbmRlckJveCYgY2hpbGQsIEdyaWRBeGlzLCBBbGxvd2VkQmFzZUxpbmUgPSBCb3RoTGluZXMp
IGNvbnN0OwogCiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBzZWxmQWxpZ25tZW50Rm9yQ2hp
bGQoR3JpZEF4aXMsIGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFJlbmRlclN0eWxlKiA9IG51bGxw
dHIpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdl
TG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAxMzZmMWM1MzZl
NjVhMWYyYTMzMjZjMGYyMjU1MDdiNTQ2NDI3ODQ5Li4xNGU2OGRlYzNlZDg0NjM5OTVmNDViYWEz
OGZhODY3OGU5MzFhMTRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hh
bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyAr
MSwxMiBAQAorMjAyMS0wNC0xNCAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgorCisgICAg
ICAgIFtjc3MtZ3JpZF0gbGFzdC1iYXNlbGluZSBzaG91bGRuJ3QgYWZmZWN0IGJhc2VsaW5lIGFs
aWdubWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjI0NTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiB3
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLTAw
NC1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDQtMTMgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNv
bT4KIAogICAgICAgICBbY3NzLWdyaWRdIEluY29ycmVjdCB0cmFjayBzaXppbmcgd2hlbiB1c2lu
ZyByZWxhdGl2ZSBzaXplZCBpdGVtcyBpbiAnYXV0bycgY29sdW1uIHRyYWNrcwpkaWZmIC0tZ2l0
IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdy
aWQvYWxpZ25tZW50L2dyaWQtYmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9n
cmlkLWJhc2VsaW5lLTAwNC1leHBlY3RlZC50eHQKaW5kZXggMTgzYWEzNjFlOWRjMGIzZjI1NDM0
ZTI1YTYzZTgyYjU1NTUzZTRiYi4uYzE2YWRkNGJhYmE4NzNkOTRjMDNhYzA4M2NmM2EzNzcwMDFh
Nzc5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQtYmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4
dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0ZWQudHh0CkBAIC01LDQ3
ICs1LDExIEBAIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAzCiBQQVNTIC5ncmlkLCBjb250YWluZXIg
NAogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDUKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciA2Ci1GQUlM
IC5ncmlkLCBjb250YWluZXIgNyBhc3NlcnRfZXF1YWxzOgotPGRpdiBjbGFzcz0iY29udGFpbmVy
IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0ODAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNjUiPgot
ICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZz
ZXQteT0iNDAiPgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIHRhcmdl
dCIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCI+PC9kaXY+Ci0gICAgICAgIDxk
aXYgY2xhc3M9ImZpcnN0Um93Qm90aENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZz
ZXQteT0iMTUiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4g
c3R5bGUyIiBzdHlsZT0iYWxpZ24tc2VsZjogbGFzdCBiYXNlbGluZSIgZGF0YS1vZmZzZXQteD0i
MCI+PC9kaXY+Ci0gICAgPC9kaXY+Ci0gICAgPGRpdiBjbGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRh
LW9mZnNldC14PSIxNjAiIGRhdGEtb2Zmc2V0LXk9IjAiPgotICAgICAgICA8ZGl2IGNsYXNzPSJi
b3RoUm93Rmlyc3RDb2x1bW4gdGFyZ2V0IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15
PSIxMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRh
dGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNs
YXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9
IjE1Ij48L2Rpdj4KLSAgICA8L2Rpdj4KLSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRh
dGEtb2Zmc2V0LXg9IjMyMCIgZGF0YS1vZmZzZXQteT0iNTUiPgotICAgICAgICA8ZGl2IGNsYXNz
PSJmaXJzdFJvd0JvdGhDb2x1bW4gdGFyZ2V0IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNl
dC15PSIxNSI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4i
IGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2
IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0
LXk9IjEwIj48L2Rpdj4KLSAgICA8L2Rpdj4KLTwvZGl2Pgotb2Zmc2V0VG9wIGV4cGVjdGVkIDQw
IGJ1dCBnb3QgNTAKK1BBU1MgLmdyaWQsIGNvbnRhaW5lciA3CiBQQVNTIC5ncmlkLCBjb250YWlu
ZXIgOAogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDkKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxMAot
RkFJTCAuZ3JpZCwgY29udGFpbmVyIDExIGFzc2VydF9lcXVhbHM6Ci08ZGl2IGNsYXNzPSJjb250
YWluZXIiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQ4MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE2
NSI+Ci0gICAgPGRpdiBjbGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIwIiBkYXRh
LW9mZnNldC15PSI1NSI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4i
IGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2
IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHls
ZT0id2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDIwcHg7IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9m
ZnNldC15PSIxNSI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImJvdGhSb3dGaXJzdENvbHVt
biIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTAiPjwvZGl2PgotICAgIDwvZGl2
PgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMTYwIiBkYXRh
LW9mZnNldC15PSI0MCI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImJvdGhSb3dGaXJzdENvbHVtbiBz
dHlsZTIiIHN0eWxlPSJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBkYXRhLW9mZnNldC14PSIw
Ij48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dGaXJzdENvbHVtbiBhbGlnblNl
bGZCYXNlbGluZSB0YXJnZXQiIHN0eWxlPSJ3aWR0aDogNTBweDsgaGVpZ2h0OiA1MHB4OyIgZGF0
YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCI+PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xh
c3M9ImZpcnN0Um93Qm90aENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0i
MTUiPjwvZGl2PgotICAgIDwvZGl2PgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0
YS1vZmZzZXQteD0iMzIwIiBkYXRhLW9mZnNldC15PSIwIj4KLSAgICAgICAgPGRpdiBjbGFzcz0i
Zmlyc3RSb3dCb3RoQ29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+
PC9kaXY+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zm
c2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJi
b3RoUm93Rmlyc3RDb2x1bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFyZ2V0IiBzdHlsZT0id2lkdGg6
IDQwcHg7IGhlaWdodDogODBweDsiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjEw
Ij48L2Rpdj4KLSAgICA8L2Rpdj4KLTwvZGl2Pgotb2Zmc2V0VG9wIGV4cGVjdGVkIDQwIGJ1dCBn
b3QgNTAKK1BBU1MgLmdyaWQsIGNvbnRhaW5lciAxMQogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDEy
CiBQQVNTIC5ncmlkLCBjb250YWluZXIgMTMKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxNAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426670</attachid>
            <date>2021-04-21 04:22:01 -0700</date>
            <delta_ts>2021-04-21 06:34:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224538-20210421122159.patch</filename>
            <type>text/plain</type>
            <size>8817</size>
            <attacher>zsun</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzFkNTgxNjYxOThl
ZGY1YmMwZDEwNjM3ZTQ5ZjI2NmQwOGY4NC4uN2M1YTJiZWZjYzJjNzE1YzkxNTliODZmOGEyYzZl
N2FlMjRhZDNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTE0ICBaaXJh
biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBsYXN0LWJhc2Vs
aW5lIHNob3VsZG4ndCBhZmZlY3QgYmFzZWxpbmUgYWxpZ25tZW50CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1MzgKKworICAgICAgICBSZXZpZXdl
ZCBieSBEYXJpbiBBZGxlciBhbmQgSmF2aWVyIEZlcm5hbmRlei4KKworICAgICAgICBBY2NvcmRp
bmcgdG8gZGlzY3Vzc2lvbnMgYXQgaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMv
aXNzdWVzLzUyOTMsCisgICAgICAgICJhbGlnbi1zZWxmOiBsYXN0IGJhc2VsaW5lIiBzaG91bGQg
bm90IGludGVyZmVyZSB3aXRoIGJhc2VsaW5lIGFsaWdubWVudCBpbgorICAgICAgICBmaXJzdCBy
b3cuIFRoaXMgY2hhbmdlIGlzIHRvIG1ha2Ugc3VyZSB0aGlzIGlzIGNoZWNrZWQgd2hpbGUgZGVj
aWRpbmcKKyAgICAgICAgd2hldGhlciBhbiBpdGVtIHBhcnRpY2lwYXRlcyBpbiBiYXNlbGluZSBh
bGlnbm1lbnQuICAKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmZpcnN0TGluZUJhc2VsaW5lIGNvbnN0KToKKyAgICAg
ICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmlzQmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCBjb25z
dCk6CisKIDIwMjEtMDQtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu
Y29tPgogCiAgICAgICAgIERvIG5vdCByZXNldCBjb21wdXRlZCBzdHlsZSBmb3IgZWxlbWVudCBj
aGlsZHJlbiB3aXRoIGRpc3BsYXkgY29udGVudHMgc3R5bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9HcmlkQmFzZWxpbmVBbGlnbm1lbnQuaCBiL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9HcmlkQmFzZWxpbmVBbGlnbm1lbnQuaAppbmRleCA1OGUzZmM2YmMxYmVmOGEz
YThmN2M0MzZlYmM0YmNlZmNkNGY0OWYzLi4zMGUwZWM4ZmNkYjQwYTBlM2YyZTAwN2RhNjY0OTBi
ZjlkMDc3YzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZEJhc2Vs
aW5lQWxpZ25tZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRCYXNlbGlu
ZUFsaWdubWVudC5oCkBAIC0xMTgsMTEgKzExOCwxOCBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxC
YXNlbGluZUdyb3VwPiBtX3NoYXJlZEdyb3VwczsKIH07CiAKK2VudW0gQWxsb3dlZEJhc2VMaW5l
IHtGaXJzdExpbmUsIExhc3RMaW5lLCBCb3RoTGluZXN9OworCiBzdGF0aWMgaW5saW5lIGJvb2wg
aXNCYXNlbGluZVBvc2l0aW9uKEl0ZW1Qb3NpdGlvbiBwb3NpdGlvbikKIHsKICAgICByZXR1cm4g
cG9zaXRpb24gPT0gSXRlbVBvc2l0aW9uOjpCYXNlbGluZSB8fCBwb3NpdGlvbiA9PSBJdGVtUG9z
aXRpb246Okxhc3RCYXNlbGluZTsKIH0KIAorc3RhdGljIGlubGluZSBib29sIGlzRmlyc3RCYXNl
bGluZVBvc2l0aW9uKEl0ZW1Qb3NpdGlvbiBwb3NpdGlvbikKK3sKKyAgICByZXR1cm4gcG9zaXRp
b24gPT0gSXRlbVBvc2l0aW9uOjpCYXNlbGluZTsKK30KKwogLy8gVGhpcyBpcyB0aGUgY2xhc3Mg
dGhhdCBpbXBsZW1lbnRzIHRoZSBCYXNlbGluZSBBbGlnbm1lbnQgbG9naWMsIHVzaW5nIGludGVy
bmFsbHkgdGhlIEJhc2VsaW5lQ29udGV4dCBhbmQKIC8vIEJhc2VsaW5lR3JvdXBkIGNsYXNzZXMg
KGRlc2NyaWJlZCBhYm92ZSkuCiAvLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu
Y3BwCmluZGV4IGVmNTA3Njg1NTdkZGI0Njk4NTQ4MzM1YjQ3MmRkMDZhZThlYjliMWMuLjBjYWFk
NmM1YmM2OGNiMjA0ZWExZDQzZDE3NDY5MmU2NjYyMGE2MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTEyMzcsMTMgKzEyMzcsMTQgQEAgYm9vbCBSZW5kZXJH
cmlkOjppc0Jhc2VsaW5lQWxpZ25tZW50Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkg
Y29uc3QKICAgICByZXR1cm4gaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNoaWxkLCBHcmlk
Um93QXhpcykgfHwgaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNoaWxkLCBHcmlkQ29sdW1u
QXhpcyk7CiB9CiAKLWJvb2wgUmVuZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIEdyaWRBeGlzIGJhc2VsaW5lQXhpcykgY29uc3QKK2Jv
b2wgUmVuZGVyR3JpZDo6aXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0IFJlbmRlckJv
eCYgY2hpbGQsIEdyaWRBeGlzIGJhc2VsaW5lQXhpcywgQWxsb3dlZEJhc2VMaW5lIGFsbG93ZWQp
IGNvbnN0CiB7CiAgICAgaWYgKGNoaWxkLmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQogICAgICAg
ICByZXR1cm4gZmFsc2U7CiAgICAgSXRlbVBvc2l0aW9uIGFsaWduID0gc2VsZkFsaWdubWVudEZv
ckNoaWxkKGJhc2VsaW5lQXhpcywgY2hpbGQpLnBvc2l0aW9uKCk7CiAgICAgYm9vbCBoYXNBdXRv
TWFyZ2lucyA9IGJhc2VsaW5lQXhpcyA9PSBHcmlkQ29sdW1uQXhpcyA/IGhhc0F1dG9NYXJnaW5z
SW5Db2x1bW5BeGlzKGNoaWxkKSA6IGhhc0F1dG9NYXJnaW5zSW5Sb3dBeGlzKGNoaWxkKTsKLSAg
ICByZXR1cm4gaXNCYXNlbGluZVBvc2l0aW9uKGFsaWduKSAmJiAhaGFzQXV0b01hcmdpbnM7Cisg
ICAgYm9vbCBpc0Jhc2VsaW5lID0gYWxsb3dlZCA9PSBGaXJzdExpbmUgPyBpc0ZpcnN0QmFzZWxp
bmVQb3NpdGlvbihhbGlnbikgOiBpc0Jhc2VsaW5lUG9zaXRpb24oYWxpZ24pOworICAgIHJldHVy
biBpc0Jhc2VsaW5lICYmICFoYXNBdXRvTWFyZ2luczsKIH0KIAogLy8gRklYTUU6IFRoaXMgbG9n
aWMgaXMgc2hhcmVkIGJ5IFJlbmRlckZsZXhpYmxlQm94LCBzbyBpdCBtaWdodCBiZSByZWZhY3Rv
cmVkIHNvbWVob3cuCkBAIC0xMjY5LDcgKzEyNzAsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBS
ZW5kZXJHcmlkOjpmaXJzdExpbmVCYXNlbGluZSgpIGNvbnN0CiAgICAgICAgIGZvciAoYXV0byYg
Y2hpbGQgOiBtX2dyaWQuY2VsbCgwLCBjb2x1bW4pKSB7CiAgICAgICAgICAgICBBU1NFUlQoY2hp
bGQuZ2V0KCkpOwogICAgICAgICAgICAgLy8gSWYgYW4gaXRlbSBwYXJ0aWNpcGF0ZXMgaW4gYmFz
ZWxpbmUgYWxpZ25tZW50LCB3ZSBzZWxlY3Qgc3VjaCBpdGVtLgotICAgICAgICAgICAgaWYgKGlz
QmFzZWxpbmVBbGlnbm1lbnRGb3JDaGlsZCgqY2hpbGQpKSB7CisgICAgICAgICAgICBpZiAoaXNC
YXNlbGluZUFsaWdubWVudEZvckNoaWxkKCpjaGlsZCwgR3JpZENvbHVtbkF4aXMsIEZpcnN0TGlu
ZSkpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogc2VsZi1iYXNlbGluZSBhbmQgY29udGVu
dC1iYXNlbGluZSBhbGlnbm1lbnQgbm90IGltcGxlbWVudGVkIHlldC4KICAgICAgICAgICAgICAg
ICBiYXNlbGluZUNoaWxkID0gY2hpbGQuZ2V0KCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCAxZGJlOTFjNzhlNmY2ZjQwODRi
MDZkNDliNGUwMzJjODQxZTdkNGNlLi5lZmIxMDY0MzNiNDczNTBmMWIzMTljODNmMDZhZjRkNGYy
MGVhYzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5o
CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTc2LDcgKzc2
LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCB1cGRhdGVHcmlkQXJlYUxvZ2ljYWxTaXplKFJlbmRl
ckJveCYsIE9wdGlvbmFsPExheW91dFVuaXQ+IHdpZHRoLCBPcHRpb25hbDxMYXlvdXRVbml0PiBo
ZWlnaHQpIGNvbnN0OwogICAgIGJvb2wgaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxkKGNvbnN0
IFJlbmRlckJveCYpIGNvbnN0OwotICAgIGJvb2wgaXNCYXNlbGluZUFsaWdubWVudEZvckNoaWxk
KGNvbnN0IFJlbmRlckJveCYsIEdyaWRBeGlzKSBjb25zdDsKKyAgICBib29sIGlzQmFzZWxpbmVB
bGlnbm1lbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBHcmlkQXhpcywgQWxsb3dl
ZEJhc2VMaW5lID0gQm90aExpbmVzKSBjb25zdDsKIAogICAgIFN0eWxlU2VsZkFsaWdubWVudERh
dGEgc2VsZkFsaWdubWVudEZvckNoaWxkKEdyaWRBeGlzLCBjb25zdCBSZW5kZXJCb3gmLCBjb25z
dCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu
Z2VMb2cKaW5kZXggMTM2ZjFjNTM2ZTY1YTFmMmEzMzI2YzBmMjI1NTA3YjU0NjQyNzg0OS4uNWEw
YTAxMGI2ODQyZDhlNjU1NjNhMzRjZjI2Y2YyM2Y0ZTViMjBhMiAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93
M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDQtMTQgIFppcmFuIFN1biAgPHpz
dW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWdyaWRdIGxhc3QtYmFzZWxpbmUgc2hvdWxk
bid0IGFmZmVjdCBiYXNlbGluZSBhbGlnbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDUzOAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu
IEFkbGVyIGFuZCBKYXZpZXIgRmVybmFuZGV6LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0wMDQtZXhwZWN0ZWQudHh0
OgorCiAyMDIxLTA0LTEzICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAg
W2Nzcy1ncmlkXSBJbmNvcnJlY3QgdHJhY2sgc2l6aW5nIHdoZW4gdXNpbmcgcmVsYXRpdmUgc2l6
ZWQgaXRlbXMgaW4gJ2F1dG8nIGNvbHVtbiB0cmFja3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9n
cmlkLWJhc2VsaW5lLTAwNC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS0w
MDQtZXhwZWN0ZWQudHh0CmluZGV4IDE4M2FhMzYxZTlkYzBiM2YyNTQzNGUyNWE2M2U4MmI1NTU1
M2U0YmIuLmMxNmFkZDRiYWJhODczZDk0YzAzYWMwODNjZjNhMzc3MDAxYTc3OWEgMTAwNjQ0Ci0t
LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1n
cmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLTAwNC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0
VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25t
ZW50L2dyaWQtYmFzZWxpbmUtMDA0LWV4cGVjdGVkLnR4dApAQCAtNSw0NyArNSwxMSBAQCBQQVNT
IC5ncmlkLCBjb250YWluZXIgMwogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDQKIFBBU1MgLmdyaWQs
IGNvbnRhaW5lciA1CiBQQVNTIC5ncmlkLCBjb250YWluZXIgNgotRkFJTCAuZ3JpZCwgY29udGFp
bmVyIDcgYXNzZXJ0X2VxdWFsczoKLTxkaXYgY2xhc3M9ImNvbnRhaW5lciIgZGF0YS1leHBlY3Rl
ZC13aWR0aD0iNDgwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTY1Ij4KLSAgICA8ZGl2IGNsYXNz
PSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjQwIj4KLSAg
ICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dGaXJzdENvbHVtbiB0YXJnZXQiIGRhdGEtb2Zmc2V0
LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJz
dFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rp
dj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29sdW1uIHN0eWxlMiIgc3R5bGU9
ImFsaWduLXNlbGY6IGxhc3QgYmFzZWxpbmUiIGRhdGEtb2Zmc2V0LXg9IjAiPjwvZGl2PgotICAg
IDwvZGl2PgotICAgIDxkaXYgY2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMTYw
IiBkYXRhLW9mZnNldC15PSIwIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29s
dW1uIHRhcmdldCIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTAiPjwvZGl2Pgot
ICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIw
IiBkYXRhLW9mZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dC
b3RoQ29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNSI+PC9kaXY+Ci0g
ICAgPC9kaXY+Ci0gICAgPGRpdiBjbGFzcz0iZ3JpZCB0d29Sb3dzIiBkYXRhLW9mZnNldC14PSIz
MjAiIGRhdGEtb2Zmc2V0LXk9IjU1Ij4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3Ro
Q29sdW1uIHRhcmdldCIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2
PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14
PSIwIiBkYXRhLW9mZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJv
d0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+
Ci0gICAgPC9kaXY+Ci08L2Rpdj4KLW9mZnNldFRvcCBleHBlY3RlZCA0MCBidXQgZ290IDUwCitQ
QVNTIC5ncmlkLCBjb250YWluZXIgNwogUEFTUyAuZ3JpZCwgY29udGFpbmVyIDgKIFBBU1MgLmdy
aWQsIGNvbnRhaW5lciA5CiBQQVNTIC5ncmlkLCBjb250YWluZXIgMTAKLUZBSUwgLmdyaWQsIGNv
bnRhaW5lciAxMSBhc3NlcnRfZXF1YWxzOgotPGRpdiBjbGFzcz0iY29udGFpbmVyIiBkYXRhLWV4
cGVjdGVkLXdpZHRoPSI0ODAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNjUiPgotICAgIDxkaXYg
Y2xhc3M9ImdyaWQgdHdvUm93cyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNTUi
PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14
PSIwIiBkYXRhLW9mZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iZmlyc3RS
b3dCb3RoQ29sdW1uIGFsaWduU2VsZkJhc2VsaW5lIHRhcmdldCIgc3R5bGU9IndpZHRoOiAxMDBw
eDsgaGVpZ2h0OiAyMHB4OyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwv
ZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0
LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjEwIj48L2Rpdj4KLSAgICA8L2Rpdj4KLSAgICA8ZGl2IGNs
YXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjE2MCIgZGF0YS1vZmZzZXQteT0iNDAi
PgotICAgICAgICA8ZGl2IGNsYXNzPSJib3RoUm93Rmlyc3RDb2x1bW4gc3R5bGUyIiBzdHlsZT0i
YWxpZ24tc2VsZjogbGFzdCBiYXNlbGluZSIgZGF0YS1vZmZzZXQteD0iMCI+PC9kaXY+Ci0gICAg
ICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmlyc3RDb2x1bW4gYWxpZ25TZWxmQmFzZWxpbmUgdGFy
Z2V0IiBzdHlsZT0id2lkdGg6IDUwcHg7IGhlaWdodDogNTBweDsiIGRhdGEtb2Zmc2V0LXg9IjAi
IGRhdGEtb2Zmc2V0LXk9IjAiPjwvZGl2PgotICAgICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0Jv
dGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1Ij48L2Rpdj4KLSAg
ICA8L2Rpdj4KLSAgICA8ZGl2IGNsYXNzPSJncmlkIHR3b1Jvd3MiIGRhdGEtb2Zmc2V0LXg9IjMy
MCIgZGF0YS1vZmZzZXQteT0iMCI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90aENv
bHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMTUiPjwvZGl2PgotICAgICAg
ICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRh
LW9mZnNldC15PSIwIj48L2Rpdj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYm90aFJvd0ZpcnN0Q29s
dW1uIGFsaWduU2VsZkJhc2VsaW5lIHRhcmdldCIgc3R5bGU9IndpZHRoOiA0MHB4OyBoZWlnaHQ6
IDgwcHg7IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxMCI+PC9kaXY+Ci0gICAg
PC9kaXY+Ci08L2Rpdj4KLW9mZnNldFRvcCBleHBlY3RlZCA0MCBidXQgZ290IDUwCitQQVNTIC5n
cmlkLCBjb250YWluZXIgMTEKIFBBU1MgLmdyaWQsIGNvbnRhaW5lciAxMgogUEFTUyAuZ3JpZCwg
Y29udGFpbmVyIDEzCiBQQVNTIC5ncmlkLCBjb250YWluZXIgMTQK
</data>

          </attachment>
      

    </bug>

</bugzilla>