<?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>228283</bug_id>
          
          <creation_ts>2021-07-26 09:34:18 -0700</creation_ts>
          <short_desc>Fix aspect-ratio-intrinsic-size-004.html</short_desc>
          <delta_ts>2021-09-10 05:23:25 -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 name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>clopez</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>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1779461</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-26 09:34:18 -0700</bug_when>
    <thetext>Fix aspect-ratio-intrinsic-size-00?.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779462</commentid>
    <comment_count>1</comment_count>
      <attachid>434211</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-26 09:36:07 -0700</bug_when>
    <thetext>Created attachment 434211
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779464</commentid>
    <comment_count>2</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-26 09:38:14 -0700</bug_when>
    <thetext>Rough fix for now, I hope this bug could also fix aspect-ratio-intrinsic-size-005.html.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779702</commentid>
    <comment_count>3</comment_count>
      <attachid>434275</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-27 00:47:58 -0700</bug_when>
    <thetext>Created attachment 434275
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779719</commentid>
    <comment_count>4</comment_count>
      <attachid>434281</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-27 04:29:22 -0700</bug_when>
    <thetext>Created attachment 434281
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779720</commentid>
    <comment_count>5</comment_count>
      <attachid>434282</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-27 04:32:47 -0700</bug_when>
    <thetext>Created attachment 434282
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1779723</commentid>
    <comment_count>6</comment_count>
      <attachid>434283</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-07-27 04:48:41 -0700</bug_when>
    <thetext>Created attachment 434283
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781268</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-02 09:35:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/81415269&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784353</commentid>
    <comment_count>8</comment_count>
      <attachid>435550</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-14 13:56:45 -0700</bug_when>
    <thetext>Created attachment 435550
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1784365</commentid>
    <comment_count>9</comment_count>
      <attachid>435557</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-14 22:52:18 -0700</bug_when>
    <thetext>Created attachment 435557
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1787976</commentid>
    <comment_count>10</comment_count>
      <attachid>436615</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-27 02:19:19 -0700</bug_when>
    <thetext>Created attachment 436615
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1787987</commentid>
    <comment_count>11</comment_count>
      <attachid>436617</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-27 03:57:42 -0700</bug_when>
    <thetext>Created attachment 436617
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1787993</commentid>
    <comment_count>12</comment_count>
      <attachid>436618</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-27 05:15:17 -0700</bug_when>
    <thetext>Created attachment 436618
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1787994</commentid>
    <comment_count>13</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2021-08-27 05:16:10 -0700</bug_when>
    <thetext>This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788035</commentid>
    <comment_count>14</comment_count>
      <attachid>436633</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-27 09:21:25 -0700</bug_when>
    <thetext>Created attachment 436633
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788452</commentid>
    <comment_count>15</comment_count>
      <attachid>436759</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-30 00:40:20 -0700</bug_when>
    <thetext>Created attachment 436759
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788453</commentid>
    <comment_count>16</comment_count>
      <attachid>436759</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-08-30 01:14:12 -0700</bug_when>
    <thetext>Comment on attachment 436759
Patch

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

I&apos;ve serious doubts about two call sites added by this patch  and thus the r-.

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:353
&gt; +    dirtyForLayoutFromPercentageHeightDescendants();

This looks pretty interesting indeed. I haven&apos;t realized before that it&apos;s only called from RenderBlockFlow and thus never for flexboxes. I wonder whether we should call it from RenderFlexibleBox::layoutAndPlaceChildren() to kind of mimic the location where it&apos;s called in RenderBlockFlow...

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:966
&gt; +            return percentageLogicalHeightIsResolvable();

Hmm I am not sure we could call percentageLogicalHeightIsResolvable() here. This method could start the following sequence:

percentageLogicalHeightIsResolvable()-&gt;computePercentageLogicalHeight()-&gt;availableLogicalHeightForPercentageComputation()-&gt;useChildOverridingLogicalHeightForPercentageResolution()-&gt;useChildOverridingMainSizeForPercentageResolution()-&gt;canComputePercentageFlexBasis()-&gt;computePercentageLogicalHeight()-&gt;availableLogicalHeightForPercentageComputation() ...

entering a loop of calls. Do you have a test for this case?

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1056
&gt; +            addPercentHeightDescendant(*child);

Doesn&apos;t look 100% correct. A content dependent size (like min-content, max-content etc...) isn&apos;t also definite but it isn&apos;t a percentage.

Also it shouldn&apos;t be really called from RenderFlexibleBox, looks something we&apos;re missing in RenderBox to handle the case of items with aspect ratio.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788847</commentid>
    <comment_count>17</comment_count>
      <attachid>436867</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-31 03:12:38 -0700</bug_when>
    <thetext>Created attachment 436867
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788880</commentid>
    <comment_count>18</comment_count>
      <attachid>436879</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-08-31 05:56:21 -0700</bug_when>
    <thetext>Created attachment 436879
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789272</commentid>
    <comment_count>19</comment_count>
      <attachid>437004</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-01 02:28:52 -0700</bug_when>
    <thetext>Created attachment 437004
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789664</commentid>
    <comment_count>20</comment_count>
      <attachid>437136</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-02 04:42:43 -0700</bug_when>
    <thetext>Created attachment 437136
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1789770</commentid>
    <comment_count>21</comment_count>
      <attachid>437165</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-02 10:25:28 -0700</bug_when>
    <thetext>Created attachment 437165
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1790292</commentid>
    <comment_count>22</comment_count>
      <attachid>437297</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-03 12:37:02 -0700</bug_when>
    <thetext>Created attachment 437297
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1790911</commentid>
    <comment_count>23</comment_count>
      <attachid>437470</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-07 02:38:42 -0700</bug_when>
    <thetext>Created attachment 437470
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1790913</commentid>
    <comment_count>24</comment_count>
      <attachid>437471</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-07 02:41:04 -0700</bug_when>
    <thetext>Created attachment 437471
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1790927</commentid>
    <comment_count>25</comment_count>
      <attachid>437479</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-07 03:27:07 -0700</bug_when>
    <thetext>Created attachment 437479
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1790969</commentid>
    <comment_count>26</comment_count>
      <attachid>437492</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-07 05:44:00 -0700</bug_when>
    <thetext>Created attachment 437492
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1791818</commentid>
    <comment_count>27</comment_count>
      <attachid>437492</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-09-09 02:31:47 -0700</bug_when>
    <thetext>Comment on attachment 437492
Patch

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

We&apos;re getting there, thanks for your patience providing alternatives :)

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

I&apos;d better not use this name as is too similar to RenderBlock&apos;s needsPreferredWidthsRecalculation(). I&apos;d go for a more specific name like childHasAspectRatioAndStretchedLogicalHeight() or the like.

However this method is so specific and used just once that I think we can get rid of it (or at the most convert it into a lambda in the place you use it)

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1874
&gt; +            child.setPreferredLogicalWidthsDirty(true, MarkOnlyThis);

The setPreferredLogicalWidthsDirty() is done by updateBlockChildDirtyBitsBeforeLayout(), you just need to set forceChildRelayout to true as in the block above for percentage children. So something like this:

if (!forceChildRelayout &amp;&amp; (childHasPercentHeightDescendants(child) || (child.style().hasAspectRatio() &amp;&amp; child.hasStretchedLogicalHeight()))) {
   [...]
   forceChildRelayout = true;
}

should do the job.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1792265</commentid>
    <comment_count>28</comment_count>
      <attachid>437849</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-09-10 00:49:47 -0700</bug_when>
    <thetext>Created attachment 437849
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1792287</commentid>
    <comment_count>29</comment_count>
      <attachid>437849</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-09-10 04:30:02 -0700</bug_when>
    <thetext>Comment on attachment 437849
Patch

Awesome thanks!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1792294</commentid>
    <comment_count>30</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-09-10 05:23:23 -0700</bug_when>
    <thetext>Committed r282264 (241542@main): &lt;https://commits.webkit.org/241542@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 437849.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434211</attachid>
            <date>2021-07-26 09:36:07 -0700</date>
            <delta_ts>2021-07-27 00:47:54 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210726183606.patch</filename>
            <type>text/plain</type>
            <size>4884</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM4NTQ4ZjBhY2RjZDVl
ZjczZTAyZDBkYjVhOWQxOTdkZmQ2N2M5NC4uZmIwNmU5ZWU4OWU2ZjRiMmE0YzJmODg2ZmYwOWFh
MDJhNzIwOWUwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA3LTI2ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMD8uaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpzdHlsZURpZENoYW5n
ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1z
KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAyMS0wNy0y
NiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1Bp
cGV3aXJlXSBNdXRpbmcgdGhlIGRpc3BsYXkgY2FwdHVyZSBjbG9zZXMgdGhlIFBvcnRhbCBzZXNz
aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC
b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApp
bmRleCBlZjllZDQyYWI1MDIwYTA1YmRlMzJlNTU1NDhkNGY2OWRlZjJhMzlkLi40ZjcwMzJmOGUy
N2E4NzcxODVmOTNhNTk1MmFjZjQ0ZDIzODUxNGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTI5Niw2ICsyOTYsMTIgQEAgdm9pZCBS
ZW5kZXJGbGV4aWJsZUJveDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNv
bnN0IFJlbmRlclN0eWxlKgogICAgIGlmICghb2xkU3R5bGUgfHwgZGlmZiAhPSBTdHlsZURpZmZl
cmVuY2U6OkxheW91dCkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKG1faGFzR3JpZEl0ZW1X
aXRoQXNwZWN0UmF0aW8pIHsKKyAgICAgICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5
KHRydWUsIE1hcmtPbmx5VGhpcyk7CisgICAgICAgIGZvciAoYXV0byYgY2hpbGQgOiBjaGlsZHJl
bk9mVHlwZTxSZW5kZXJCb3g+KCp0aGlzKSkKKyAgICAgICAgICAgIGNoaWxkLnNldFByZWZlcnJl
ZExvZ2ljYWxXaWR0aHNEaXJ0eSh0cnVlLCBNYXJrT25seVRoaXMpOworICAgIH0KKwogICAgIGlm
IChvbGRTdHlsZS0+cmVzb2x2ZWRBbGlnbkl0ZW1zKHNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlv
cigpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAvLyBG
bGV4IGl0ZW1zIHRoYXQgd2VyZSBwcmV2aW91c2x5IHN0cmV0Y2hpbmcgbmVlZCB0byBiZSByZWxh
eWVkIG91dCBzbyB3ZQogICAgICAgICAvLyBjYW4gY29tcHV0ZSBuZXcgYXZhaWxhYmxlIGNyb3Nz
IGF4aXMgc3BhY2UuIFRoaXMgaXMgb25seSBuZWNlc3NhcnkgZm9yCkBAIC0xMDQ0LDcgKzEwNTAs
MTAgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1zKGJvb2wgcmVsYXlv
dXRDaGlsZHJlbikKICAgICAvLyBUT0RPKGNiaWVzaW5nZXIpOiBUaGF0IHNlY29uZCBwYXJ0IGlz
IG5vdCB5ZXQgdHJ1ZS4KICAgICBWZWN0b3I8RmxleEl0ZW0+IGFsbEl0ZW1zOwogICAgIG1fb3Jk
ZXJJdGVyYXRvci5maXJzdCgpOworICAgIG1faGFzR3JpZEl0ZW1XaXRoQXNwZWN0UmF0aW8gPSBm
YWxzZTsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBtX29yZGVySXRlcmF0b3IuY3VycmVu
dENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3JkZXJJdGVyYXRvci5uZXh0KCkpIHsKKyAgICAg
ICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBtX2hh
c0dyaWRJdGVtV2l0aEFzcGVjdFJhdGlvID0gdHJ1ZTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVy
YXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZs
b3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAg
ICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IGQwNGU3NzQwMzUxOWE1
YTlhNDFlYzA2ZmE0ZGE1OTA5M2E0ZTMyN2EuLjQxNzY3NDVhZDY5NGY0OGVkOGQxZmMyZjc4NGNl
YjIxMWUzNzE1OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5oCkBAIC0yMjUsNiArMjI1LDcgQEAgcHJpdmF0ZToKICAgICBTaXplRGVmaW5pdGVuZXNz
IG1faGFzRGVmaW5pdGVIZWlnaHQgeyBTaXplRGVmaW5pdGVuZXNzOjpVbmtub3duIH07CiAgICAg
Ym9vbCBtX2luTGF5b3V0IHsgZmFsc2UgfTsKICAgICBib29sIG1fc2hvdWxkUmVzZXRDaGlsZExv
Z2ljYWxIZWlnaHRCZWZvcmVMYXlvdXQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNHcmlkSXRl
bVdpdGhBc3BlY3RSYXRpbyB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKaW5kZXggMjIxM2UzZWIzODhiYTRjOTg0OWZmZWZhOTI3MGQ2ZTBlYTFkNGJlNC4uMDZlYWUw
NGUyOTgzMDIwOGY1MWU0ODM3Nzk5Y2ZmMTRhNDg3YWExMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBA
CisyMDIxLTA3LTI2ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4
IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMD8uaHRtbAorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIx
LTA3LTI2ICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlk
XSBzdmcgaW1hZ2UgYXMgZ3JpZCBpdGVtcyBzaG91bGQgdXNlIHRoZSBvdmVycmlkaW5nIGxvZ2lj
YWwgd2lkdGgvaGVpZ2h0IHdoZW4gZGVmaW5lZCB0byBjb21wdXRlIHRoZSBsb2dpY2FsIGhlaWdo
dC93aWR0aApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNWY2OWNjMzAwY2ZlZWIyOTMwMGU0YTdlNzMw
YjIwM2E5NDZlNzFlMi4uNmYyMGVkMGVjZmMxYzVmNWJiYjhmMjZjYjU0MjllZTRkZTYzNzIyMSAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MTE1LDggKzQxMTUsNiBAQCB3ZWJraXQub3JnL2IvMjE5
MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgt
YXNwZWN0LQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctY29sdW1uLTAxNS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1y
b3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3Qt
cmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i
LzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9h
c3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
LXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMTQ1MTc2IGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3hfYWxpZ24taXRl
bXMtc3RyZXRjaC0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434275</attachid>
            <date>2021-07-27 00:47:58 -0700</date>
            <delta_ts>2021-07-27 04:29:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210727094756.patch</filename>
            <type>text/plain</type>
            <size>2587</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMjkyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjIxM2UzZWIzODhiYTRjOTg0OWZm
ZWZhOTI3MGQ2ZTBlYTFkNGJlNC4uMDZlYWUwNGUyOTgzMDIwOGY1MWU0ODM3Nzk5Y2ZmMTRhNDg3
YWExMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA3LTI2ICBSb2IgQnVpcyAgPHJidWlz
QGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0w
MD8uaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
KiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA3LTI2ICBaaXJhbiBTdW4gIDx6c3VuQGlnYWxp
YS5jb20+CiAKICAgICAgICAgW2Nzcy1ncmlkXSBzdmcgaW1hZ2UgYXMgZ3JpZCBpdGVtcyBzaG91
bGQgdXNlIHRoZSBvdmVycmlkaW5nIGxvZ2ljYWwgd2lkdGgvaGVpZ2h0IHdoZW4gZGVmaW5lZCB0
byBjb21wdXRlIHRoZSBsb2dpY2FsIGhlaWdodC93aWR0aApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg
NWY2OWNjMzAwY2ZlZWIyOTMwMGU0YTdlNzMwYjIwM2E5NDZlNzFlMi4uZDk3NmViODI4YWVjNDU2
MjJlYzYwMzZjMGU4N2ZmNWQxZTE4NzQyOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMzk2LDcg
KzEzOTYsNiBAQCB3ZWJraXQub3JnL2IvMTM2NzU0IGNzczMvZmxleGJveC9jc3N3Zy90dHdmLXJl
ZnRlc3QtZmxleC13cmFwLmh0bWwgWyBJbWFnZU9ubHlGYQogd2Via2l0Lm9yZy9iLzEzNjc1NCBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9jYW52YXMtZHlu
YW1pYy1jaGFuZ2UtMDAxLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xMzY3NTQgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3Qt
cmF0aW8taW1nLXJvdy0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzEzNjc1NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9m
bGV4Ym94LXNhZmUtb3ZlcmZsb3ctcG9zaXRpb24tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8xMzY3NTQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZsZXhib3gvcGVyY2VudGFnZS1tYXgtaGVpZ2h0LTAwMi5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjEwMjQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L3BlcmNlbnRhZ2Utc2l6ZS1xdWlya3MtMDAyLmh0bWwgWyBG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xMzY3NTQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWZsZXhib3gvc2Nyb2xsYmFycy1uby1tYXJnaW4uaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogCkBAIC00MTE1LDcgKzQxMTQsNiBAQCB3ZWJraXQub3JnL2IvMjE5MzQzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0
LQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8t
aW1nLXJvdy0wMTAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3Qt
cmF0aW8taW50cmluc2ljLXNpemUtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz
dHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434281</attachid>
            <date>2021-07-27 04:29:22 -0700</date>
            <delta_ts>2021-07-27 04:32:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210727132921.patch</filename>
            <type>text/plain</type>
            <size>5540</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM4NTQ4ZjBhY2RjZDVl
ZjczZTAyZDBkYjVhOWQxOTdkZmQ2N2M5NC4uNWU5MGE5MTIyNDBjMWZjZWEyZmVkMWU3ZGFhNDVk
NmEwMDQzMGVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA3LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpzdHlsZURpZENoYW5n
ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1z
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVkc1ByZWZlcnJlZFdp
ZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5oOgorCiAyMDIxLTA3LTI2ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdh
bGlhLmNvbT4KIAogICAgICAgICBbUGlwZXdpcmVdIE11dGluZyB0aGUgZGlzcGxheSBjYXB0dXJl
IGNsb3NlcyB0aGUgUG9ydGFsIHNlc3Npb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IGVmOWVkNDJhYjUwMjBhMDViZGUzMmU1NTU0OGQ0
ZjY5ZGVmMmEzOWQuLmZhODMxODlhNzJhZDEyZjM4YmI5NTlmMjI1YzEzZDFkZGMxNDc0NTUgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAt
Mjk2LDYgKzI5NiwxMSBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpzdHlsZURpZENoYW5nZShT
dHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqCiAgICAgaWYgKCFvbGRTdHls
ZSB8fCBkaWZmICE9IFN0eWxlRGlmZmVyZW5jZTo6TGF5b3V0KQogICAgICAgICByZXR1cm47CiAK
KyAgICBpZiAobV9oYXNHcmlkSXRlbVdpdGhBc3BlY3RSYXRpbykgeworICAgICAgICBmb3IgKGF1
dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8UmVuZGVyQm94PigqdGhpcykpCisgICAgICAgICAg
ICBjaGlsZC5zZXRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkodHJ1ZSwgTWFya09ubHlUaGlz
KTsKKyAgICB9CisKICAgICBpZiAob2xkU3R5bGUtPnJlc29sdmVkQWxpZ25JdGVtcyhzZWxmQWxp
Z25tZW50Tm9ybWFsQmVoYXZpb3IoKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0
Y2gpIHsKICAgICAgICAgLy8gRmxleCBpdGVtcyB0aGF0IHdlcmUgcHJldmlvdXNseSBzdHJldGNo
aW5nIG5lZWQgdG8gYmUgcmVsYXllZCBvdXQgc28gd2UKICAgICAgICAgLy8gY2FuIGNvbXB1dGUg
bmV3IGF2YWlsYWJsZSBjcm9zcyBheGlzIHNwYWNlLiBUaGlzIGlzIG9ubHkgbmVjZXNzYXJ5IGZv
cgpAQCAtMTA0NCw3ICsxMDQ5LDEwIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZs
ZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgLy8gVE9ETyhjYmllc2luZ2VyKTog
VGhhdCBzZWNvbmQgcGFydCBpcyBub3QgeWV0IHRydWUuCiAgICAgVmVjdG9yPEZsZXhJdGVtPiBh
bGxJdGVtczsKICAgICBtX29yZGVySXRlcmF0b3IuZmlyc3QoKTsKKyAgICBtX2hhc0dyaWRJdGVt
V2l0aEFzcGVjdFJhdGlvID0gZmFsc2U7CiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gbV9v
cmRlckl0ZXJhdG9yLmN1cnJlbnRDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBtX29yZGVySXRlcmF0
b3IubmV4dCgpKSB7CisgICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS5oYXNBc3BlY3RSYXRpbygp
KQorICAgICAgICAgICAgbV9oYXNHcmlkSXRlbVdpdGhBc3BlY3RSYXRpbyA9IHRydWU7CiAgICAg
ICAgIGlmIChtX29yZGVySXRlcmF0b3Iuc2hvdWxkU2tpcENoaWxkKCpjaGlsZCkpIHsKICAgICAg
ICAgICAgIC8vIE91dC1vZi1mbG93IGNoaWxkcmVuIGFyZSBub3QgZmxleCBpdGVtcywgc28gd2Ug
c2tpcCB0aGVtIGhlcmUuCiAgICAgICAgICAgICBpZiAoY2hpbGQtPmlzT3V0T2ZGbG93UG9zaXRp
b25lZCgpKQpAQCAtMjE1Myw0ICsyMTYxLDEyIEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVC
b3g6OmNvbXB1dGVHYXAoUmVuZGVyRmxleGlibGVCb3g6OkdhcFR5cGUgZ2FwVHlwZSkgY29uCiAg
ICAgYXV0byBhdmFpbGFibGVTaXplID0gdXNlc1Jvd0dhcCA/IGF2YWlsYWJsZUxvZ2ljYWxIZWln
aHRGb3JQZXJjZW50YWdlQ29tcHV0YXRpb24oKS52YWx1ZV9vcigwX2x1KSA6IGNvbnRlbnRMb2dp
Y2FsV2lkdGgoKTsKICAgICByZXR1cm4gbWluaW11bVZhbHVlRm9yTGVuZ3RoKGdhcExlbmd0aC5s
ZW5ndGgoKSwgYXZhaWxhYmxlU2l6ZSk7CiB9CisKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6Om5l
ZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbigpIGNvbnN0Cit7CisgICAgaWYgKFJlbmRl
ckJsb2NrOjpuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24oKSkKKyAgICAgICAgcmV0
dXJuIHRydWU7CisgICAgcmV0dXJuIG1faGFzR3JpZEl0ZW1XaXRoQXNwZWN0UmF0aW87Cit9CisK
IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXgg
ZDA0ZTc3NDAzNTE5YTVhOWE0MWVjMDZmYTRkYTU5MDkzYTRlMzI3YS4uMjA0M2YxMDFjNzhiMDg4
MWE2NmU5YTc2N2FkZjExMTJlZWY1ZTY0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n
L1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTIwMCw2ICsyMDAsOCBAQCBwcml2YXRlOgogCiAgICAg
Ym9vbCBjaGlsZEhhc1BlcmNlbnRIZWlnaHREZXNjZW5kYW50cyhjb25zdCBSZW5kZXJCb3gmKSBj
b25zdDsKIAorICAgIGJvb2wgbmVlZHNQcmVmZXJyZWRXaWR0aHNSZWNhbGN1bGF0aW9uKCkgZmlu
YWw7CisKICAgICBlbnVtIGNsYXNzIEdhcFR5cGUgeyBCZXR3ZWVuTGluZXMsIEJldHdlZW5JdGVt
cyB9OwogICAgIExheW91dFVuaXQgY29tcHV0ZUdhcChHYXBUeXBlKSBjb25zdDsKIApAQCAtMjI1
LDYgKzIyNyw3IEBAIHByaXZhdGU6CiAgICAgU2l6ZURlZmluaXRlbmVzcyBtX2hhc0RlZmluaXRl
SGVpZ2h0IHsgU2l6ZURlZmluaXRlbmVzczo6VW5rbm93biB9OwogICAgIGJvb2wgbV9pbkxheW91
dCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3Nob3VsZFJlc2V0Q2hpbGRMb2dpY2FsSGVpZ2h0QmVm
b3JlTGF5b3V0IHsgZmFsc2UgfTsKKyAgICBib29sIG1faGFzR3JpZEl0ZW1XaXRoQXNwZWN0UmF0
aW8geyBmYWxzZSB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDIyMTNl
M2ViMzg4YmE0Yzk4NDlmZmVmYTkyNzBkNmUwZWExZDRiZTQuLjE0YmZiODY2ZWE3MWU4NWY1Yzk2
MzJiMWExNWQxMTRhZGEwMWMxN2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor
KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNy0yNyAg
Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhc3BlY3QtcmF0aW8t
aW50cmluc2ljLXNpemUtMDA0Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyODI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNy0yNiAgWmlyYW4g
U3VuICA8enN1bkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZ3JpZF0gc3ZnIGltYWdlIGFz
IGdyaWQgaXRlbXMgc2hvdWxkIHVzZSB0aGUgb3ZlcnJpZGluZyBsb2dpY2FsIHdpZHRoL2hlaWdo
dCB3aGVuIGRlZmluZWQgdG8gY29tcHV0ZSB0aGUgbG9naWNhbCBoZWlnaHQvd2lkdGgKZGlmZiAt
LWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhw
ZWN0YXRpb25zCmluZGV4IDVmNjljYzMwMGNmZWViMjkzMDBlNGE3ZTczMGIyMDNhOTQ2ZTcxZTIu
LjA5MTc5ZGIyMzIwMTc1YjU2YjMwNDFlOTU3M2VlMmE4OGFlYWM1ZDAgMTAwNjQ0Ci0tLSBhL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwpAQCAtNDExNiw3ICs0MTE2LDYgQEAgd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC0KIHdlYmtp
dC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMDcuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxMC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0w
MDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50
cmluc2ljLXNpemUtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNw
ZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAK
IHdlYmtpdC5vcmcvYi8xNDUxNzYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWZsZXhib3gvZmxleGJveF9hbGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434282</attachid>
            <date>2021-07-27 04:32:47 -0700</date>
            <delta_ts>2021-07-27 04:49:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210727133246.patch</filename>
            <type>text/plain</type>
            <size>5462</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM2ODY2YmY2ODQ3NmYy
MDczZDIxNjE3NjQ3NWM4NTdlMTczYWEzYy4uNzFhOWVhZDRjZDE2N2QwNTIyOTIzMDUxNzg5YzNh
MDc2N2FlMjllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA3LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpzdHlsZURpZENoYW5n
ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1z
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVkc1ByZWZlcnJlZFdp
ZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5oOgorCiAyMDIxLTA3LTI2ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUu
Y29tPgogCiAgICAgICAgIFJlZ3VsYXRlIHRoZSBXZWJQYWdlIFJlbmRlcmluZ1VwZGF0ZXMgZnJv
bSB0aGUgV2ViUHJvY2VzcyB0byB0aGUgR1BVUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZWY5ZWQ0MmFiNTAyMGEwNWJkZTMy
ZTU1NTQ4ZDRmNjlkZWYyYTM5ZC4uZmE4MzE4OWE3MmFkMTJmMzhiYjk1OWYyMjVjMTNkMWRkYzE0
NzQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu
Y3BwCkBAIC0yOTYsNiArMjk2LDExIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnN0eWxlRGlk
Q2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSoKICAgICBpZiAo
IW9sZFN0eWxlIHx8IGRpZmYgIT0gU3R5bGVEaWZmZXJlbmNlOjpMYXlvdXQpCiAgICAgICAgIHJl
dHVybjsKIAorICAgIGlmIChtX2hhc0dyaWRJdGVtV2l0aEFzcGVjdFJhdGlvKSB7CisgICAgICAg
IGZvciAoYXV0byYgY2hpbGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJCb3g+KCp0aGlzKSkKKyAg
ICAgICAgICAgIGNoaWxkLnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSh0cnVlLCBNYXJr
T25seVRoaXMpOworICAgIH0KKwogICAgIGlmIChvbGRTdHlsZS0+cmVzb2x2ZWRBbGlnbkl0ZW1z
KHNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcigpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlv
bjo6U3RyZXRjaCkgewogICAgICAgICAvLyBGbGV4IGl0ZW1zIHRoYXQgd2VyZSBwcmV2aW91c2x5
IHN0cmV0Y2hpbmcgbmVlZCB0byBiZSByZWxheWVkIG91dCBzbyB3ZQogICAgICAgICAvLyBjYW4g
Y29tcHV0ZSBuZXcgYXZhaWxhYmxlIGNyb3NzIGF4aXMgc3BhY2UuIFRoaXMgaXMgb25seSBuZWNl
c3NhcnkgZm9yCkBAIC0xMDQ0LDcgKzEwNDksMTAgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6
bGF5b3V0RmxleEl0ZW1zKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAvLyBUT0RPKGNiaWVz
aW5nZXIpOiBUaGF0IHNlY29uZCBwYXJ0IGlzIG5vdCB5ZXQgdHJ1ZS4KICAgICBWZWN0b3I8Rmxl
eEl0ZW0+IGFsbEl0ZW1zOwogICAgIG1fb3JkZXJJdGVyYXRvci5maXJzdCgpOworICAgIG1faGFz
R3JpZEl0ZW1XaXRoQXNwZWN0UmF0aW8gPSBmYWxzZTsKICAgICBmb3IgKFJlbmRlckJveCogY2hp
bGQgPSBtX29yZGVySXRlcmF0b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3Jk
ZXJJdGVyYXRvci5uZXh0KCkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVj
dFJhdGlvKCkpCisgICAgICAgICAgICBtX2hhc0dyaWRJdGVtV2l0aEFzcGVjdFJhdGlvID0gdHJ1
ZTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkg
ewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1z
LCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZs
b3dQb3NpdGlvbmVkKCkpCkBAIC0yMTUzLDQgKzIxNjEsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZUdhcChSZW5kZXJGbGV4aWJsZUJveDo6R2FwVHlwZSBnYXBUeXBl
KSBjb24KICAgICBhdXRvIGF2YWlsYWJsZVNpemUgPSB1c2VzUm93R2FwID8gYXZhaWxhYmxlTG9n
aWNhbEhlaWdodEZvclBlcmNlbnRhZ2VDb21wdXRhdGlvbigpLnZhbHVlX29yKDBfbHUpIDogY29u
dGVudExvZ2ljYWxXaWR0aCgpOwogICAgIHJldHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoZ2Fw
TGVuZ3RoLmxlbmd0aCgpLCBhdmFpbGFibGVTaXplKTsKIH0KKworYm9vbCBSZW5kZXJGbGV4aWJs
ZUJveDo6bmVlZHNQcmVmZXJyZWRXaWR0aHNSZWNhbGN1bGF0aW9uKCkgY29uc3QKK3sKKyAgICBp
ZiAoUmVuZGVyQmxvY2s6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbigpKQorICAg
ICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gbV9oYXNHcmlkSXRlbVdpdGhBc3BlY3RSYXRp
bzsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu
aAppbmRleCBkMDRlNzc0MDM1MTlhNWE5YTQxZWMwNmZhNGRhNTkwOTNhNGUzMjdhLi4yMDQzZjEw
MWM3OGIwODgxYTY2ZTlhNzY3YWRmMTExMmVlZjVlNjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMjAwLDYgKzIwMCw4IEBAIHByaXZhdGU6
CiAKICAgICBib29sIGNoaWxkSGFzUGVyY2VudEhlaWdodERlc2NlbmRhbnRzKGNvbnN0IFJlbmRl
ckJveCYpIGNvbnN0OwogCisgICAgYm9vbCBuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRp
b24oKSBmaW5hbDsKKwogICAgIGVudW0gY2xhc3MgR2FwVHlwZSB7IEJldHdlZW5MaW5lcywgQmV0
d2Vlbkl0ZW1zIH07CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlR2FwKEdhcFR5cGUpIGNvbnN0Owog
CkBAIC0yMjUsNiArMjI3LDcgQEAgcHJpdmF0ZToKICAgICBTaXplRGVmaW5pdGVuZXNzIG1faGFz
RGVmaW5pdGVIZWlnaHQgeyBTaXplRGVmaW5pdGVuZXNzOjpVbmtub3duIH07CiAgICAgYm9vbCBt
X2luTGF5b3V0IHsgZmFsc2UgfTsKICAgICBib29sIG1fc2hvdWxkUmVzZXRDaGlsZExvZ2ljYWxI
ZWlnaHRCZWZvcmVMYXlvdXQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNHcmlkSXRlbVdpdGhB
c3BlY3RSYXRpbyB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k
ZXggZjFmNDg4OTM1OThlZDMzOTU0ZjhmNjc0MTMxMDA3ZjRjOTZiYzMyMi4uMmI4ZTJmMjg0N2Zj
YThiYTM5NjZjODdiZjE0M2Y3NWZmM2U0MzY0NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIx
LTA3LTI3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVj
dC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA3LTI3
ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5za2lwIHNvbWUgY3Nz
LWZsZXhib3ggV1BUIHRlc3RzIHRoYXQgcGFzcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZDk3NmVi
ODI4YWVjNDU2MjJlYzYwMzZjMGU4N2ZmNWQxZTE4NzQyOS4uOWQ5N2IyNGM1M2ZjMmVjNmI3OTAx
OTc2NjU1OWE3NmRiZDRjY2M0MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MTE0LDcgKzQxMTQs
NiBAQCB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRp
by1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2Zs
ZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1z
aXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8xNDUxNzYg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleGJveF9h
bGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>
<flag name="commit-queue"
          id="456728"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434283</attachid>
            <date>2021-07-27 04:48:41 -0700</date>
            <delta_ts>2021-08-14 13:56:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210727134839.patch</filename>
            <type>text/plain</type>
            <size>5468</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM2ODY2YmY2ODQ3NmYy
MDczZDIxNjE3NjQ3NWM4NTdlMTczYWEzYy4uNzFhOWVhZDRjZDE2N2QwNTIyOTIzMDUxNzg5YzNh
MDc2N2FlMjllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA3LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpzdHlsZURpZENoYW5n
ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1z
KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpuZWVkc1ByZWZlcnJlZFdp
ZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5oOgorCiAyMDIxLTA3LTI2ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUu
Y29tPgogCiAgICAgICAgIFJlZ3VsYXRlIHRoZSBXZWJQYWdlIFJlbmRlcmluZ1VwZGF0ZXMgZnJv
bSB0aGUgV2ViUHJvY2VzcyB0byB0aGUgR1BVUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZWY5ZWQ0MmFiNTAyMGEwNWJkZTMy
ZTU1NTQ4ZDRmNjlkZWYyYTM5ZC4uZmE4MzE4OWE3MmFkMTJmMzhiYjk1OWYyMjVjMTNkMWRkYzE0
NzQ1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu
Y3BwCkBAIC0yOTYsNiArMjk2LDExIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnN0eWxlRGlk
Q2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSoKICAgICBpZiAo
IW9sZFN0eWxlIHx8IGRpZmYgIT0gU3R5bGVEaWZmZXJlbmNlOjpMYXlvdXQpCiAgICAgICAgIHJl
dHVybjsKIAorICAgIGlmIChtX2hhc0dyaWRJdGVtV2l0aEFzcGVjdFJhdGlvKSB7CisgICAgICAg
IGZvciAoYXV0byYgY2hpbGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJCb3g+KCp0aGlzKSkKKyAg
ICAgICAgICAgIGNoaWxkLnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSh0cnVlLCBNYXJr
T25seVRoaXMpOworICAgIH0KKwogICAgIGlmIChvbGRTdHlsZS0+cmVzb2x2ZWRBbGlnbkl0ZW1z
KHNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcigpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlv
bjo6U3RyZXRjaCkgewogICAgICAgICAvLyBGbGV4IGl0ZW1zIHRoYXQgd2VyZSBwcmV2aW91c2x5
IHN0cmV0Y2hpbmcgbmVlZCB0byBiZSByZWxheWVkIG91dCBzbyB3ZQogICAgICAgICAvLyBjYW4g
Y29tcHV0ZSBuZXcgYXZhaWxhYmxlIGNyb3NzIGF4aXMgc3BhY2UuIFRoaXMgaXMgb25seSBuZWNl
c3NhcnkgZm9yCkBAIC0xMDQ0LDcgKzEwNDksMTAgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6
bGF5b3V0RmxleEl0ZW1zKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAvLyBUT0RPKGNiaWVz
aW5nZXIpOiBUaGF0IHNlY29uZCBwYXJ0IGlzIG5vdCB5ZXQgdHJ1ZS4KICAgICBWZWN0b3I8Rmxl
eEl0ZW0+IGFsbEl0ZW1zOwogICAgIG1fb3JkZXJJdGVyYXRvci5maXJzdCgpOworICAgIG1faGFz
R3JpZEl0ZW1XaXRoQXNwZWN0UmF0aW8gPSBmYWxzZTsKICAgICBmb3IgKFJlbmRlckJveCogY2hp
bGQgPSBtX29yZGVySXRlcmF0b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3Jk
ZXJJdGVyYXRvci5uZXh0KCkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVj
dFJhdGlvKCkpCisgICAgICAgICAgICBtX2hhc0dyaWRJdGVtV2l0aEFzcGVjdFJhdGlvID0gdHJ1
ZTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkg
ewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1z
LCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZs
b3dQb3NpdGlvbmVkKCkpCkBAIC0yMTUzLDQgKzIxNjEsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZUdhcChSZW5kZXJGbGV4aWJsZUJveDo6R2FwVHlwZSBnYXBUeXBl
KSBjb24KICAgICBhdXRvIGF2YWlsYWJsZVNpemUgPSB1c2VzUm93R2FwID8gYXZhaWxhYmxlTG9n
aWNhbEhlaWdodEZvclBlcmNlbnRhZ2VDb21wdXRhdGlvbigpLnZhbHVlX29yKDBfbHUpIDogY29u
dGVudExvZ2ljYWxXaWR0aCgpOwogICAgIHJldHVybiBtaW5pbXVtVmFsdWVGb3JMZW5ndGgoZ2Fw
TGVuZ3RoLmxlbmd0aCgpLCBhdmFpbGFibGVTaXplKTsKIH0KKworYm9vbCBSZW5kZXJGbGV4aWJs
ZUJveDo6bmVlZHNQcmVmZXJyZWRXaWR0aHNSZWNhbGN1bGF0aW9uKCkgY29uc3QKK3sKKyAgICBp
ZiAoUmVuZGVyQmxvY2s6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbigpKQorICAg
ICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gbV9oYXNHcmlkSXRlbVdpdGhBc3BlY3RSYXRp
bzsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs
ZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu
aAppbmRleCBkMDRlNzc0MDM1MTlhNWE5YTQxZWMwNmZhNGRhNTkwOTNhNGUzMjdhLi4wY2M1YTc5
MGVjNGEwZWViNGYwMjUyNzNhNmE4NmUyY2I5Y2ExYmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMjAwLDYgKzIwMCw4IEBAIHByaXZhdGU6
CiAKICAgICBib29sIGNoaWxkSGFzUGVyY2VudEhlaWdodERlc2NlbmRhbnRzKGNvbnN0IFJlbmRl
ckJveCYpIGNvbnN0OwogCisgICAgYm9vbCBuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRp
b24oKSBjb25zdCBmaW5hbDsKKwogICAgIGVudW0gY2xhc3MgR2FwVHlwZSB7IEJldHdlZW5MaW5l
cywgQmV0d2Vlbkl0ZW1zIH07CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlR2FwKEdhcFR5cGUpIGNv
bnN0OwogCkBAIC0yMjUsNiArMjI3LDcgQEAgcHJpdmF0ZToKICAgICBTaXplRGVmaW5pdGVuZXNz
IG1faGFzRGVmaW5pdGVIZWlnaHQgeyBTaXplRGVmaW5pdGVuZXNzOjpVbmtub3duIH07CiAgICAg
Ym9vbCBtX2luTGF5b3V0IHsgZmFsc2UgfTsKICAgICBib29sIG1fc2hvdWxkUmVzZXRDaGlsZExv
Z2ljYWxIZWlnaHRCZWZvcmVMYXlvdXQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNHcmlkSXRl
bVdpdGhBc3BlY3RSYXRpbyB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKaW5kZXggZjFmNDg4OTM1OThlZDMzOTU0ZjhmNjc0MTMxMDA3ZjRjOTZiYzMyMi4uMmI4ZTJm
Mjg0N2ZjYThiYTM5NjZjODdiZjE0M2Y3NWZmM2U0MzY0NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBA
CisyMDIxLTA3LTI3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4
IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIx
LTA3LTI3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5za2lwIHNv
bWUgY3NzLWZsZXhib3ggV1BUIHRlc3RzIHRoYXQgcGFzcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg
ZDk3NmViODI4YWVjNDU2MjJlYzYwMzZjMGU4N2ZmNWQxZTE4NzQyOS4uOWQ5N2IyNGM1M2ZjMmVj
NmI3OTAxOTc2NjU1OWE3NmRiZDRjY2M0MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MTE0LDcg
KzQxMTQsNiBAQCB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LQogd2Via2l0Lm9yZy9iLzIxOTM0MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVj
dC1yYXRpby1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4
Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJp
bnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8x
NDUxNzYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxl
eGJveF9hbGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435550</attachid>
            <date>2021-08-14 13:56:45 -0700</date>
            <delta_ts>2021-08-14 22:52:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210814225644.patch</filename>
            <type>text/plain</type>
            <size>5393</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwODI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTc3MDMyMDMxMzg3ZTQx
MDczYWFmNTk1NDFiYjMyYjlmNzIyMjRjYi4uOTA0ZTVkMGRjZmEzMTZiYmNjYzRiNzUwODZiYWM3
NmM4ZjE5NWZhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA4LTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaDoK
KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OmNhbkNvbnRhaW5BYnNvbHV0ZWx5UG9z
aXRpb25lZE9iamVjdHMgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllck1v
ZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6
OnN0eWxlRGlkQ2hhbmdlKToKKwogMjAyMS0wOC0wOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lA
YXBwbGUuY29tPgogCiAgICAgICAgIFBhcnRpYWxseSByZXZlcnQgcjI4MDI1NiBiZWhhdmlvciBj
aGFuZ2Ugc2luY2UgaXQgYnJva2UgRmFjZXRpbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRWxlbWVudC5oCmluZGV4IDIzNzdiYTk3MmM0YWM5NWNjOGY3OGRkMzJkZGU4MTk0OWM0N2Zl
MjUuLmNlZDI5ZmMzNDA3YjE5MmJjMzlmOWVlNmEwZGJlM2MwY2EyMjg5MjEgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtNDUyLDcgKzQ1Miw3IEBAIGlubGlu
ZSBib29sIFJlbmRlckVsZW1lbnQ6OmNhbkNvbnRhaW5GaXhlZFBvc2l0aW9uT2JqZWN0cygpIGNv
bnN0CiBpbmxpbmUgYm9vbCBSZW5kZXJFbGVtZW50OjpjYW5Db250YWluQWJzb2x1dGVseVBvc2l0
aW9uZWRPYmplY3RzKCkgY29uc3QKIHsKICAgICByZXR1cm4gc3R5bGUoKS5wb3NpdGlvbigpICE9
IFBvc2l0aW9uVHlwZTo6U3RhdGljCi0gICAgICAgIHx8IChpc1JlbmRlckJsb2NrKCkgJiYgaGFz
VHJhbnNmb3JtUmVsYXRlZFByb3BlcnR5KCkpCisgICAgICAgIHx8IChpc1JlbmRlckJsb2NrKCkg
JiYgaGFzVHJhbnNmb3JtKCkpCiAgICAgICAgIC8vIEZJWE1FOiB3aWxsLWNoYW5nZSBzaG91bGQg
Y3JlYXRlIGNvbnRhaW5pbmcgYmxvY2tzIG9uIGlubGluZSBib3hlcyAoYnVnIDIyNTAzNSkKICAg
ICAgICAgfHwgKGlzUmVuZGVyQmxvY2soKSAmJiBzdHlsZSgpLndpbGxDaGFuZ2UoKSAmJiBzdHls
ZSgpLndpbGxDaGFuZ2UoKS0+Y3JlYXRlc0NvbnRhaW5pbmdCbG9ja0ZvckFic29sdXRlbHlQb3Np
dGlvbmVkKCkpCiAgICAgICAgIHx8IGlzU1ZHRm9yZWlnbk9iamVjdCgpCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAKaW5kZXggZjI5
NTA0YTJmMzJlODVhZDU4MzI3ZjY2YTM0YjE5MTI4YjZkNjg3OC4uYWE0NDMyYWI2YjI1OWFhN2Jh
YmE4YzNhM2Y5NjIxNzY2OTk1YTYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcApAQCAtMTU0LDggKzE1NCwxMSBAQCB2b2lk
IFJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBk
aWZmLCBjb25zdCBSZW5kZXJTdAogICAgICAgICAgICAgdmlldygpLmZyYW1lVmlldygpLnJlbW92
ZVZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3QoKnRoaXMpOwogICAgIH0KIAorICAgIGlmICghb2xk
U3R5bGUpCisgICAgICAgIHJldHVybjsKKwogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHls
ZSA9IHN0eWxlKCk7Ci0gICAgaWYgKG9sZFN0eWxlICYmIG9sZFN0eWxlLT5zY3JvbGxQYWRkaW5n
KCkgIT0gbmV3U3R5bGUuc2Nyb2xsUGFkZGluZygpKSB7CisgICAgaWYgKG9sZFN0eWxlLT5zY3Jv
bGxQYWRkaW5nKCkgIT0gbmV3U3R5bGUuc2Nyb2xsUGFkZGluZygpKSB7CiAgICAgICAgIGlmIChp
c0RvY3VtZW50RWxlbWVudFJlbmRlcmVyKCkpIHsKICAgICAgICAgICAgIEZyYW1lVmlldyYgZnJh
bWVWaWV3ID0gdmlldygpLmZyYW1lVmlldygpOwogICAgICAgICAgICAgZnJhbWVWaWV3LnVwZGF0
ZVNjcm9sbGJhclN0ZXBzKCk7CkBAIC0xNjMsOSArMTY2LDkgQEAgdm9pZCBSZW5kZXJMYXllck1v
ZGVsT2JqZWN0OjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVu
ZGVyU3QKICAgICAgICAgICAgIHJlbmRlckxheWVyLT51cGRhdGVTY3JvbGxiYXJTdGVwcygpOwog
ICAgIH0KIAotICAgIGJvb2wgc2Nyb2xsTWFyZ2luQ2hhbmdlZCA9IG9sZFN0eWxlICYmIG9sZFN0
eWxlLT5zY3JvbGxNYXJnaW4oKSAhPSBuZXdTdHlsZS5zY3JvbGxNYXJnaW4oKTsKLSAgICBib29s
IHNjcm9sbEFsaWduQ2hhbmdlZCA9IG9sZFN0eWxlICYmIG9sZFN0eWxlLT5zY3JvbGxTbmFwQWxp
Z24oKSAhPSBuZXdTdHlsZS5zY3JvbGxTbmFwQWxpZ24oKTsKLSAgICBib29sIHNjcm9sbFNuYXBT
dG9wQ2hhbmdlZCA9IG9sZFN0eWxlICYmIG9sZFN0eWxlLT5zY3JvbGxTbmFwU3RvcCgpICE9IG5l
d1N0eWxlLnNjcm9sbFNuYXBTdG9wKCk7CisgICAgYm9vbCBzY3JvbGxNYXJnaW5DaGFuZ2VkID0g
b2xkU3R5bGUtPnNjcm9sbE1hcmdpbigpICE9IG5ld1N0eWxlLnNjcm9sbE1hcmdpbigpOworICAg
IGJvb2wgc2Nyb2xsQWxpZ25DaGFuZ2VkID0gb2xkU3R5bGUtPnNjcm9sbFNuYXBBbGlnbigpICE9
IG5ld1N0eWxlLnNjcm9sbFNuYXBBbGlnbigpOworICAgIGJvb2wgc2Nyb2xsU25hcFN0b3BDaGFu
Z2VkID0gb2xkU3R5bGUtPnNjcm9sbFNuYXBTdG9wKCkgIT0gbmV3U3R5bGUuc2Nyb2xsU25hcFN0
b3AoKTsKICAgICBpZiAoc2Nyb2xsTWFyZ2luQ2hhbmdlZCB8fCBzY3JvbGxBbGlnbkNoYW5nZWQg
fHwgc2Nyb2xsU25hcFN0b3BDaGFuZ2VkKSB7CiAgICAgICAgIGlmIChhdXRvKiBzY3JvbGxTbmFw
Qm94ID0gZW5jbG9zaW5nU2Nyb2xsYWJsZUNvbnRhaW5lckZvclNuYXBwaW5nKCkpCiAgICAgICAg
ICAgICBzY3JvbGxTbmFwQm94LT5zZXROZWVkc0xheW91dCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGE5ODc3NTVhYzZm
NGU3NTQ2YmFhN2E0OTljYmQ4ODUzZTUyMDA2YTQuLjI3NTY5YzE1MzYxNDYxY2E2OGE5YjQ0NThk
NTdjYjQ5NmRiMzI0YzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wOC0xNCAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhc3BlY3QtcmF0aW8taW50cmlu
c2ljLXNpemUtMDA0Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyODI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wOC0xMCAgQ2F0aGllIENoZW4g
IDxjYXRoaWVjaGVuQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW1wb3J0IGNzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpbyB0ZXN0cyBmcm9tIFdQVApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVz
dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYWFmYjAx
ZTBlMGI2N2JlYzVkYzIyOTE0ODhhOWRlZjA1ZDNiZTRlZC4uMzdlODZmNzVlYzJlZmZlOWNkOGFl
ZjI4Yzg5ZWZiNTk0YjdhNDZhYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNDM5LDcgKzM0Mzks
NiBAQCB3ZWJraXQub3JnL2IvMjAzNTI5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy10ZXh0LWRlY29yL3RleHQtZGVjbwogd2Via2l0Lm9yZy9iLzIwMzQ0NSBbIERlYnVn
IF0gaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3Bvc2l0
aW9uLWFic29sdXRlLWNvbnRhaW5lci1keW5hbWljLTAwMi5odG1sIFsgU2tpcCBdCiB3ZWJraXQu
b3JnL2IvMjAzNDQ3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1wb3Np
dGlvbi9wb3NpdGlvbi1hYnNvbHV0ZS1keW5hbWljLW92ZXJmbG93LTAwMS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjAzNDQ3IGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1wb3NpdGlvbi9wb3NpdGlvbi1hYnNvbHV0ZS1keW5hbWljLW92ZXJm
bG93LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjAzNDQ4IGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1wb3NpdGlvbi9wb3NpdGlvbi1h
YnNvbHV0ZS1keW5hbWljLXN0YXRpYy1wb3NpdGlvbi10YWJsZS1jZWxsLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDM0NDkgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3Bvc2l0aW9uLXJlbGF0aXZlLXRhYmxlLXRib2R5LWxl
ZnQtYWJzb2x1dGUtY2hpbGQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIwMzQ0OSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtcG9zaXRpb24v
cG9zaXRpb24tcmVsYXRpdmUtdGFibGUtdGJvZHktbGVmdC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjAzNDQ5IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1wb3NpdGlvbi9wb3NpdGlvbi1yZWxhdGl2ZS10YWJsZS10Ym9keS10b3AtYWJzb2x1
dGUtY2hpbGQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435557</attachid>
            <date>2021-08-14 22:52:18 -0700</date>
            <delta_ts>2021-08-27 02:19:13 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210815075217.patch</filename>
            <type>text/plain</type>
            <size>3475</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc1NzhlNDY5NDRiYWZm
NDQ1MzNkMDE4ZGNkYWFjM2QzYjMxNWRiYS4uNjE4MTc3ZmZlNDhiM2NjMGI0MDQxOGE2OTUxMjdl
MTM4NDNiYWM0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA4LTE0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaDoK
KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OmNhbkNvbnRhaW5BYnNvbHV0ZWx5UG9z
aXRpb25lZE9iamVjdHMgY29uc3QpOgorCiAyMDIxLTA4LTE0ICBTYWlkIEFib3UtSGFsbGF3YSAg
PHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10gUkVHUkVTU0lPTjogV2Vi
Q29udGVudCBvZnRlbiBjcmFzaGVzIHdoZW4gb3BlbmluZyBhIEdvb2dsZSBzcHJlYWRzaGVldCB3
aXRoIGNoYXJ0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVs
ZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKaW5kZXgg
MjM3N2JhOTcyYzRhYzk1Y2M4Zjc4ZGQzMmRkZTgxOTQ5YzQ3ZmUyNS4uY2VkMjlmYzM0MDdiMTky
YmMzOWY5ZWU2YTBkYmUzYzBjYTIyODkyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRWxlbWVudC5oCkBAIC00NTIsNyArNDUyLDcgQEAgaW5saW5lIGJvb2wgUmVuZGVyRWxlbWVu
dDo6Y2FuQ29udGFpbkZpeGVkUG9zaXRpb25PYmplY3RzKCkgY29uc3QKIGlubGluZSBib29sIFJl
bmRlckVsZW1lbnQ6OmNhbkNvbnRhaW5BYnNvbHV0ZWx5UG9zaXRpb25lZE9iamVjdHMoKSBjb25z
dAogewogICAgIHJldHVybiBzdHlsZSgpLnBvc2l0aW9uKCkgIT0gUG9zaXRpb25UeXBlOjpTdGF0
aWMKLSAgICAgICAgfHwgKGlzUmVuZGVyQmxvY2soKSAmJiBoYXNUcmFuc2Zvcm1SZWxhdGVkUHJv
cGVydHkoKSkKKyAgICAgICAgfHwgKGlzUmVuZGVyQmxvY2soKSAmJiBoYXNUcmFuc2Zvcm0oKSkK
ICAgICAgICAgLy8gRklYTUU6IHdpbGwtY2hhbmdlIHNob3VsZCBjcmVhdGUgY29udGFpbmluZyBi
bG9ja3Mgb24gaW5saW5lIGJveGVzIChidWcgMjI1MDM1KQogICAgICAgICB8fCAoaXNSZW5kZXJC
bG9jaygpICYmIHN0eWxlKCkud2lsbENoYW5nZSgpICYmIHN0eWxlKCkud2lsbENoYW5nZSgpLT5j
cmVhdGVzQ29udGFpbmluZ0Jsb2NrRm9yQWJzb2x1dGVseVBvc2l0aW9uZWQoKSkKICAgICAgICAg
fHwgaXNTVkdGb3JlaWduT2JqZWN0KCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiOGRjYzk1NmQxMWRkZDllODBiMDcyN2Y4
NGI5M2M1ZTM5MjdiOTk2Li4wOTExMjc5NWYxYmRhODQxNTgxZGE4NjNjMjJmZTM4OTVkMTQwMDA2
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDgtMTQgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBGaXggYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5o
dG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgy
ODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl
c3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDgtMTQgIEFyY2FkeSBHb2xkbWludHMtT3Jsb3YgIDxh
Z29sZG1pbnRzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dMSUJdIFVwZGF0ZSBiYXNlbGluZXMg
YWZ0ZXIgcjI4MTAxMgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBi
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZTRmNzM1ZWVkOWRhODNmNGI0MDli
ZjQwM2U3ZGQzYzVlYWFlMGRmOS4uOWU4MmZlOWNjY2I0ZWQ4NDI0ZDNiODI2NWU5OGVmZWE3NmNm
MzUwNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0zNDM4LDcgKzM0MzgsNiBAQCB3ZWJraXQub3Jn
L2IvMjAzNDQ1IFsgRGVidWcgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtcG9zaXRpb24vcAogd2Via2l0Lm9yZy9iLzIwMzQ0NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtcG9zaXRpb24vcG9zaXRpb24tYWJzb2x1dGUtZHluYW1pYy1hdXRv
LW92ZXJmbG93Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDM0NDcg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3Bvc2l0aW9u
LWFic29sdXRlLWR5bmFtaWMtb3ZlcmZsb3ctMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMDM0NDcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXBvc2l0aW9uL3Bvc2l0aW9uLWFic29sdXRlLWR5bmFtaWMtb3ZlcmZsb3ctMDAyLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDM0NDggaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXBvc2l0aW9uL3Bvc2l0aW9uLWFic29sdXRlLWR5bmFt
aWMtc3RhdGljLXBvc2l0aW9uLXRhYmxlLWNlbGwuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIyODk5NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtcG9zaXRpb24vcG9zaXRpb24tYWJzb2x1dGUtaWZyYW1lLXByaW50LTAwMS5zdWIuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyODk5NCBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtcG9zaXRpb24vcG9zaXRpb24tYWJzb2x1dGUtaWZyYW1l
LXByaW50LTAwMi5zdWIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIy
ODk5NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtcG9zaXRpb24vcG9z
aXRpb24tYWJzb2x1dGUtaW4taW5saW5lLTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436615</attachid>
            <date>2021-08-27 02:19:19 -0700</date>
            <delta_ts>2021-08-27 03:57:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210827111917.patch</filename>
            <type>text/plain</type>
            <size>4494</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllZDc0NGE2YjNjYjI5
NzdlYjhlMTQzOGEyY2Q5ZTQ3OTA5YzMzZS4uYzI5YmQ5Mjc5Y2EyZTc0NmMyMWZjZmFiYTk1Zjc4
NzI5ZGRmNzcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayk6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91
bGRVc2VDb250YWluZXJDcm9zc1NpemUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
RmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMpOgorCiAyMDIxLTA4
LTI2ICBFbnJpcXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAg
ICAgICAgW0dTdHJlYW1lcl1bTVNFXSBJbXBsZW1lbnQgdGhlICJzZXF1ZW5jZSIgbW9kZSBpbiBT
b3VyY2VCdWZmZXIgZm9yIHRoZSBHU3RyZWFtZXIgcG9ydHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYzkzZGYyNGNiMGIwZDg2Yzk3
MzJmZjZhMTQ4NDk5ODZmMDE5ZmMuLjM0YmVhMDc3NWU3YjdlZTQxYzk0YmEzZThmMjBlYjEwNDgw
MzVkNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcApAQCAtMzQ5LDcgKzM0OSw5IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJs
b2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIHJlc2V0TG9naWNh
bEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9yZWxhaWRPdXRDaGlsZHJlbi5j
bGVhcigpOwotICAgIAorCisgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERl
c2NlbmRhbnRzKCk7CisKICAgICBib29sIG9sZEluTGF5b3V0ID0gbV9pbkxheW91dDsKICAgICBt
X2luTGF5b3V0ID0gdHJ1ZTsKICAgICAKQEAgLTk1OCw2ICs5NjAsOCBAQCBib29sIFJlbmRlckZs
ZXhpYmxlQm94OjpjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjb25z
dCBSZW5kZXJCbwogICAgICAgICAvLyBUaGlzIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggY29t
cHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoKS4KICAgICAgICAgLy8gRklYTUU6IHNv
IGZhciB3ZSdyZSBvbmx5IGNvbnNpZGVyZWQgZml4ZWQgc2l6ZXMgYnV0IHdlIHNob3VsZCBleHRl
bmQgaXQgdG8gb3RoZXIgZGVmaW5pdGUgc2l6ZXMuCiAgICAgICAgIGF1dG8mIGNyb3NzU2l6ZSA9
IGlzSG9yaXpvbnRhbEZsb3coKSA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7
CisgICAgICAgIGlmIChjcm9zc1NpemUuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgaXNIb3Jp
em9udGFsRmxvdygpKQorICAgICAgICAgICAgcmV0dXJuIHBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0
SXNSZXNvbHZhYmxlKCk7CiAgICAgICAgIHJldHVybiBjcm9zc1NpemUuaXNGaXhlZCgpOwogICAg
IH0KICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMDQ1LDYgKzEwNDksOCBAQCB2b2lkIFJlbmRlckZs
ZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMoYm9vbCByZWxheW91dENoaWxkcmVuKQogICAgIFZl
Y3RvcjxGbGV4SXRlbT4gYWxsSXRlbXM7CiAgICAgbV9vcmRlckl0ZXJhdG9yLmZpcnN0KCk7CiAg
ICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gbV9vcmRlckl0ZXJhdG9yLmN1cnJlbnRDaGlsZCgp
OyBjaGlsZDsgY2hpbGQgPSBtX29yZGVySXRlcmF0b3IubmV4dCgpKSB7CisgICAgICAgIGlmIChj
aGlsZC0+c3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgYWRkUGVyY2VudEhl
aWdodERlc2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91
bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRy
ZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAg
IGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDE1NzQ4NGMwYzQy
MTMxZmE1OWQxYjQ2ZTY0MjkxNjJmMWU1YTIxZS4uZTQzZjdiYmIwZDI0ZWQwMTI2M2NmM2M1Yzhj
NTllZjllNGYwNTcwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA4LTI3ICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRyaW5z
aWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA4LTI2ICBFbnJpcXVlIE9jYcOx
YSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl1b
TVNFXSBJbXBsZW1lbnQgdGhlICJzZXF1ZW5jZSIgbW9kZSBpbiBTb3VyY2VCdWZmZXIgZm9yIHRo
ZSBHU3RyZWFtZXIgcG9ydHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDZiZGUyZjk0ZWFkMjE3Yjg2
NDQzMjU3MThjMWY0YzYyMTFmMjc2NzAuLmUwNWExNmY0NjljMjE5MWFhZmJmOGNiYTc3ZGUzMmIz
YzJjYTdmNzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDE0MSw4ICs0MTQxLDYgQEAgd2Via2l0
Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl
eGJveC9mbGV4LWFzcGVjdC0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLWNvbHVt
bi0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1y
YXRpby1pbWctcm93LTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2Zs
ZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl
YmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMTQ1MTc2IGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3hfYWxpZ24taXRlbXMt
c3RyZXRjaC0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTAwOTMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvc2VsZWN0LWVs
ZW1lbnQtemVyby1oZWlnaHQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436617</attachid>
            <date>2021-08-27 03:57:42 -0700</date>
            <delta_ts>2021-08-27 05:15:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210827125740.patch</filename>
            <type>text/plain</type>
            <size>4568</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllZDc0NGE2YjNjYjI5
NzdlYjhlMTQzOGEyY2Q5ZTQ3OTA5YzMzZS4uYzI5YmQ5Mjc5Y2EyZTc0NmMyMWZjZmFiYTk1Zjc4
NzI5ZGRmNzcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayk6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91
bGRVc2VDb250YWluZXJDcm9zc1NpemUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
RmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMpOgorCiAyMDIxLTA4
LTI2ICBFbnJpcXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAg
ICAgICAgW0dTdHJlYW1lcl1bTVNFXSBJbXBsZW1lbnQgdGhlICJzZXF1ZW5jZSIgbW9kZSBpbiBT
b3VyY2VCdWZmZXIgZm9yIHRoZSBHU3RyZWFtZXIgcG9ydHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYzkzZGYyNGNiMGIwZDg2Yzk3
MzJmZjZhMTQ4NDk5ODZmMDE5ZmMuLmExMjFiYmUzZGFlNjg3ZmZkZDljYzJiMDI2NWNlOTlkOTI4
NzQzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcApAQCAtMzQ5LDcgKzM0OSw5IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJs
b2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIHJlc2V0TG9naWNh
bEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9yZWxhaWRPdXRDaGlsZHJlbi5j
bGVhcigpOwotICAgIAorCisgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERl
c2NlbmRhbnRzKCk7CisKICAgICBib29sIG9sZEluTGF5b3V0ID0gbV9pbkxheW91dDsKICAgICBt
X2luTGF5b3V0ID0gdHJ1ZTsKICAgICAKQEAgLTk1OCw2ICs5NjAsMTEgQEAgYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29u
c3QgUmVuZGVyQm8KICAgICAgICAgLy8gVGhpcyBtdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIGNv
bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKCkuCiAgICAgICAgIC8vIEZJWE1FOiBz
byBmYXIgd2UncmUgb25seSBjb25zaWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0
ZW5kIGl0IHRvIG90aGVyIGRlZmluaXRlIHNpemVzLgogICAgICAgICBhdXRvJiBjcm9zc1NpemUg
PSBpc0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgp
OworICAgICAgICBpZiAoY3Jvc3NTaXplLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7CisgICAg
ICAgICAgICBpZiAoIW1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKQorICAgICAgICAg
ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0dXJuIHBlcmNlbnRhZ2VMb2dpY2Fs
SGVpZ2h0SXNSZXNvbHZhYmxlKCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGNyb3NzU2l6
ZS5pc0ZpeGVkKCk7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAgLTEwNDUsNiArMTA1Miw4
IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0
Q2hpbGRyZW4pCiAgICAgVmVjdG9yPEZsZXhJdGVtPiBhbGxJdGVtczsKICAgICBtX29yZGVySXRl
cmF0b3IuZmlyc3QoKTsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBtX29yZGVySXRlcmF0
b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3JkZXJJdGVyYXRvci5uZXh0KCkp
IHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAg
ICAgICBhZGRQZXJjZW50SGVpZ2h0RGVzY2VuZGFudCgqY2hpbGQpOwogICAgICAgICBpZiAobV9v
cmRlckl0ZXJhdG9yLnNob3VsZFNraXBDaGlsZCgqY2hpbGQpKSB7CiAgICAgICAgICAgICAvLyBP
dXQtb2YtZmxvdyBjaGlsZHJlbiBhcmUgbm90IGZsZXggaXRlbXMsIHNvIHdlIHNraXAgdGhlbSBo
ZXJlLgogICAgICAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp
bmRleCBkMTU3NDg0YzBjNDIxMzFmYTU5ZDFiNDZlNjQyOTE2MmYxZTVhMjFlLi5lNDNmN2JiYjBk
MjRlZDAxMjYzY2YzYzVjOGM1OWVmOWU0ZjA1NzBmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw
MjEtMDgtMjcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggYXNw
ZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgyODMKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDgt
MjYgIEVucmlxdWUgT2Nhw7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdhbGlhLmNvbT4KIAogICAg
ICAgICBbR1N0cmVhbWVyXVtNU0VdIEltcGxlbWVudCB0aGUgInNlcXVlbmNlIiBtb2RlIGluIFNv
dXJjZUJ1ZmZlciBmb3IgdGhlIEdTdHJlYW1lciBwb3J0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg
NmJkZTJmOTRlYWQyMTdiODY0NDMyNTcxOGMxZjRjNjIxMWYyNzY3MC4uZTA1YTE2ZjQ2OWMyMTkx
YWFmYmY4Y2JhNzdkZTMyYjNjMmNhN2Y3MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MTQxLDgg
KzQxNDEsNiBAQCB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LQogd2Via2l0Lm9yZy9iLzIxOTM0MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVj
dC1yYXRpby1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4
Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJp
bnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8x
NDUxNzYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxl
eGJveF9hbGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIxMDA5MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
ZmxleGJveC9zZWxlY3QtZWxlbWVudC16ZXJvLWhlaWdodC0wMDEuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436618</attachid>
            <date>2021-08-27 05:15:17 -0700</date>
            <delta_ts>2021-08-27 09:21:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210827141515.patch</filename>
            <type>text/plain</type>
            <size>5511</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllZDc0NGE2YjNjYjI5
NzdlYjhlMTQzOGEyY2Q5ZTQ3OTA5YzMzZS4uYzI5YmQ5Mjc5Y2EyZTc0NmMyMWZjZmFiYTk1Zjc4
NzI5ZGRmNzcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayk6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91
bGRVc2VDb250YWluZXJDcm9zc1NpemUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
RmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMpOgorCiAyMDIxLTA4
LTI2ICBFbnJpcXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAg
ICAgICAgW0dTdHJlYW1lcl1bTVNFXSBJbXBsZW1lbnQgdGhlICJzZXF1ZW5jZSIgbW9kZSBpbiBT
b3VyY2VCdWZmZXIgZm9yIHRoZSBHU3RyZWFtZXIgcG9ydHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYzkzZGYyNGNiMGIwZDg2Yzk3
MzJmZjZhMTQ4NDk5ODZmMDE5ZmMuLmU2OGE4YWUzMzQxZDE2OTNlMWZkMGQ1YzM4YjI2OTAyMGUx
YmM2ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcApAQCAtMzQ5LDcgKzM0OSw5IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJs
b2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIHJlc2V0TG9naWNh
bEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9yZWxhaWRPdXRDaGlsZHJlbi5j
bGVhcigpOwotICAgIAorCisgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERl
c2NlbmRhbnRzKCk7CisKICAgICBib29sIG9sZEluTGF5b3V0ID0gbV9pbkxheW91dDsKICAgICBt
X2luTGF5b3V0ID0gdHJ1ZTsKICAgICAKQEAgLTk1OCw2ICs5NjAsMTEgQEAgYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29u
c3QgUmVuZGVyQm8KICAgICAgICAgLy8gVGhpcyBtdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIGNv
bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKCkuCiAgICAgICAgIC8vIEZJWE1FOiBz
byBmYXIgd2UncmUgb25seSBjb25zaWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0
ZW5kIGl0IHRvIG90aGVyIGRlZmluaXRlIHNpemVzLgogICAgICAgICBhdXRvJiBjcm9zc1NpemUg
PSBpc0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgp
OworICAgICAgICBpZiAoY3Jvc3NTaXplLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7CisgICAg
ICAgICAgICBpZiAoIW1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKQorICAgICAgICAg
ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0dXJuIHBlcmNlbnRhZ2VMb2dpY2Fs
SGVpZ2h0SXNSZXNvbHZhYmxlKCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGNyb3NzU2l6
ZS5pc0ZpeGVkKCk7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAgLTEwNDUsNiArMTA1Miw4
IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0
Q2hpbGRyZW4pCiAgICAgVmVjdG9yPEZsZXhJdGVtPiBhbGxJdGVtczsKICAgICBtX29yZGVySXRl
cmF0b3IuZmlyc3QoKTsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBtX29yZGVySXRlcmF0
b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3JkZXJJdGVyYXRvci5uZXh0KCkp
IHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgIWNoaWxk
Q3Jvc3NTaXplSXNEZWZpbml0ZSgqY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5P
clByZWZlcnJlZFNpemUsICpjaGlsZCkpKQorICAgICAgICAgICAgYWRkUGVyY2VudEhlaWdodERl
c2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lw
Q2hpbGQoKmNoaWxkKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJl
IG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChj
aGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDE1NzQ4NGMwYzQyMTMxZmE1
OWQxYjQ2ZTY0MjkxNjJmMWU1YTIxZS4uZTQzZjdiYmIwZDI0ZWQwMTI2M2NmM2M1YzhjNTllZjll
NGYwNTcwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl
c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA4LTI3ICBSb2IgQnVpcyAgPHJi
dWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6
ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA4LTI2ICBFbnJpcXVlIE9jYcOxYSBHb256
w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl1bTVNFXSBJ
bXBsZW1lbnQgdGhlICJzZXF1ZW5jZSIgbW9kZSBpbiBTb3VyY2VCdWZmZXIgZm9yIHRoZSBHU3Ry
ZWFtZXIgcG9ydHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDZiZGUyZjk0ZWFkMjE3Yjg2NDQzMjU3
MThjMWY0YzYyMTFmMjc2NzAuLmUwNWExNmY0NjljMjE5MWFhZmJmOGNiYTc3ZGUzMmIzYzJjYTdm
NzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDE0MSw4ICs0MTQxLDYgQEAgd2Via2l0Lm9yZy9i
LzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9m
bGV4LWFzcGVjdC0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLWNvbHVtbi0wMTUu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1p
bWctcm93LTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNw
ZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhi
b3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCi13ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMTQ1MTc2IGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3hfYWxpZ24taXRlbXMtc3RyZXRj
aC0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTAwOTMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvc2VsZWN0LWVsZW1lbnQt
emVyby1oZWlnaHQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94
L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1p
bnRyaW5zaWMtc2l6ZS0wMDUuaHRtbAppbmRleCAyMjVhNThkNGZiNGYzNDFhMTliMzcyYWIyNzJj
MTM3MDY0M2UwZDcwLi43YjE3ZDk3OTY2ZWRjYjlkMDNkMDZjZDY0OGJhYTIwOGIxMWUwZTc4IDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA1Lmh0bWwKKysrIGIv
TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhi
b3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNS5odG1sCkBAIC01LDcgKzUsNyBAQAog
PHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlLjwvcD4KIDxk
aXYgaWQ9InRhcmdldCIgc3R5bGU9ImhlaWdodDogNTBweDsgd2lkdGg6IG1pbi1jb250ZW50OyBi
YWNrZ3JvdW5kOiBncmVlbjsiPgogICA8ZGl2IHN0eWxlPSJkaXNwbGF5OiBmbGV4OyBoZWlnaHQ6
IDEwMCU7IGJhY2tncm91bmQ6IGdyZWVuOyI+Ci0gICAgPGRpdiBzdHlsZT0iYXNwZWN0LXJhdGlv
OiAxLzE7Ij48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSJhc3BlY3QtcmF0aW86IDEvMTt3ZHRoOjUw
cHgiPjwvZGl2PgogICA8L2Rpdj4KIDwvZGl2PgogPHNjcmlwdD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436633</attachid>
            <date>2021-08-27 09:21:25 -0700</date>
            <delta_ts>2021-08-30 00:40:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210827182124.patch</filename>
            <type>text/plain</type>
            <size>6316</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllZDc0NGE2YjNjYjI5
NzdlYjhlMTQzOGEyY2Q5ZTQ3OTA5YzMzZS4uYzI5YmQ5Mjc5Y2EyZTc0NmMyMWZjZmFiYTk1Zjc4
NzI5ZGRmNzcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayk6
CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91
bGRVc2VDb250YWluZXJDcm9zc1NpemUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy
RmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAg
KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMpOgorCiAyMDIxLTA4
LTI2ICBFbnJpcXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CiAKICAg
ICAgICAgW0dTdHJlYW1lcl1bTVNFXSBJbXBsZW1lbnQgdGhlICJzZXF1ZW5jZSIgbW9kZSBpbiBT
b3VyY2VCdWZmZXIgZm9yIHRoZSBHU3RyZWFtZXIgcG9ydHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYzkzZGYyNGNiMGIwZDg2Yzk3
MzJmZjZhMTQ4NDk5ODZmMDE5ZmMuLjc0YzI1NDk4ZDQwYjE4NDIyZjExY2FmZmEyNWE3YmEwNzBk
ZjAwOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94
LmNwcApAQCAtMzQ5LDcgKzM0OSw5IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJs
b2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIHJlc2V0TG9naWNh
bEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9yZWxhaWRPdXRDaGlsZHJlbi5j
bGVhcigpOwotICAgIAorCisgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERl
c2NlbmRhbnRzKCk7CisKICAgICBib29sIG9sZEluTGF5b3V0ID0gbV9pbkxheW91dDsKICAgICBt
X2luTGF5b3V0ID0gdHJ1ZTsKICAgICAKQEAgLTk1OCw2ICs5NjAsMTEgQEAgYm9vbCBSZW5kZXJG
bGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY29u
c3QgUmVuZGVyQm8KICAgICAgICAgLy8gVGhpcyBtdXN0IGJlIGtlcHQgaW4gc3luYyB3aXRoIGNv
bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKCkuCiAgICAgICAgIC8vIEZJWE1FOiBz
byBmYXIgd2UncmUgb25seSBjb25zaWRlcmVkIGZpeGVkIHNpemVzIGJ1dCB3ZSBzaG91bGQgZXh0
ZW5kIGl0IHRvIG90aGVyIGRlZmluaXRlIHNpemVzLgogICAgICAgICBhdXRvJiBjcm9zc1NpemUg
PSBpc0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDogc3R5bGUoKS53aWR0aCgp
OworICAgICAgICBpZiAoY3Jvc3NTaXplLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7CisgICAg
ICAgICAgICBpZiAoIW1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKQorICAgICAgICAg
ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0dXJuIHBlcmNlbnRhZ2VMb2dpY2Fs
SGVpZ2h0SXNSZXNvbHZhYmxlKCk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGNyb3NzU2l6
ZS5pc0ZpeGVkKCk7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAgLTEwNDUsNiArMTA1Miw4
IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0
Q2hpbGRyZW4pCiAgICAgVmVjdG9yPEZsZXhJdGVtPiBhbGxJdGVtczsKICAgICBtX29yZGVySXRl
cmF0b3IuZmlyc3QoKTsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBtX29yZGVySXRlcmF0
b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3JkZXJJdGVyYXRvci5uZXh0KCkp
IHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgIWNoaWxk
Q3Jvc3NTaXplSXNEZWZpbml0ZSgqY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5P
clByZWZlcnJlZFNpemUsICpjaGlsZCkpKQorICAgICAgICAgICAgYWRkUGVyY2VudEhlaWdodERl
c2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lw
Q2hpbGQoKmNoaWxkKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJl
IG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChj
aGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCkBAIC0xNjM1LDggKzE2NDQsMTIgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUNyb3NzU2l6ZUZvckNoaWxkVXNpbmdD
b250YWluZXJDcm9zc1NpemUoY28KICAgICAgICAgLy8gTGV0J3MgY29tcHV0ZSB0aGUgZGVmaW5p
dGUgc2l6ZSB2YWx1ZSBmb3IgdGhlIGZsZXggaXRlbSAodmFsdWUgdGhhdCB3ZSBjYW4gcmVzb2x2
ZSB3aXRob3V0IHJ1bm5pbmcgbGF5b3V0KS4KICAgICAgICAgYXV0byBpc0hvcml6b250YWwgPSBp
c0hvcml6b250YWxGbG93KCk7CiAgICAgICAgIGF1dG8gc2l6ZSA9IGlzSG9yaXpvbnRhbCA/IHN0
eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7Ci0gICAgICAgIEFTU0VSVChzaXplLmlz
Rml4ZWQoKSk7CisgICAgICAgIEFTU0VSVChzaXplLmlzRml4ZWQoKSB8fCBzaXplLmlzUGVyY2Vu
dE9yQ2FsY3VsYXRlZCgpKTsKICAgICAgICAgYXV0byBkZWZpbml0ZVZhbHVlID0gTGF5b3V0VW5p
dCB7IHNpemUudmFsdWUoKSB9OworICAgICAgICBpZiAoc2l6ZS5pc1BlcmNlbnRPckNhbGN1bGF0
ZWQoKSkgeworICAgICAgICAgICAgaWYgKGF1dG8gdmFsdWUgPSBjb21wdXRlUGVyY2VudGFnZUxv
Z2ljYWxIZWlnaHQoc2l6ZSkpCisgICAgICAgICAgICAgICAgZGVmaW5pdGVWYWx1ZSA9IExheW91
dFVuaXQgeyAqdmFsdWUgfTsKKyAgICAgICAgfQogCiAgICAgICAgIGF1dG8gbWF4aW11bVNpemUg
PSBpc0hvcml6b250YWwgPyBzdHlsZSgpLm1heEhlaWdodCgpIDogc3R5bGUoKS5tYXhXaWR0aCgp
OwogICAgICAgICBpZiAobWF4aW11bVNpemUuaXNGaXhlZCgpKQpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQxNTc0ODRjMGM0
MjEzMWZhNTlkMWI0NmU2NDI5MTYyZjFlNWEyMWUuLmU0M2Y3YmJiMGQyNGVkMDEyNjNjZjNjNWM4
YzU5ZWY5ZTRmMDU3MGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wOC0yNyAgUm9iIEJ1
aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhc3BlY3QtcmF0aW8taW50cmlu
c2ljLXNpemUtMDA0Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTIyODI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wOC0yNiAgRW5yaXF1ZSBPY2HD
sWEgR29uesOhbGV6ICA8ZW9jYW5oYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJd
W01TRV0gSW1wbGVtZW50IHRoZSAic2VxdWVuY2UiIG1vZGUgaW4gU291cmNlQnVmZmVyIGZvciB0
aGUgR1N0cmVhbWVyIHBvcnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA2YmRlMmY5NGVhZDIxN2I4
NjQ0MzI1NzE4YzFmNGM2MjExZjI3NjcwLi5lMDVhMTZmNDY5YzIxOTFhYWZiZjhjYmE3N2RlMzJi
M2MyY2E3ZjcyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBi
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQxNDEsOCArNDE0MSw2IEBAIHdlYmtp
dC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvZmxleC1hc3BlY3QtCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1jb2x1
bW4tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3Qt
cmF0aW8taW1nLXJvdy0wMDcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9m
bGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13
ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA1Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzE0NTE3NiBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4Ym94X2FsaWduLWl0ZW1z
LXN0cmV0Y2gtMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjEwMDkz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L3NlbGVjdC1l
bGVtZW50LXplcm8taGVpZ2h0LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
ZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA1Lmh0bWwgYi9MYXlvdXRUZXN0
cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3Qt
cmF0aW8taW50cmluc2ljLXNpemUtMDA1Lmh0bWwKaW5kZXggMjI1YTU4ZDRmYjRmMzQxYTE5YjM3
MmFiMjcyYzEzNzA2NDNlMGQ3MC4uN2IxN2Q5Nzk2NmVkY2I5ZDAzZDA2Y2Q2NDhiYWEyMDhiMTFl
MGU3OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNS5odG1s
CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbApAQCAtNSw3ICs1
LDcgQEAKIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZS48
L3A+CiA8ZGl2IGlkPSJ0YXJnZXQiIHN0eWxlPSJoZWlnaHQ6IDUwcHg7IHdpZHRoOiBtaW4tY29u
dGVudDsgYmFja2dyb3VuZDogZ3JlZW47Ij4KICAgPGRpdiBzdHlsZT0iZGlzcGxheTogZmxleDsg
aGVpZ2h0OiAxMDAlOyBiYWNrZ3JvdW5kOiBncmVlbjsiPgotICAgIDxkaXYgc3R5bGU9ImFzcGVj
dC1yYXRpbzogMS8xOyI+PC9kaXY+CisgICAgPGRpdiBzdHlsZT0iYXNwZWN0LXJhdGlvOiAxLzE7
d2R0aDo1MHB4Ij48L2Rpdj4KICAgPC9kaXY+CiA8L2Rpdj4KIDxzY3JpcHQ+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436759</attachid>
            <date>2021-08-30 00:40:20 -0700</date>
            <delta_ts>2021-08-31 03:12:32 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210830094018.patch</filename>
            <type>text/plain</type>
            <size>5640</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM5MDU1ZGE1ZjU1Yzhh
Y2M0MTVkMDVkNzdmNjE5Y2E1MWNkNTJiNi4uODg3YWJlY2IzZWVlYTgwMzFlZjRkMDA0OTY1YTUw
MmY2MjRlZjkxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA4LTMwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgdG8gaGFuZGxlIGZsZXggaXRlbXMgdGhhdCB1c2UgYXNwZWN0
LXJhdGlvCisgICAgICAgIGFuZCBkZXBlbmQgb24gZmxleCBjb250YWluZXIgcGVyY2VudGFnZSBo
ZWlnaHRzLgorICAgICAgICBBbHNvIGNoZWNrIGNvbnRhaW5lciBjcm9zcyBzaXplIHBlcmNlbnRh
Z2VzIHRvCisgICAgICAgIHNlZSBpZiB0aGV5IGFyZSByZXNvbHZhYmxlLgorCisgICAgICAgICog
cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl
ckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4
aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUgY29uc3Qp
OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZsZXhC
YXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojps
YXlvdXRGbGV4SXRlbXMpOgorCiAyMDIxLTA4LTI5ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl
LmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmUgImxpbmUgbmVlZHMgaW50ZWdyYWwgc25h
cHBpbmciIGNvbXB1dGluZyB0byBJRkMgZnJvbSB0aGUgaW50ZWdyYXRpb24gbGF5ZXIKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYzkz
ZGYyNGNiMGIwZDg2Yzk3MzJmZjZhMTQ4NDk5ODZmMDE5ZmMuLjc0YzI1NDk4ZDQwYjE4NDIyZjEx
Y2FmZmEyNWE3YmEwNzBkZjAwOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzQ5LDcgKzM0OSw5IEBAIHZvaWQgUmVuZGVyRmxleGli
bGVCb3g6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAog
ICAgIHJlc2V0TG9naWNhbEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9yZWxh
aWRPdXRDaGlsZHJlbi5jbGVhcigpOwotICAgIAorCisgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVy
Y2VudGFnZUhlaWdodERlc2NlbmRhbnRzKCk7CisKICAgICBib29sIG9sZEluTGF5b3V0ID0gbV9p
bkxheW91dDsKICAgICBtX2luTGF5b3V0ID0gdHJ1ZTsKICAgICAKQEAgLTk1OCw2ICs5NjAsMTEg
QEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWlu
ZXJDcm9zc1NpemUoY29uc3QgUmVuZGVyQm8KICAgICAgICAgLy8gVGhpcyBtdXN0IGJlIGtlcHQg
aW4gc3luYyB3aXRoIGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKCkuCiAgICAg
ICAgIC8vIEZJWE1FOiBzbyBmYXIgd2UncmUgb25seSBjb25zaWRlcmVkIGZpeGVkIHNpemVzIGJ1
dCB3ZSBzaG91bGQgZXh0ZW5kIGl0IHRvIG90aGVyIGRlZmluaXRlIHNpemVzLgogICAgICAgICBh
dXRvJiBjcm9zc1NpemUgPSBpc0hvcml6b250YWxGbG93KCkgPyBzdHlsZSgpLmhlaWdodCgpIDog
c3R5bGUoKS53aWR0aCgpOworICAgICAgICBpZiAoY3Jvc3NTaXplLmlzUGVyY2VudE9yQ2FsY3Vs
YXRlZCgpKSB7CisgICAgICAgICAgICBpZiAoIW1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hp
bGQpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0dXJuIHBl
cmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCk7CisgICAgICAgIH0KICAgICAgICAg
cmV0dXJuIGNyb3NzU2l6ZS5pc0ZpeGVkKCk7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKQEAg
LTEwNDUsNiArMTA1Miw4IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVt
cyhib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgVmVjdG9yPEZsZXhJdGVtPiBhbGxJdGVtczsK
ICAgICBtX29yZGVySXRlcmF0b3IuZmlyc3QoKTsKICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQg
PSBtX29yZGVySXRlcmF0b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IG1fb3JkZXJJ
dGVyYXRvci5uZXh0KCkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHlsZSgpLmhhc0FzcGVjdFJh
dGlvKCkgJiYgIWNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZSgqY2hpbGQsIGNyb3NzU2l6ZUxlbmd0
aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsICpjaGlsZCkpKQorICAgICAgICAgICAgYWRk
UGVyY2VudEhlaWdodERlc2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVy
YXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZs
b3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAg
ICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCkBAIC0xNjM1LDgg
KzE2NDQsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUNyb3NzU2l6
ZUZvckNoaWxkVXNpbmdDb250YWluZXJDcm9zc1NpemUoY28KICAgICAgICAgLy8gTGV0J3MgY29t
cHV0ZSB0aGUgZGVmaW5pdGUgc2l6ZSB2YWx1ZSBmb3IgdGhlIGZsZXggaXRlbSAodmFsdWUgdGhh
dCB3ZSBjYW4gcmVzb2x2ZSB3aXRob3V0IHJ1bm5pbmcgbGF5b3V0KS4KICAgICAgICAgYXV0byBp
c0hvcml6b250YWwgPSBpc0hvcml6b250YWxGbG93KCk7CiAgICAgICAgIGF1dG8gc2l6ZSA9IGlz
SG9yaXpvbnRhbCA/IHN0eWxlKCkuaGVpZ2h0KCkgOiBzdHlsZSgpLndpZHRoKCk7Ci0gICAgICAg
IEFTU0VSVChzaXplLmlzRml4ZWQoKSk7CisgICAgICAgIEFTU0VSVChzaXplLmlzRml4ZWQoKSB8
fCBzaXplLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpKTsKICAgICAgICAgYXV0byBkZWZpbml0ZVZh
bHVlID0gTGF5b3V0VW5pdCB7IHNpemUudmFsdWUoKSB9OworICAgICAgICBpZiAoc2l6ZS5pc1Bl
cmNlbnRPckNhbGN1bGF0ZWQoKSkgeworICAgICAgICAgICAgaWYgKGF1dG8gdmFsdWUgPSBjb21w
dXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoc2l6ZSkpCisgICAgICAgICAgICAgICAgZGVmaW5p
dGVWYWx1ZSA9IExheW91dFVuaXQgeyAqdmFsdWUgfTsKKyAgICAgICAgfQogCiAgICAgICAgIGF1
dG8gbWF4aW11bVNpemUgPSBpc0hvcml6b250YWwgPyBzdHlsZSgpLm1heEhlaWdodCgpIDogc3R5
bGUoKS5tYXhXaWR0aCgpOwogICAgICAgICBpZiAobWF4aW11bVNpemUuaXNGaXhlZCgpKQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu
ZGV4IDQzMjI5OTkzZTBhMGQzZmU4MzIwZDJlMzNhZWRiNzllZmQxM2YyODYuLmZhOWQ5ZTJiMjk4
NDM0NjllNTJlYWM4NjYyOGE4NGE0M2E2MTNlOTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No
YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAy
MS0wOC0zMCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhc3Bl
Y3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBpbXByb3ZlZCB0ZXN0IHJlc3VsdHMuCisK
KyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA4LTI5ICBMYXVybyBNb3VyYSAg
PGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHTElCXSBVcGRhdGUgZmFzdC9ib3JkZXIg
YmFzZWxpbmVzIGFmdGVyIHIyODE3MjQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBl
Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGFlNTZkZTRjNTBh
YjUyMDdkMjMwNjFiOTI4YzJlZjNkOTA0MzFiMjQuLjc3NTEwM2NkYzdiOWY1NjkxNTM4YzY0MmNl
MTA4MTNiODBjYzZlOTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
KysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDEyMCw4ICs0MTIwLDYgQEAg
d2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZmxleGJveC9mbGV4LWFzcGVjdC0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1n
LWNvbHVtbi0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFz
cGVjdC1yYXRpby1pbWctcm93LTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4
Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KLXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0w
MDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMTQ1MTc2IGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3hfYWxpZ24t
aXRlbXMtc3RyZXRjaC0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y
MTAwOTMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvc2Vs
ZWN0LWVsZW1lbnQtemVyby1oZWlnaHQtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436867</attachid>
            <date>2021-08-31 03:12:38 -0700</date>
            <delta_ts>2021-08-31 06:02:54 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210831121237.patch</filename>
            <type>text/plain</type>
            <size>4052</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIyMjcxZjBjNGMyMDVm
OTljMmViYjU2ZjlhYzRhZDkxMjMyZTE1MC4uOTQxMWY5NDM5YWIwMTY3OTgwZTMyZGE3MjI4MjRm
NWI3Mzg0MjI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA4LTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgdG8gaGFuZGxlIGZsZXggaXRlbXMgdGhhdCB1c2UgYXNwZWN0
LXJhdGlvCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEZsZXhJdGVtcyk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5kUGxhY2VDaGlsZHJlbik6
CisKIDIwMjEtMDgtMzEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg
ICAgUmUtZ2VuZXJhbGl6ZSB0b3AgbGF5ZXIgZWxlbWVudCBjb25jZXB0CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA5ZmM5M2RmMjRjYjBi
MGQ4NmM5NzMyZmY2YTE0ODQ5OTg2ZjAxOWZjLi41NWFjMDUyZjBiOTdkNGVjMDA2MTEyYmU4NGUz
YTI2ZGUwZTU3NjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5jcHAKQEAgLTEwNDUsNiArMTA0NSw4IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6
OmxheW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgVmVjdG9yPEZsZXhJ
dGVtPiBhbGxJdGVtczsKICAgICBtX29yZGVySXRlcmF0b3IuZmlyc3QoKTsKICAgICBmb3IgKFJl
bmRlckJveCogY2hpbGQgPSBtX29yZGVySXRlcmF0b3IuY3VycmVudENoaWxkKCk7IGNoaWxkOyBj
aGlsZCA9IG1fb3JkZXJJdGVyYXRvci5uZXh0KCkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5zdHls
ZSgpLmhhc0FzcGVjdFJhdGlvKCkgJiYgIWNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZSgqY2hpbGQs
IGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsICpjaGlsZCkpKQor
ICAgICAgICAgICAgYWRkUGVyY2VudEhlaWdodERlc2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAg
aWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAgICAg
ICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lw
IHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVk
KCkpCkBAIC0xODA3LDYgKzE4MDksOCBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEhh
c1BlcmNlbnRIZWlnaHREZXNjZW5kYW50cyhjb25zdCBSZW5kZXJCb3gmIHJlbmRlcgogCiB2b2lk
IFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKExheW91dFVuaXQmIGNy
b3NzQXhpc09mZnNldCwgVmVjdG9yPEZsZXhJdGVtPiYgY2hpbGRyZW4sIExheW91dFVuaXQgYXZh
aWxhYmxlRnJlZVNwYWNlLCBib29sIHJlbGF5b3V0Q2hpbGRyZW4sIFZlY3RvcjxMaW5lQ29udGV4
dD4mIGxpbmVDb250ZXh0cywgTGF5b3V0VW5pdCBnYXBCZXR3ZWVuSXRlbXMpCiB7CisgICAgZGly
dHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnRzKCk7CisKICAgICBDb250
ZW50UG9zaXRpb24gcG9zaXRpb24gPSBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnRQb3Np
dGlvbihjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IoKSk7CiAgICAgQ29udGVudERpc3Ry
aWJ1dGlvbiBkaXN0cmlidXRpb24gPSBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnREaXN0
cmlidXRpb24oY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yKCkpOwogCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNGY0
MzgyMjE2ZjZjNmZmYmEwNWU3NTM5YWJhNzg5YWQxYTRlYjZjYi4uMGNlYjgzZWM1OTlhNGQwZTFl
MWYyMDQ5ZmFkZDY0MzQ5ZjY1NjZlOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA4LTMx
ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRp
by1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgVXBkYXRlIGltcHJvdmVkIHRlc3QgcmVzdWx0cy4KKworICAgICAg
ICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDgtMzEgIEtpbW1vIEtpbm51bmVuICA8a2tp
bm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJnbC8xLjAueC9jb25mb3JtYW5jZS9nbHNs
L21pc2MvZnJhZ2NvbG9yLWZyYWdkYXRhLWludmFyaWFudC5odG1sIGZhaWxzCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0
aW9ucwppbmRleCA5MTk0ZDU2Yzk3OTA0YjVmZmNkNzhjMjljM2M0Njc5Njc0ODlkMTFiLi43ZGYw
MzM1OWEwZTA0Mzg0NzJiZDZjOWM0ZDdmMDY2YmIzMTM0YzgxIDEwMDY0NAotLS0gYS9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK
QEAgLTQxMjYsNyArNDEyNiw2IEBAIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtCiB3ZWJraXQub3Jn
L2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94
L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNp
Yy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8xNDUx
NzYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleGJv
eF9hbGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0
Lm9yZy9iLzIxMDA5MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl
eGJveC9zZWxlY3QtZWxlbWVudC16ZXJvLWhlaWdodC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQo=
</data>
<flag name="commit-queue"
          id="459971"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436879</attachid>
            <date>2021-08-31 05:56:21 -0700</date>
            <delta_ts>2021-09-01 02:28:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210831145619.patch</filename>
            <type>text/plain</type>
            <size>3784</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGIyMjcxZjBjNGMyMDVm
OTljMmViYjU2ZjlhYzRhZDkxMjMyZTE1MC4uOTI3ODBmYTQyMzA5YjUxMmU4ODFlMDg5N2FjZGJm
OGUzZDNiNGZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA4LTMxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Omxh
eW91dEZsZXhJdGVtcyk6CisKIDIwMjEtMDgtMzEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp
dC5vcmc+CiAKICAgICAgICAgUmUtZ2VuZXJhbGl6ZSB0b3AgbGF5ZXIgZWxlbWVudCBjb25jZXB0
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRl
eCA5ZmM5M2RmMjRjYjBiMGQ4NmM5NzMyZmY2YTE0ODQ5OTg2ZjAxOWZjLi5kMmIwZTMzOGJjZGJm
MmMyM2U1ZTc1YzZhYzhjOTA3ODZmYWQ0ZGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTM0Nyw2ICszNDcsOCBAQCB2b2lkIFJlbmRl
ckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVu
aXQpCiAKICAgICBMYXlvdXRSZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFp
bnREdXJpbmdMYXlvdXQoKSk7CiAKKyAgICBkaXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVp
Z2h0RGVzY2VuZGFudHMoKTsKKwogICAgIHJlc2V0TG9naWNhbEhlaWdodEJlZm9yZUxheW91dElm
TmVlZGVkKCk7CiAgICAgbV9yZWxhaWRPdXRDaGlsZHJlbi5jbGVhcigpOwogICAgIApAQCAtMTA0
NSw2ICsxMDQ3LDggQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1zKGJv
b2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICBWZWN0b3I8RmxleEl0ZW0+IGFsbEl0ZW1zOwogICAg
IG1fb3JkZXJJdGVyYXRvci5maXJzdCgpOwogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IG1f
b3JkZXJJdGVyYXRvci5jdXJyZW50Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gbV9vcmRlckl0ZXJh
dG9yLm5leHQoKSkgeworICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8o
KSAmJiBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZSgqY2hpbGQpKQor
ICAgICAgICAgICAgYWRkUGVyY2VudEhlaWdodERlc2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAg
aWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAgICAg
ICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lw
IHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVk
KCkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu
Z2VMb2cKaW5kZXggNGY0MzgyMjE2ZjZjNmZmYmEwNWU3NTM5YWJhNzg5YWQxYTRlYjZjYi4uMGNl
YjgzZWM1OTlhNGQwZTFlMWYyMDQ5ZmFkZDY0MzQ5ZjY1NjZlOSAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0
IEBACisyMDIxLTA4LTMxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAg
Rml4IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIGltcHJvdmVkIHRlc3QgcmVz
dWx0cy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDgtMzEgIEtpbW1v
IEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICB3ZWJnbC8xLjAueC9j
b25mb3JtYW5jZS9nbHNsL21pc2MvZnJhZ2NvbG9yLWZyYWdkYXRhLWludmFyaWFudC5odG1sIGZh
aWxzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5MTk0ZDU2Yzk3OTA0YjVmZmNkNzhjMjljM2M0Njc5
Njc0ODlkMTFiLi41NTc0ZGI3MTU1MWM5ZDBjYjI2YzIxMTY5YjcwZWUyNmY4NTFkMmFhIDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rl
c3RFeHBlY3RhdGlvbnMKQEAgLTQxMjUsNyArNDEyNSw2IEBAIHdlYmtpdC5vcmcvYi8yMTkzNDMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3Bl
Y3QtCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1jb2x1bW4tMDE1Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0w
MDcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRp
by1pbWctcm93LTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE5
MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVj
dC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
ZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzE0NTE3NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4Ym94X2FsaWduLWl0ZW1zLXN0cmV0Y2gtMy5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437004</attachid>
            <date>2021-09-01 02:28:52 -0700</date>
            <delta_ts>2021-09-02 04:42:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210901112851.patch</filename>
            <type>text/plain</type>
            <size>3763</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc4NGQ5N2E3MjBjOGM4
NWQ3OThmNTFiNTQ4YjViNGM5MWQ3MWUyMS4uZjZiY2JlNDhjZGVlNzIwOWYzMGRmMWQwNTA5MjQ3
YjM2ZDQ1Y2EyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTAxICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Omxh
eW91dEZsZXhJdGVtcyk6CisKIDIwMjEtMDktMDEgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBh
cHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXShSRUdSRVNTSU9OKTogQSBkZXRhY2hl
ZCBjYW52YXMgbGVha3MgYWxsIHRoZSBpbWFnZXMgaXQgZHJhd3MKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y
ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYzkzZGYyNGNiMGIwZDg2
Yzk3MzJmZjZhMTQ4NDk5ODZmMDE5ZmMuLjg1ZWRmOGU5OWNkYjc3ZGZkNGJkMmU3NDgzZjI2ZWY4
Mzg1YWIwMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4
aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl
Qm94LmNwcApAQCAtMzQ3LDYgKzM0Nyw4IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91
dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIExheW91dFJl
cGFpbnRlciByZXBhaW50ZXIoKnRoaXMsIGNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKTsK
IAorICAgIGRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50cygpOwor
CiAgICAgcmVzZXRMb2dpY2FsSGVpZ2h0QmVmb3JlTGF5b3V0SWZOZWVkZWQoKTsKICAgICBtX3Jl
bGFpZE91dENoaWxkcmVuLmNsZWFyKCk7CiAgICAgCkBAIC0xMDQ1LDYgKzEwNDcsOCBAQCB2b2lk
IFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMoYm9vbCByZWxheW91dENoaWxkcmVu
KQogICAgIFZlY3RvcjxGbGV4SXRlbT4gYWxsSXRlbXM7CiAgICAgbV9vcmRlckl0ZXJhdG9yLmZp
cnN0KCk7CiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gbV9vcmRlckl0ZXJhdG9yLmN1cnJl
bnRDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBtX29yZGVySXRlcmF0b3IubmV4dCgpKSB7CisgICAg
ICAgIGlmIChjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZSgqY2hpbGQp
KQorICAgICAgICAgICAgYWRkUGVyY2VudEhlaWdodERlc2NlbmRhbnQoKmNoaWxkKTsKICAgICAg
ICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAg
ICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRyZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBz
a2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlv
bmVkKCkpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKaW5kZXggODFmMjdiYjY4MjEzY2FhNWRiZjJkYTAyYmNlZTA2MTNmYTdlMjI2OC4u
YWY2N2YxZTdjM2MyNjJkOWFiZDM2OGE5NTZkM2Q0MTBiOGFkNWI5ZiAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx
LDE0IEBACisyMDIxLTA5LTAxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAg
ICAgRml4IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2
aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIGltcHJvdmVkIHRlc3Qg
cmVzdWx0cy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDgtMzEgIE15
bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBvcnQg
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZm9udC1sb2FkaW5nCmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpp
bmRleCAzNmNjMjljNDkzYWQzY2RjNjMwOTE0NTM2NDBiOWRhM2ZkZmYzZDY1Li41ODNkMWM1MTkz
YjkzNzUxNjMyZGJlMmRhODFiZDliYzlhZGRjZTNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9U
ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQx
MzUsNyArNDEzNSw2IEBAIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtCiB3ZWJraXQub3JnL2IvMjE5
MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgt
YXNwZWN0LXJhdGlvLWltZy1jb2x1bW4tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMDcuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxMC5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6
ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8t
aW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0Lm9y
Zy9iLzE0NTE3NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJv
eC9mbGV4Ym94X2FsaWduLWl0ZW1zLXN0cmV0Y2gtMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437136</attachid>
            <date>2021-09-02 04:42:43 -0700</date>
            <delta_ts>2021-09-02 10:25:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210902134242.patch</filename>
            <type>text/plain</type>
            <size>2345</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTIwZDNlNjcwOGU4ZWI1
ZDYwNjYxZjI2MjkyNzQ4YTYzZWYwMTY1My4uNjE2MThhOGRlZTJhODk4ZTRiZTU2NzFmOGUxMWU0
YWQxYWUwYWU3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA5LTAyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpkaXJ0eUZvckxheW91dEZyb21QZXJjZW50
YWdlSGVpZ2h0RGVzY2VuZGFudHMpOgorCiAyMDIxLTA5LTAyICBSb2IgQnVpcyAgPHJidWlzQGln
YWxpYS5jb20+CiAKICAgICAgICAgQWJzb2x1dGVseSBwb3NpdGlvbmVkIGFuZCBuZWdhdGl2ZSB6
LWluZGV4IGRpdiB3aXRoIGNhbnZhcyBjaGlsZCBnZXRzIGRyYXduIHdpdGggd3Jvbmcgc3RhY2tp
bmcgb3JkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j
ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDFh
OTdjN2Q0MmNjYjFjZjI3ZDdkOTQwYzQzM2ZiYWQ3YmQ3Zjg4OGIuLmQ4NmE5ZDdiMWViN2MyY2I4
ZTc3MjNmYjdkZGE2ZjE1MThjOTJlZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJsb2NrLmNwcApAQCAtODM5LDIwICs4MzksNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpkaXJ0eUZv
ckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKQogICAgICAgICAgICAgLy8g
KEEgaG9yaXpvbnRhbCBmbGV4Ym94IHRoYXQgY29udGFpbnMgYW4gaW5saW5lIGltYWdlIHdyYXBw
ZWQgaW4gYW4gYW5vbnltb3VzIGJsb2NrIGZvciBleGFtcGxlLikKICAgICAgICAgICAgIGlmIChy
ZW5kZXJlci0+aGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSB8fCByZW5kZXJlci0+c3R5bGUoKS5o
YXNBc3BlY3RSYXRpbygpKQogICAgICAgICAgICAgICAgIHJlbmRlcmVyLT5zZXRQcmVmZXJyZWRM
b2dpY2FsV2lkdGhzRGlydHkodHJ1ZSk7Ci0gICAgICAgICAgICBhdXRvKiBjb250YWluZXIgPSBy
ZW5kZXJlci0+Y29udGFpbmVyKCk7Ci0gICAgICAgICAgICAvLyBNYXJrIHRoZSBzdmcgYW5jZXN0
b3IgY2hhaW4gZGlydHkgYXMgd2Ugd2FsayB0byB0aGUgY29udGFpbmVyLgotICAgICAgICAgICAg
aWYgKGlzPFNWR0VsZW1lbnQ+KHJlbmRlcmVyLT5lbGVtZW50KCkpICYmIGNvbnRhaW5lciAhPSBy
ZW5kZXJlci0+cGFyZW50KCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvKiBhbmNlc3RvciA9IHJl
bmRlcmVyLT5wYXJlbnQoKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQoYW5jZXN0b3ItPmlzRGVz
Y2VuZGFudE9mKGNvbnRhaW5lcikpOwotICAgICAgICAgICAgICAgIHdoaWxlIChhbmNlc3RvciAh
PSBjb250YWluZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgYW5jZXN0b3ItPnNldENoaWxkTmVl
ZHNMYXlvdXQoTWFya09ubHlUaGlzKTsKLSAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyB0
aGUgdG9wbW9zdCBTVkcgcm9vdCwgbm8gbmVlZCB0byBnbyBhbnkgZnVydGhlci4KLSAgICAgICAg
ICAgICAgICAgICAgaWYgKGlzPFNWR1NWR0VsZW1lbnQ+KGFuY2VzdG9yLT5lbGVtZW50KCkpICYm
ICFkb3duY2FzdDxTVkdTVkdFbGVtZW50PigqYW5jZXN0b3ItPmVsZW1lbnQoKSkub3duZXJTVkdF
bGVtZW50KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAg
ICAgICAgYW5jZXN0b3IgPSBhbmNlc3Rvci0+cGFyZW50KCk7Ci0gICAgICAgICAgICAgICAgfQot
ICAgICAgICAgICAgfQotICAgICAgICAgICAgcmVuZGVyZXIgPSBjb250YWluZXI7CisgICAgICAg
ICAgICByZW5kZXJlciA9IHJlbmRlcmVyLT5jb250YWluZXIoKTsKICAgICAgICAgICAgIEFTU0VS
VChyZW5kZXJlcik7CiAgICAgICAgICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICAgICAgICAg
IGJyZWFrOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437165</attachid>
            <date>2021-09-02 10:25:28 -0700</date>
            <delta_ts>2021-09-03 12:36:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210902192526.patch</filename>
            <type>text/plain</type>
            <size>6328</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDUzNDQyNWRjMTc0OTI0
NDUzN2UyNDBjODBlYmE3MWI2MWM5NmU0Mi4uZmE0NjJhNjk0NzAxNGZjZDY0ZDkyN2NkMjZhOGI2
MTEwNDgwMDc3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTAyICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Omxh
eW91dEZsZXhJdGVtcyk6CisKIDIwMjEtMDktMDIgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu
Y29tPgogCiAgICAgICAgIEFkZCBtb3JlIHN1cHBvcnQgZm9yIEpJVCBvcGVyYXRpb24gdmFsaWRh
dGlvbiB0ZXN0aW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKaW5kZXggZGE4ZDczNWQwOTg3ODM3M2E4MGQzN2Q3MGFmYjE5MTJhNzAzODBhNi4u
MzQwNjNmZmU2M2UwMjcxZmU3MmVmZTM0MGFjYjkxYWY4MjA4Yzk0NSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0zNTYsNiArMzU2LDgg
QEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QmxvY2soYm9vbCByZWxheW91dENoaWxk
cmVuLCBMYXlvdXRVbml0KQogICAgIGlmIChyZWNvbXB1dGVMb2dpY2FsV2lkdGgoKSkKICAgICAg
ICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7CiAKKyAgICBkaXJ0eUZvckxheW91dEZyb21QZXJj
ZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKTsKKwogICAgIExheW91dFVuaXQgcHJldmlvdXNIZWln
aHQgPSBsb2dpY2FsSGVpZ2h0KCk7CiAgICAgc2V0TG9naWNhbEhlaWdodChib3JkZXJBbmRQYWRk
aW5nTG9naWNhbEhlaWdodCgpICsgc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpKTsKICAgICB7CkBA
IC00MDMsNyArNDA1LDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QmxvY2soYm9v
bCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0KQogICAgIHJlcGFpbnRlci5yZXBhaW50QWZ0
ZXJMYXlvdXQoKTsKIAogICAgIGNsZWFyTmVlZHNMYXlvdXQoKTsKLSAgICAKKwogICAgIG1faW5M
YXlvdXQgPSBvbGRJbkxheW91dDsKIH0KIApAQCAtMTA1MCw2ICsxMDUyLDggQEAgdm9pZCBSZW5k
ZXJGbGV4aWJsZUJveDo6bGF5b3V0RmxleEl0ZW1zKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAg
ICBWZWN0b3I8RmxleEl0ZW0+IGFsbEl0ZW1zOwogICAgIG1fb3JkZXJJdGVyYXRvci5maXJzdCgp
OwogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IG1fb3JkZXJJdGVyYXRvci5jdXJyZW50Q2hp
bGQoKTsgY2hpbGQ7IGNoaWxkID0gbV9vcmRlckl0ZXJhdG9yLm5leHQoKSkgeworICAgICAgICBp
ZiAoY2hpbGQtPnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiBjaGlsZENyb3NzU2l6ZVNob3Vs
ZFVzZUNvbnRhaW5lckNyb3NzU2l6ZSgqY2hpbGQpKQorICAgICAgICAgICAgYWRkUGVyY2VudEhl
aWdodERlc2NlbmRhbnQoKmNoaWxkKTsKICAgICAgICAgaWYgKG1fb3JkZXJJdGVyYXRvci5zaG91
bGRTa2lwQ2hpbGQoKmNoaWxkKSkgewogICAgICAgICAgICAgLy8gT3V0LW9mLWZsb3cgY2hpbGRy
ZW4gYXJlIG5vdCBmbGV4IGl0ZW1zLCBzbyB3ZSBza2lwIHRoZW0gaGVyZS4KICAgICAgICAgICAg
IGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzg1Njk3YmE0ZjU4
NDQ3ZTc5NDNlMmRiZDZiZWE0YmRiYjA5YjQ0NS4uYWI5Y2NiOTg0ODMxMDYzZDliZmEwYjljODc4
NmZjZmU0ZDliZTJlOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA5LTAyICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRyaW5z
aWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgVXBkYXRlIGltcHJvdmVkIHRlc3QgcmVzdWx0cy4KKworICAgICAgICAqIFRlc3RF
eHBlY3RhdGlvbnM6CisKIDIwMjEtMDktMDEgIFNvbmlhIFNpbmdsYSAgPHNzaW5nbGFAaWdhbGlh
LmNvbT4KIAogICAgICAgICBSZXBsYWNlIHdlYmtpdC0gcHJlZml4IGxvZ2ljYWwgcHJvcGVydGll
cyB3aXRoIFN0YW5kYXJkIFByb3BlcnRpZXMgaW4gTGF5b3V0VGVzdHMvCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cwppbmRleCA4MWQ4MjlhZTM4YWRlMmM2NmRhYWM3ZGVhYWUxYjQxZjAzMGNiMmM2Li43NTgwZWQx
YmJjYTVlM2VjYzNmMGNkZTdkNjVkMTliNDAxOTk1YWRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAg
LTQxMzYsNyArNDEzNiw2IEBAIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtCiB3ZWJraXQub3JnL2Iv
MjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2Zs
ZXgtYXNwZWN0LXJhdGlvLWltZy1jb2x1bW4tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMDcuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxMC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMt
c2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0
aW8taW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0
Lm9yZy9iLzE0NTE3NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl
eGJveC9mbGV4Ym94X2FsaWduLWl0ZW1zLXN0cmV0Y2gtMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDAyLmh0bWwg
Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl
eGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDAyLmh0bWwKaW5kZXggMGNiYjY2MmE0
ZWMzOWNhMmQ5ZDI4OTZhYjNiZjhlMzlmNzExODI1ZC4uMDYzYzI1MDFjOGQ5MmFlM2E2OGNjNTBl
NTFlNmY1M2RmOTk2YjEyNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1z
aXplLTAwMi5odG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDIuaHRt
bApAQCAtMyw3ICszLDcgQEAKIDxsaW5rIHJlbD0ibWF0Y2giIGhyZWY9Ii4uL3JlZmVyZW5jZS9y
ZWYtZmlsbGVkLWdyZWVuLTEwMHB4LXNxdWFyZS1vbmx5Lmh0bWwiPgogPG1ldGEgbmFtZT0iYXNz
ZXJ0IiBjb250ZW50PSJUaGlzIGNoZWNrcyB0aGF0IHJlcGxhY2VkIGVsZW1lbnQgdHJhbnNmZXJz
IGl0cyBzaXplIHdoZW4gcmVzb2x2aW5nIGFnYWluc3QgYSBmbGV4LWl0ZW0gd2l0aCBzdHJldGNo
IGFsaWdubWVudC4iPgogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4g
c3F1YXJlLjwvcD4KLTxkaXYgaWQ9InRhcmdldCIgc3R5bGU9ImRpc3BsYXk6IGlubGluZS1mbGV4
OyBoZWlnaHQ6IDUwcHg7IGJhY2tncm91bmQ6IGdyZWVuOyI+Cis8ZGl2IGlkPSJ0YXJnZXQiIHN0
eWxlPSJkaXNwbGF5OiBpbmxpbmUtZmxleDsgaGVpZ2h0OiA1MHB4OyBiYWNrZ3JvdW5kOiBncmVl
bjtmbGV4LWRpZWN0aW9uOiBjb2x1bW4iPgogICA8ZGl2PgogICAgIDxjYW52YXMgd2lkdGg9MTAg
aGVpZ2h0PTEwIHN0eWxlPSJoZWlnaHQ6IDEwMCU7Ij48L2NhbnZhcz4KICAgPC9kaXY+CmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0Lmh0bWwgYi9MYXlvdXRU
ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3Bl
Y3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0Lmh0bWwKaW5kZXggOTU0OWRlNzgzZDQxMTQxNzFl
YjZkYzY3MTA5ZWVmMWExZWRhNDg3Yi4uYzViNDNjMTIyOGRjYmU2ZGQ4MDhkNDMwYmMyZjQ0ZTBk
YTk0MjI0YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5o
dG1sCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbApAQCAtMywx
MCArMywxMCBAQAogPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iLi4vcmVmZXJlbmNlL3JlZi1maWxs
ZWQtZ3JlZW4tMTAwcHgtc3F1YXJlLW9ubHkuaHRtbCI+CiA8bWV0YSBuYW1lPSJhc3NlcnQiIGNv
bnRlbnQ9IlRoaXMgY2hlY2tzIHRoYXQgYW4gZWxlbWVudCB3aXRoIGFuIGFzcGVjdC1yYXRpbyB0
cmFuc2ZlcnMgaXRzIHNpemUgd2hlbiBpdCBhbHNvIGhhcyBzdHJldGNoIGFsaWdubWVudC4iPgog
PHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlLjwvcD4KLTxk
aXYgaWQ9InRhcmdldCIgc3R5bGU9ImRpc3BsYXk6IGlubGluZS1mbGV4OyBoZWlnaHQ6IDUwcHg7
IGJhY2tncm91bmQ6IGdyZWVuOyI+Cis8ZGl2IGlkPSJ0YXJnZXQiIHN0eWxlPSJkaXNwbGF5OiBp
bmxpbmUtZmxleDsgd2lkdGg6IDUwcHg7IGJhY2tncm91bmQ6IGdyZWVuOyB3cml0aW5nLW1vZGU6
IHZlcnRpY2FsLXJsIj4KICAgPGRpdiBzdHlsZT0iYXNwZWN0LXJhdGlvOiAxLzE7Ij48L2Rpdj4K
IDwvZGl2PgogPHNjcmlwdD4KIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOwotZG9jdW1lbnQuZ2V0
RWxlbWVudEJ5SWQoJ3RhcmdldCcpLnN0eWxlLmhlaWdodCA9ICcxMDBweCc7Citkb2N1bWVudC5n
ZXRFbGVtZW50QnlJZCgndGFyZ2V0Jykuc3R5bGUud2lkdGggPSAnMTAwcHgnOwogPC9zY3JpcHQ+
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437297</attachid>
            <date>2021-09-03 12:37:02 -0700</date>
            <delta_ts>2021-09-07 02:38:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210903213701.patch</filename>
            <type>text/plain</type>
            <size>2900</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYxYzA3ZjVkMjgwZWQw
YTdiZmFlYTNhODliYjIyNDlhZDhjYzgwOS4uNzI3NzE3ZGJlNDY2NWEyZGM5MjkyNDNiMTgyNDQ0
Y2RlNDEwNzZiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA5LTAzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNv
bXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu
ZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayk6
CisKIDIwMjEtMDktMDMgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBS
RUdSRVNTSU9OKHIyODAwNzgpOiBicm9rZSBmYXN0L2ltYWdlcy9leGlmLW9yaWVudGF0aW9uLWNv
bXBvc2l0ZWQuaHRtbCBvbiB3aW5kb3dzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl
bmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBkYThkNzM1ZDA5ODc4MzczYTgwZDM3ZDcwYWZiMTkx
MmE3MDM4MGE2Li4xNzc2MjFmZGJiYTA5MDRjZTViZDRlYmI4M2IxYzQyYmFlMzk2MzBjIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisr
KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTM0
Nyw2ICszNDcsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayhib29sIHJl
bGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAKICAgICBMYXlvdXRSZXBhaW50ZXIgcmVwYWlu
dGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQoKSk7CiAKKyAgICBkaXJ0eUZv
ckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKTsKKwogICAgIHJlc2V0TG9n
aWNhbEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9yZWxhaWRPdXRDaGlsZHJl
bi5jbGVhcigpOwogICAgIApAQCAtMTAxNyw2ICsxMDE5LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBj
aGlsZCwKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1dGVNYWluQXhpc0V4dGVu
dEZvckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBmbGV4QmFzaXMpLnZhbHVlKCkp
OwogCiAgICAgaWYgKGNoaWxkSGFzQ29tcHV0YWJsZUFzcGVjdFJhdGlvQW5kQ3Jvc3NTaXplSXND
b25zaWRlcmVkRGVmaW5pdGUoY2hpbGQpKSB7CisgICAgICAgIGFkZFBlcmNlbnRIZWlnaHREZXNj
ZW5kYW50KGNoaWxkKTsKICAgICAgICAgY29uc3QgTGVuZ3RoJiBjcm9zc1NpemVMZW5ndGggPSBj
cm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYWluT3JQcmVmZXJyZWRTaXplLCBjaGlsZCk7CiAgICAg
ICAgIHJldHVybiBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1h
eChjaGlsZCwgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNyb3Nz
U2l6ZUxlbmd0aCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNw
cAppbmRleCBiMGY3Mzc2YzkzYzQxZjZmNTRiMDcyM2FkYWY0OTc4ZWNjYzlkZjYzLi42YmI3ZDE5
NjU5MzcyOGU2OWU0YmE1ZGYwYzhlMWQ3MGMzMWJiMzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy
aW5nL1JlbmRlckdyaWQuY3BwCkBAIC0xODYsNiArMTg2LDggQEAgdm9pZCBSZW5kZXJHcmlkOjps
YXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgaWYgKCFy
ZWxheW91dENoaWxkcmVuICYmIHNpbXBsaWZpZWRMYXlvdXQoKSkKICAgICAgICAgcmV0dXJuOwog
CisgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnRzKCk7CisK
ICAgICBMYXlvdXRSZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnREdXJp
bmdMYXlvdXQoKSk7CiAgICAgewogICAgICAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQ
dXNoZXIoKnRoaXMsIGxvY2F0aW9uT2Zmc2V0KCksIGhhc1RyYW5zZm9ybSgpIHx8IGhhc1JlZmxl
Y3Rpb24oKSB8fCBzdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437470</attachid>
            <date>2021-09-07 02:38:42 -0700</date>
            <delta_ts>2021-09-07 02:40:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210907113840.patch</filename>
            <type>text/plain</type>
            <size>2088</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2YyMWRkMGNmZDRmYmYx
ZmQyODBjZWMxNDExMWJlN2YxMmYzMmY1ZS4uYmFkNGFjNGU5NzNlMDJlOGY5M2MyMDEzYzJjYmM3
OTliZWRjMmMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNv
bXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKwogMjAyMS0wOS0wNyAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE51bGxwdHIgY3Jhc2ggaW4gRGVsZXRlU2Vs
ZWN0aW9uQ29tbWFuZDo6cmVtb3ZlTm9kZVVwZGF0aW5nU3RhdGVzCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBkYThkNzM1ZDA5ODc4Mzcz
YTgwZDM3ZDcwYWZiMTkxMmE3MDM4MGE2Li4xNzc2MjFmZGJiYTA5MDRjZTViZDRlYmI4M2IxYzQy
YmFlMzk2MzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl
eGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKQEAgLTM0Nyw2ICszNDcsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv
dXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAKICAgICBMYXlvdXRS
ZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQoKSk7
CiAKKyAgICBkaXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKTsK
KwogICAgIHJlc2V0TG9naWNhbEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9y
ZWxhaWRPdXRDaGlsZHJlbi5jbGVhcigpOwogICAgIApAQCAtMTAxNyw2ICsxMDE5LDcgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hp
bGQoUmVuZGVyQm94JiBjaGlsZCwKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1
dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBmbGV4
QmFzaXMpLnZhbHVlKCkpOwogCiAgICAgaWYgKGNoaWxkSGFzQ29tcHV0YWJsZUFzcGVjdFJhdGlv
QW5kQ3Jvc3NTaXplSXNDb25zaWRlcmVkRGVmaW5pdGUoY2hpbGQpKSB7CisgICAgICAgIGFkZFBl
cmNlbnRIZWlnaHREZXNjZW5kYW50KGNoaWxkKTsKICAgICAgICAgY29uc3QgTGVuZ3RoJiBjcm9z
c1NpemVMZW5ndGggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYWluT3JQcmVmZXJyZWRTaXpl
LCBjaGlsZCk7CiAgICAgICAgIHJldHVybiBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Ny
b3NzQXhpc01pbkFuZE1heChjaGlsZCwgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNp
bmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCkpOwogICAgIH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437471</attachid>
            <date>2021-09-07 02:41:04 -0700</date>
            <delta_ts>2021-09-07 03:27:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210907114103.patch</filename>
            <type>text/plain</type>
            <size>3758</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2YyMWRkMGNmZDRmYmYx
ZmQyODBjZWMxNDExMWJlN2YxMmYzMmY1ZS4uYmFkNGFjNGU5NzNlMDJlOGY5M2MyMDEzYzJjYmM3
OTliZWRjMmMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJv
eDo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNv
bXB1dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKwogMjAyMS0wOS0wNyAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE51bGxwdHIgY3Jhc2ggaW4gRGVsZXRlU2Vs
ZWN0aW9uQ29tbWFuZDo6cmVtb3ZlTm9kZVVwZGF0aW5nU3RhdGVzCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNv
cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBkYThkNzM1ZDA5ODc4Mzcz
YTgwZDM3ZDcwYWZiMTkxMmE3MDM4MGE2Li4xNzc2MjFmZGJiYTA5MDRjZTViZDRlYmI4M2IxYzQy
YmFlMzk2MzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl
eGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs
ZUJveC5jcHAKQEAgLTM0Nyw2ICszNDcsOCBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv
dXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAKICAgICBMYXlvdXRS
ZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBjaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQoKSk7
CiAKKyAgICBkaXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKTsK
KwogICAgIHJlc2V0TG9naWNhbEhlaWdodEJlZm9yZUxheW91dElmTmVlZGVkKCk7CiAgICAgbV9y
ZWxhaWRPdXRDaGlsZHJlbi5jbGVhcigpOwogICAgIApAQCAtMTAxNyw2ICsxMDE5LDcgQEAgTGF5
b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hp
bGQoUmVuZGVyQm94JiBjaGlsZCwKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KDBfbHUsIGNvbXB1
dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJyZWRTaXplLCBmbGV4
QmFzaXMpLnZhbHVlKCkpOwogCiAgICAgaWYgKGNoaWxkSGFzQ29tcHV0YWJsZUFzcGVjdFJhdGlv
QW5kQ3Jvc3NTaXplSXNDb25zaWRlcmVkRGVmaW5pdGUoY2hpbGQpKSB7CisgICAgICAgIGFkZFBl
cmNlbnRIZWlnaHREZXNjZW5kYW50KGNoaWxkKTsKICAgICAgICAgY29uc3QgTGVuZ3RoJiBjcm9z
c1NpemVMZW5ndGggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNYWluT3JQcmVmZXJyZWRTaXpl
LCBjaGlsZCk7CiAgICAgICAgIHJldHVybiBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Ny
b3NzQXhpc01pbkFuZE1heChjaGlsZCwgY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNp
bmcoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkMjAwZmY1M2I5NTcx
MThlNDFiZjYwNGEwNTc2MjhmZGI0YWY0YzBhLi5hNWUxZmVlNDE4YzNlNmI2NjhmNjQ2NTAzZDll
MWNlMDM0MGZhMzQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDktMDcgIFJvYiBCdWlz
ICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggYXNwZWN0LXJhdGlvLWludHJpbnNp
Yy1zaXplLTAwNC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD0yMjgyODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDktMDcgIFJvYiBCdWlzICA8cmJ1
aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBOdWxscHRyIGNyYXNoIGluIERlbGV0ZVNlbGVjdGlv
bkNvbW1hbmQ6OnJlbW92ZU5vZGVVcGRhdGluZ1N0YXRlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg
ZTViZjAxOTU1NjAzZGYxNzNhYWU3ZTQzM2E2M2YwNjA3ZWIwYWQ2Yi4uY2Q3ZDExZjMwYzBhNWM3
MmIyM2RmMDU5NjVjNWZhNmIyNDk0ZWQzMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00MDkyLDcg
KzQwOTIsNiBAQCB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LQogd2Via2l0Lm9yZy9iLzIxOTM0MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVj
dC1yYXRpby1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4
Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJp
bnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8x
NDUxNzYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxl
eGJveF9hbGlnbi1pdGVtcy1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437479</attachid>
            <date>2021-09-07 03:27:07 -0700</date>
            <delta_ts>2021-09-07 05:43:53 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210907122706.patch</filename>
            <type>text/plain</type>
            <size>4191</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2YyMWRkMGNmZDRmYmYx
ZmQyODBjZWMxNDExMWJlN2YxMmYzMmY1ZS4uMjU0MTJkY2E1NTlkMjg1M2U5OWQyOTNhMDYyNDVl
NTMxMmRlNWY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA5LTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgQWRkIGNvZGUgc28gdGhhdCBmbGV4IGl0ZW1zIHRoYXQgdXNlIGFzcGVjdC1y
YXRpbworICAgICAgICBhbmQgc3RyZXRjaCByZWFjdCB0byBkeW5hbWljIGhlaWdodCBjaGFuZ2Vz
CisgICAgICAgIGluIHRoZSBmbGV4IGNvbnRhaW5lci4KKworICAgICAgICAqIHJlbmRlcmluZy9S
ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNh
bFdpZHRoRnJvbUFzcGVjdFJhdGlvSW50ZXJuYWwgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJs
ZUJveDo6bGF5b3V0QmxvY2spOgorCiAyMDIxLTA5LTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp
YS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBjcmFzaCBpbiBEZWxldGVTZWxlY3Rpb25Db21tYW5k
OjpyZW1vdmVOb2RlVXBkYXRpbmdTdGF0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl
bmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHAKaW5kZXggNGZlYWI3NTY2MWJmOTQ3MTY3ZGE2OTI1Y2NmYzExZDM5YzY5MzdlMS4uMmIz
MjhiODk3ZmYzMjc5M2FhZTM2MDYwZGRlMjc4NGNlOWZiMWFjNCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTUzMzQsNiArNTMzNCw4IEBAIExheW91dFVuaXQgUmVu
ZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvSW50ZXJuYWwoKSBjb25z
dAogICAgIEFTU0VSVChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkp
OwogICAgIGF1dG8gY29tcHV0ZWRWYWx1ZXMgPSBjb21wdXRlTG9naWNhbEhlaWdodChsb2dpY2Fs
SGVpZ2h0KCksIGxvZ2ljYWxUb3AoKSk7CiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0Zm9y
QXNwZWN0UmF0aW8gPSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudDsKKyAgICBpZiAoaXNGbGV4SXRl
bSgpICYmIGhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkKKyAgICAgICAgZG93bmNhc3Q8UmVu
ZGVyRmxleGlibGVCb3g+KHBhcmVudCgpKS0+YWRkUGVyY2VudEhlaWdodERlc2NlbmRhbnQoY29u
c3RfY2FzdDxSZW5kZXJCb3gmPigqdGhpcykpOwogCiAgICAgcmV0dXJuIGlubGluZVNpemVGcm9t
QXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxC
b3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIExheW91dFVuaXQoc3R5bGUoKS5sb2dpY2FsQXNwZWN0
UmF0aW8oKSksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8oKSwgbG9naWNhbEhlaWdo
dGZvckFzcGVjdFJhdGlvKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwCmluZGV4IGRhOGQ3MzVkMDk4NzgzNzNhODBkMzdkNzBhZmIxOTEyYTcw
MzgwYTYuLmIzNmE0MGRlYzExZWRlNjg5YjQxOGE4NDI0MDA0MzRkMDAwNzI1N2MgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzQ3LDYg
KzM0Nyw4IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlv
dXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIExheW91dFJlcGFpbnRlciByZXBhaW50ZXIo
KnRoaXMsIGNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKTsKIAorICAgIGRpcnR5Rm9yTGF5
b3V0RnJvbVBlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50cygpOworCiAgICAgcmVzZXRMb2dpY2Fs
SGVpZ2h0QmVmb3JlTGF5b3V0SWZOZWVkZWQoKTsKICAgICBtX3JlbGFpZE91dENoaWxkcmVuLmNs
ZWFyKCk7CiAgICAgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDIwMGZmNTNiOTU3MTE4ZTQxYmY2MDRhMDU3NjI4ZmRiNGFm
NGMwYS4uYTVlMWZlZTQxOGMzZTZiNjY4ZjY0NjUwM2Q5ZTFjZTAzNDBmYTM0NSAxMDA2NDQKLS0t
IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt
MSwzICsxLDEyIEBACisyMDIxLTA5LTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK
KyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRp
b25zOgorCiAyMDIxLTA5LTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgTnVsbHB0ciBjcmFzaCBpbiBEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpyZW1vdmVOb2RlVXBk
YXRpbmdTdGF0ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGU1YmYwMTk1NTYwM2RmMTczYWFlN2U0
MzNhNjNmMDYwN2ViMGFkNmIuLmNkN2QxMWYzMGMwYTVjNzJiMjNkZjA1OTY1YzVmYTZiMjQ5NGVk
MzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0
VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDA5Miw3ICs0MDkyLDYgQEAgd2Via2l0Lm9yZy9i
LzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9m
bGV4LWFzcGVjdC0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLWNvbHVtbi0wMTUu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1p
bWctcm93LTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNw
ZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v
cmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhi
b3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMTQ1MTc2IGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3hfYWxpZ24taXRlbXMtc3RyZXRj
aC0zLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437492</attachid>
            <date>2021-09-07 05:44:00 -0700</date>
            <delta_ts>2021-09-10 00:49:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210907144358.patch</filename>
            <type>text/plain</type>
            <size>4680</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2YyMWRkMGNmZDRmYmYx
ZmQyODBjZWMxNDExMWJlN2YxMmYzMmY1ZS4uNTllMzFhYjdiZjc1NWRiNTA4NzBkYTNlNDUxZThi
MjcyODg0N2Q0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA5LTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgRmxleCBpdGVtcyB1c2luZyBhc3BlY3QtcmF0aW8gdGhhdCBhcmUgc3RyZXRj
aGVkCisgICAgICAgIGFuZCBkZXBlbmQgb24gZmxleCBjb250YWluZXIgaGVpZ2h0IGFsc28gbmVl
ZAorICAgICAgICB0byBoYXZlIHRoZSBwcmVmZXJyZWQgd2lkdGhzIHJlY2FsY3VsYXRlZC4KKwor
ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJD
b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGROZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3Vs
YXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91
dEFuZFBsYWNlQ2hpbGRyZW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv
eC5oOgorCiAyMDIxLTA5LTA3ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgTnVsbHB0ciBjcmFzaCBpbiBEZWxldGVTZWxlY3Rpb25Db21tYW5kOjpyZW1vdmVOb2RlVXBk
YXRpbmdTdGF0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC
b3guY3BwCmluZGV4IGRhOGQ3MzVkMDk4NzgzNzNhODBkMzdkNzBhZmIxOTEyYTcwMzgwYTYuLjU0
YTY4NTBmNDBhYWM1MDBhYTgxZDQyZDliOWIwNzYxMzdkYjQzZTIgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMTc4Miw2ICsxNzgyLDEx
IEBAIE92ZXJmbG93IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc0F4aXNPdmVyZmxvd0ZvckNoaWxk
KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvCiAgICAgcmV0dXJuIGNoaWxkLnN0eWxlKCkub3Zl
cmZsb3dYKCk7CiB9CiAKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTmVlZHNQcmVmZXJy
ZWRXaWR0aHNSZWNhbGN1bGF0aW9uKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIpIGNvbnN0Cit7
CisgICAgcmV0dXJuIHJlbmRlcmVyLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiByZW5kZXJl
ci5oYXNTdHJldGNoZWRMb2dpY2FsSGVpZ2h0KCk7Cit9CisKIGJvb2wgUmVuZGVyRmxleGlibGVC
b3g6OmNoaWxkSGFzUGVyY2VudEhlaWdodERlc2NlbmRhbnRzKGNvbnN0IFJlbmRlckJveCYgcmVu
ZGVyZXIpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24gY2FuIGJlIHJlbW92
ZWQgc29vbiBhZnRlciB3ZWJraXQub3JnL2IvMjA0MzE4IGlzIGZpeGVkLiBFdmFsdWF0ZSB3aGV0
aGVyIHRoZQpAQCAtMTg2NSw2ICsxODcwLDggQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5
b3V0QW5kUGxhY2VDaGlsZHJlbihMYXlvdXRVbml0JiBjcm9zc0F4aXNPZmZzZXQsIFZlY3QKICAg
ICAgICAgICAgIC8vIFNvLCByZWRvIGl0IGhlcmUuCiAgICAgICAgICAgICBmb3JjZUNoaWxkUmVs
YXlvdXQgPSB0cnVlOwogICAgICAgICB9CisgICAgICAgIGlmICghY2hpbGQubmVlZHNQcmVmZXJy
ZWRXaWR0aHNSZWNhbGN1bGF0aW9uKCkgJiYgY2hpbGROZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2Fs
Y3VsYXRpb24oY2hpbGQpKQorICAgICAgICAgICAgY2hpbGQuc2V0UHJlZmVycmVkTG9naWNhbFdp
ZHRoc0RpcnR5KHRydWUsIE1hcmtPbmx5VGhpcyk7CiAgICAgICAgIHVwZGF0ZUJsb2NrQ2hpbGRE
aXJ0eUJpdHNCZWZvcmVMYXlvdXQoZm9yY2VDaGlsZFJlbGF5b3V0LCBjaGlsZCk7CiAgICAgICAg
IGlmICghY2hpbGQubmVlZHNMYXlvdXQoKSkKICAgICAgICAgICAgIGNoaWxkLm1hcmtGb3JQYWdp
bmF0aW9uUmVsYXlvdXRJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guaAppbmRleCA1MzA1YWU1ZThjMWI0MWI2OTRhNzMyNmZmOThlOGVjODJl
YWVjOWI2Li5jOTFiY2I2YTgwNGJhOWFmZWFkZWIzZTg1MWNkYjAzMzBhNTQwOGU4IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaApAQCAtMjAwLDYgKzIw
MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXBhaW50Q2hpbGRyZW5EdXJpbmdMYXlvdXRJZk1v
dmVkKGNvbnN0IENoaWxkRnJhbWVSZWN0cyYpOwogCiAgICAgYm9vbCBjaGlsZEhhc1BlcmNlbnRI
ZWlnaHREZXNjZW5kYW50cyhjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKKyAgICBib29sIGNoaWxk
TmVlZHNQcmVmZXJyZWRXaWR0aHNSZWNhbGN1bGF0aW9uKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0
OwogCiAgICAgZW51bSBjbGFzcyBHYXBUeXBlIHsgQmV0d2VlbkxpbmVzLCBCZXR3ZWVuSXRlbXMg
fTsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVHYXAoR2FwVHlwZSkgY29uc3Q7CmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDIw
MGZmNTNiOTU3MTE4ZTQxYmY2MDRhMDU3NjI4ZmRiNGFmNGMwYS4uYTVlMWZlZTQxOGMzZTZiNjY4
ZjY0NjUwM2Q5ZTFjZTAzNDBmYTM0NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA5LTA3
ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRp
by1pbnRyaW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA5LTA3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBjcmFzaCBpbiBEZWxl
dGVTZWxlY3Rpb25Db21tYW5kOjpyZW1vdmVOb2RlVXBkYXRpbmdTdGF0ZXMKZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCmluZGV4IGU1YmYwMTk1NTYwM2RmMTczYWFlN2U0MzNhNjNmMDYwN2ViMGFkNmIuLmNkN2Qx
MWYzMGMwYTVjNzJiMjNkZjA1OTY1YzVmYTZiMjQ5NGVkMzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpA
QCAtNDA5Miw3ICs0MDkyLDYgQEAgd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC0KIHdlYmtpdC5vcmcv
Yi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gv
ZmxleC1hc3BlY3QtcmF0aW8taW1nLWNvbHVtbi0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAwNy5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDEwLmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNp
Yy1zaXplLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1y
YXRpby1pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiB3ZWJr
aXQub3JnL2IvMTQ1MTc2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m
bGV4Ym94L2ZsZXhib3hfYWxpZ24taXRlbXMtc3RyZXRjaC0zLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>437849</attachid>
            <date>2021-09-10 00:49:47 -0700</date>
            <delta_ts>2021-09-10 05:23:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228283-20210910094945.patch</filename>
            <type>text/plain</type>
            <size>3424</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3OTIxYWU5NzI4MzJh
Y2E3MWI1NGQ2MGM0MzUwZmU2OTczZDc0OC4uODU4YTU4OTgzMTE0ZDM4MmNkNjZjZjc1MmJiYmQ5
NWVlMTE0NTE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA5LTEwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGFzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjI4MjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgRmxleCBpdGVtcyB1c2luZyBhc3BlY3QtcmF0aW8gdGhhdCBhcmUgc3RyZXRj
aGVkCisgICAgICAgIGFuZCBkZXBlbmQgb24gZmxleCBjb250YWluZXIgaGVpZ2h0IGFsc28gbmVl
ZAorICAgICAgICB0byBoYXZlIHRoZSBwcmVmZXJyZWQgd2lkdGhzIHJlY2FsY3VsYXRlZC4KKwor
ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu
ZGVyQm94OjpuZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorCiAyMDIx
LTA5LTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg
Y2FjaGUgdG8gSW5saW5lQ29udGVudCBmb3IgTygxKSBpbmxpbmUgYm94IGFjY2VzcwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAwZDc5YjQ0N2E3N2E4YTcxZDI2MWE4
Y2Q1ODQzZWU3MDQxZWRjN2ZiLi5kZmQ4ZjBlYTViNWYzMmQ2OTMxYmE5ZTZlMTA0MjdkYjZkMGQ3
ZGYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMTA5Niw3ICsx
MDk2LDcgQEAgYm9vbCBSZW5kZXJCb3g6Omhhc0Fsd2F5c1ByZXNlbnRTY3JvbGxiYXIoU2Nyb2xs
YmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnMKIAogYm9vbCBSZW5kZXJCb3g6Om5lZWRz
UHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0eWxl
KCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRk
aW5nRW5kKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgKHN0eWxlKCkuaGFzQXNwZWN0UmF0
aW8oKSAmJiBoYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQoKSk7CisgICAgcmV0dXJuIHN0eWxlKCku
cGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5n
RW5kKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8o
KSAmJiAoaGFzUmVsYXRpdmVMb2dpY2FsSGVpZ2h0KCkgfHwgKGlzRmxleEl0ZW0oKSAmJiBoYXNT
dHJldGNoZWRMb2dpY2FsSGVpZ2h0KCkpKSk7CiB9CiAKIFNjcm9sbFBvc2l0aW9uIFJlbmRlckJv
eDo6c2Nyb2xsUG9zaXRpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDY4YzllZWRhNTVhNTlkZDUwOTAyOGJi
NGNiMzYwMTgwNDdlNTZlZWYuLjY5MTgyYjlhNTViZWExZWVjMjg2ZmFiYzYxNjc3NTRmYjU5YTVk
NDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wOS0xMCAgUm9iIEJ1aXMgIDxyYnVpc0Bp
Z2FsaWEuY29tPgorCisgICAgICAgIEZpeCBhc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDA0
Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wOS0wOSAgRnJlZGVyaWMgV2FuZyAgPGZ3YW5nQGln
YWxpYS5jb20+CiAKICAgICAgICAgQ2hyb21pdW0gdGVzdC1jYXNlIGFzc2VydHMgd2l0aCBBU1NF
UlRJT04gRkFJTEVEOiBwcm9wZXJ0eU1pc3NpbmdPckVxdWFsVG9Ob25lCmRpZmYgLS1naXQgYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cwppbmRleCBjNzM0ZGRmNjdlZjQyMzcyYjA2ZWMxMmRkM2ZhMTRjNWRiZWIwYTJjLi42MTJjN2Q2
ZmUxZjllODc3MDY2ZDU1MmRkMTVjZTczOWVmYzUwNWQ4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAg
LTQxMDAsNyArNDEwMCw2IEBAIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtCiB3ZWJraXQub3JnL2Iv
MjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2Zs
ZXgtYXNwZWN0LXJhdGlvLWltZy1jb2x1bW4tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMDcuaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxMC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMt
c2l6ZS0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0
aW8taW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0
Lm9yZy9iLzE0NTE3NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl
eGJveC9mbGV4Ym94X2FsaWduLWl0ZW1zLXN0cmV0Y2gtMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>