<?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>229327</bug_id>
          
          <creation_ts>2021-08-20 01:50:29 -0700</creation_ts>
          <short_desc>Prevent AudioSession category from moving out of PlayAndRecord too quickly</short_desc>
          <delta_ts>2021-08-21 00:01:33 -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>WebRTC</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="youenn fablet">youennf</reporter>
          <assigned_to name="youenn fablet">youennf</assigned_to>
          <cc>calvaris</cc>
    
    <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>hta</cc>
    
    <cc>jer.noble</cc>
    
    <cc>kangil.han</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
    
    <cc>tommyw</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1785738</commentid>
    <comment_count>0</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 01:50:29 -0700</bug_when>
    <thetext>Prevent AudioSession category to move out of PlayAndRecord to quickly</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785739</commentid>
    <comment_count>1</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 01:56:02 -0700</bug_when>
    <thetext>&lt;rdar://81997024&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785740</commentid>
    <comment_count>2</comment_count>
      <attachid>435954</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 02:01:50 -0700</bug_when>
    <thetext>Created attachment 435954
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785742</commentid>
    <comment_count>3</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 02:05:44 -0700</bug_when>
    <thetext>&lt;rdar://81283764&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785743</commentid>
    <comment_count>4</comment_count>
      <attachid>435955</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 02:09:08 -0700</bug_when>
    <thetext>Created attachment 435955
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785750</commentid>
    <comment_count>5</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 02:21:07 -0700</bug_when>
    <thetext>We could remove individual MediaStreamTrack registration by making sure the Document media state is updated synchronously. I left this as a follow-up to make this patch small.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785783</commentid>
    <comment_count>6</comment_count>
      <attachid>435971</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 04:41:33 -0700</bug_when>
    <thetext>Created attachment 435971
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785798</commentid>
    <comment_count>7</comment_count>
      <attachid>435976</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 05:48:33 -0700</bug_when>
    <thetext>Created attachment 435976
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785815</commentid>
    <comment_count>8</comment_count>
      <attachid>435981</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 07:15:00 -0700</bug_when>
    <thetext>Created attachment 435981
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785816</commentid>
    <comment_count>9</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 07:15:55 -0700</bug_when>
    <thetext>(In reply to youenn fablet from comment #5)
&gt; We could remove individual MediaStreamTrack registration by making sure the
&gt; Document media state is updated synchronously. I left this as a follow-up to
&gt; make this patch small.

Initial version was using Document to ensure PlayAndRecord sticks.
New version is moving the logic inside MediaSessionManagerCocoa which is more appropriate.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785853</commentid>
    <comment_count>10</comment_count>
      <attachid>435981</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-08-20 08:57:00 -0700</bug_when>
    <thetext>Comment on attachment 435981
Patch

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

&gt; Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm:154
&gt; +    if (AudioSession::sharedSession().category() == AudioSession::CategoryType::PlayAndRecord &amp;&amp; isPlayingAudio)
&gt; +        category = AudioSession::CategoryType::PlayAndRecord;

Nit: it would be easier to understand if this was first:

    if (captureCount  || AudioSession::sharedSession().category() == AudioSession::CategoryType::PlayAndRecord &amp;&amp; isPlayingAudio)
        category = AudioSession::CategoryType::PlayAndRecord;
    else if (...

&gt; LayoutTests/http/tests/media/media-stream/audio-capture-and-category.https.html:45
&gt; +     assert_equals(internals.audioSessionCategory(), &quot;PlayAndRecord&quot;, &quot;category when capturing&quot;);

Nit: it would be good to make this assert message different from the one above so if the test fails we can tell which test was the problem.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785854</commentid>
    <comment_count>11</comment_count>
      <attachid>435995</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 09:02:43 -0700</bug_when>
    <thetext>Created attachment 435995
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785855</commentid>
    <comment_count>12</comment_count>
      <attachid>435996</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 09:06:33 -0700</bug_when>
    <thetext>Created attachment 435996
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785856</commentid>
    <comment_count>13</comment_count>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 09:07:14 -0700</bug_when>
    <thetext>&gt; &gt; Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm:154
&gt; &gt; +    if (AudioSession::sharedSession().category() == AudioSession::CategoryType::PlayAndRecord &amp;&amp; isPlayingAudio)
&gt; &gt; +        category = AudioSession::CategoryType::PlayAndRecord;
&gt; 
&gt; Nit: it would be easier to understand if this was first:

Done

&gt; &gt; LayoutTests/http/tests/media/media-stream/audio-capture-and-category.https.html:45
&gt; &gt; +     assert_equals(internals.audioSessionCategory(), &quot;PlayAndRecord&quot;, &quot;category when capturing&quot;);
&gt; 
&gt; Nit: it would be good to make this assert message different from the one
&gt; above so if the test fails we can tell which test was the problem.

Done as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785877</commentid>
    <comment_count>14</comment_count>
      <attachid>435996</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-08-20 09:51:30 -0700</bug_when>
    <thetext>Comment on attachment 435996
Patch

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

r=me once the bots are happy

&gt; LayoutTests/http/tests/media/media-stream/audio-capture-and-category.https.html:46
&gt; +     assert_equals(internals.audioSessionCategory(), &quot;PlayAndRecord&quot;, &quot;category when capturing&quot;);

Maybe &quot;category when capturing and playing audio&quot;

&gt; LayoutTests/http/tests/media/media-stream/audio-capture-and-category.https.html:48
&gt; +     stream.getAudioTracks()[0].stop();

As we discussed, it would be good to either comment here or use a url src for the audio element to make it obvious that audio will continue to play when the capture track is stopped.

&gt; LayoutTests/http/tests/media/media-stream/audio-capture-and-category.https.html:51
&gt; +     assert_equals(internals.audioSessionCategory(), &quot;PlayAndRecord&quot;, &quot;category when document did capture but is not capturing anymore&quot;);

Maybe &quot;category when capture has stopped but audio continues to play&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1785910</commentid>
    <comment_count>15</comment_count>
      <attachid>436008</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2021-08-20 10:57:19 -0700</bug_when>
    <thetext>Created attachment 436008
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1786111</commentid>
    <comment_count>16</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-21 00:01:30 -0700</bug_when>
    <thetext>Committed r281367 (240782@main): &lt;https://commits.webkit.org/240782@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436008.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435954</attachid>
            <date>2021-08-20 02:01:50 -0700</date>
            <delta_ts>2021-08-20 02:09:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820110148.patch</filename>
            <type>text/plain</type>
            <size>8858</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uNDdkZmRiMWY4YmVhYWNjMjgzNmY1NmNjZDEzMmRj
ODMzYzAzM2U2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSB0byBtb3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvIHF1aWNrbHkKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTMyNworICAg
ICAgICA8cmRhcjovLzgxOTk3MDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEJlZm9yZSB0aGUgcGF0Y2gsIHdlIHdlcmUgY2hhbmdpbmcgYXV0b21h
dGljYWxseSB0byBQbGF5QW5kUmVjb3JkIHdoZW4gc3RhcnRpbmcgdG8gY2FwdHVyZSBhdWRpbywg
d2hpY2ggaXMgbWFuZGF0b3J5IHRvIGFjdHVhbGx5IGNhcHR1cmUgYXVkaW8uCisgICAgICAgIFdo
ZW4gc3RvcHBpbmcgYXVkaW8gY2FwdHVyZSwgd2Ugd2VyZSBhbHNvIGF1dG9tYXRpY2FsbHkgdXBk
YXRpbmcgdGhlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnksIHRvIGEgdmFsdWUgZGlmZmVyZW50IHRv
IFBsYXlBbmRSZWNvcmQuCisgICAgICAgIFRoZSBpbXBhY3QgaXMgdGhhdCB3aGVuIHdlIHN0b3Ag
YXVkaW8gY2FwdHVyZSwgdGhlIGF1ZGlvIGxldmVsIG1pZ2h0IGNoYW5nZSBhIGxvdCBkZXBlbmRp
bmcgb24gdXNlciBzZXR0aW5nIGJldHdlZW4gbm8tYXVkaW8tY2FwdHVyZSBhdWRpbyBsZXZlbCBh
bmQgYXVkaW8tY2FwdHVyZSBhdWRpbyBsZXZlbC4KKyAgICAgICAgVGhpcyBtaWdodCBiZSBkaXNy
dXB0aXZlIGZvciB2aWRlby1jb25mZXJlbmNlIGFwcGxpY2F0aW9ucyB0aGF0IHdpbGwgdGVtcG9y
YXJpbHkgbXV0ZS9zdG9wIGF1ZGlvLgorCisgICAgICAgIFRvIHByZXZlbnQgdGhpcywgd2Uga2Vl
cCBhIHN0YXRlIGluIHRoZSBEb2N1bWVudCB0byBrbm93IHdoZXRoZXIgaXQgZGlkIGF1ZGlvIGNh
cHR1cmUuCisgICAgICAgIElmIGl0IGlzIHRoZSBjYXNlIGFuZCBkb2N1bWVudCBpcyBhY3RpdmUs
IHdlIHN0aWNrIHRvIFBsYXlBbmRSZWNvcmQuCisgICAgICAgIElmIHRoZSBkb2N1bWVudCB0aGF0
IGRpZCBhdWRpbyBjYXB0dXJlIGdvZXMgYXdheSwgdGhlIGF1ZGlvIGNhdGVnb3J5IGNhbiBiZSBz
ZXQgYmFjayB0byBhIHZhbHVlIGRpZmZlcm50IGZyb20gUGxheUFuZFJlY29yZC4KKworICAgICAg
ICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1j
YXRlZ29yeS5odHRwcy5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6RG9jdW1lbnQ6On5Eb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1
bWVudDo6dXBkYXRlSXNQbGF5aW5nTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6
OmlzQ2FwdHVyaW5nQXVkaW8gY29uc3QpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorCiAy
MDIxLTA4LTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBB
ZGQgc3VwcG9ydCBmb3IgUlRDSWNlVHJhbnNwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRl
eCA3MTgxMDA0M2RiM2E4Zjc2ZmZhYjY0NDAyZWU3NjgzYzk2ZmMzZWRmLi5kOWI1OTY1ZjUwNDNl
YzdkMjVkM2Y0M2NiZmRiZDAxYTM1NWE1Y2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAg
LTc4MCw2ICs3ODAsOSBAQCBEb2N1bWVudDo6fkRvY3VtZW50KCkKIAogICAgIGZvciAodW5zaWdu
ZWQgY291bnQgOiBtX25vZGVMaXN0QW5kQ29sbGVjdGlvbkNvdW50cykKICAgICAgICAgQVNTRVJU
X1VOVVNFRChjb3VudCwgIWNvdW50KTsKKworICAgIGlmIChtX2RpZENhcHR1cmVBdWRpbykKKyAg
ICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkucmVtb3Zl
QXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6cmVtb3ZlZExh
c3RSZWYoKQpAQCAtNDQxOCw2ICs0NDIxLDExIEBAIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZUlzUGxh
eWluZ01lZGlhKCkKICAgICBpZiAoYXV0byogcGFnZSA9IHRoaXMtPnBhZ2UoKSkKICAgICAgICAg
cGFnZS0+dXBkYXRlSXNQbGF5aW5nTWVkaWEoKTsKIAorICAgIGlmICghbV9kaWRDYXB0dXJlQXVk
aW8gJiYgc3RhdGUgJiBNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlOjpIYXNBY3RpdmVBdWRpb0Nh
cHR1cmVEZXZpY2UpIHsKKyAgICAgICAgbV9kaWRDYXB0dXJlQXVkaW8gPSB0cnVlOworICAgICAg
ICBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5hZGRBdWRpb0Nh
cHR1cmVTb3VyY2UoKnRoaXMpOworICAgIH0KKwogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAg
ICAgaWYgKGNhcHR1cmVTdGF0ZUNoYW5nZWQpCiAgICAgICAgIG1lZGlhU3RyZWFtQ2FwdHVyZVN0
YXRlQ2hhbmdlZCgpOwpAQCAtODIxNCw2ICs4MjIyLDEzIEBAIHZvaWQgRG9jdW1lbnQ6Om1lZGlh
U3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpCiAKICNlbmRpZgogCitib29sIERvY3VtZW50Ojpp
c0NhcHR1cmluZ0F1ZGlvKCkgY29uc3QKK3sKKyAgICAvLyBXZSByZXR1cm4gdHJ1ZSBldmVuIGlm
IHRoZSBkb2N1bWVudCBzdG9wcGVkIGNhcHR1cmluZyBhdWRpbyB0byBwcmV2ZW50IG11bHRpcGxl
IGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgc3dpdGNoZXMuCisgICAgLy8gRklYTUU6IFdlIG1pZ2h0
IHdhbnQgdG8gcmVzZXQgbV9kaWRDYXB0dXJlQXVkaW8gdG8gZmFsc2UgaW4gY2FzZSBwYWdlIGlz
IG5vIGxvbmdlciBwbGF5aW5nIGF1ZGlvLgorICAgIHJldHVybiBtX2RpZENhcHR1cmVBdWRpbyAm
JiAhYWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCgpICYmICFhY3RpdmVET01PYmplY3RzQXJl
U3RvcHBlZCgpOworfQorCiBjb25zdCBBdG9tU3RyaW5nJiBEb2N1bWVudDo6YmdDb2xvcigpIGNv
bnN0CiB7CiAgICAgUmVmUHRyIGJvZHlFbGVtZW50ID0gYm9keSgpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu
aAppbmRleCA0YzI5NWQ0NThmMWFlMDYxNzlhNTQ2Yjk0ZGIzODA3NzI2NTRjMWM1Li4zM2QyZmIw
YzI1YTZiYWJmMmJiMTU3OGQ3MTRjZjU5ZDUzMmE2MWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApA
QCAtNDgsNiArNDgsNyBAQAogI2luY2x1ZGUgIk9yaWVudGF0aW9uTm90aWZpZXIuaCIKICNpbmNs
dWRlICJQYWdlSWRlbnRpZmllci5oIgogI2luY2x1ZGUgIlBsYXRmb3JtRXZlbnQuaCIKKyNpbmNs
dWRlICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oIgogI2luY2x1ZGUgIlBsYXliYWNrVGFyZ2V0Q2xp
ZW50Q29udGV4dElkZW50aWZpZXIuaCIKICNpbmNsdWRlICJSZWZlcnJlclBvbGljeS5oIgogI2lu
Y2x1ZGUgIlJlZ2lvbi5oIgpAQCAtMzQzLDcgKzM0NCw4IEBAIGNsYXNzIERvY3VtZW50CiAgICAg
LCBwdWJsaWMgRnJhbWVEZXN0cnVjdGlvbk9ic2VydmVyCiAgICAgLCBwdWJsaWMgU3VwcGxlbWVu
dGFibGU8RG9jdW1lbnQ+CiAgICAgLCBwdWJsaWMgTG9nZ2VyOjpPYnNlcnZlcgotICAgICwgcHVi
bGljIENhbnZhc09ic2VydmVyIHsKKyAgICAsIHB1YmxpYyBDYW52YXNPYnNlcnZlcgorICAgICwg
cHJpdmF0ZSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6QXVkaW9DYXB0dXJlU291cmNlIHsKICAgICBX
VEZfTUFLRV9JU09fQUxMT0NBVEVEX0VYUE9SVChEb2N1bWVudCwgV0VCQ09SRV9FWFBPUlQpOwog
cHVibGljOgogICAgIHVzaW5nIFdlYWtWYWx1ZVR5cGUgPSBFdmVudFRhcmdldDo6V2Vha1ZhbHVl
VHlwZTsKQEAgLTE3NTMsNiArMTc1NSw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGRUb0RvY3Vt
ZW50c01hcCgpOwogICAgIHZvaWQgcmVtb3ZlRnJvbURvY3VtZW50c01hcCgpOwogCisgICAgLy8g
UGxhdGZvcm1NZWRpYVNlc3Npb246OkF1ZGlvQ2FwdHVyZVNvdXJjZQorICAgIGJvb2wgaXNDYXB0
dXJpbmdBdWRpbygpIGNvbnN0IGZpbmFsOworCiAgICAgY29uc3QgUmVmPGNvbnN0IFNldHRpbmdz
PiBtX3NldHRpbmdzOwogCiAgICAgVW5pcXVlUmVmPFF1aXJrcz4gbV9xdWlya3M7CkBAIC0yMDU3
LDYgKzIwNjIsNyBAQCBwcml2YXRlOgogCiAgICAgSW5oZXJpdGVkQm9vbCBtX2Rlc2lnbk1vZGUg
eyBpbmhlcml0IH07CiAgICAgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIG1fbWVkaWFT
dGF0ZTsKKyAgICBib29sIG1fZGlkQ2FwdHVyZUF1ZGlvIHsgZmFsc2UgfTsKICAgICBib29sIG1f
dXNlckhhc0ludGVyYWN0ZWRXaXRoTWVkaWFFbGVtZW50IHsgZmFsc2UgfTsKICAgICBCYWNrRm9y
d2FyZENhY2hlU3RhdGUgbV9iYWNrRm9yd2FyZENhY2hlU3RhdGUgeyBOb3RJbkJhY2tGb3J3YXJk
Q2FjaGUgfTsKICAgICBzdGQ6Om9wdGlvbmFsPFJlZmVycmVyUG9saWN5PiBtX3JlZmVycmVyUG9s
aWN5OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCmluZGV4IGRmY2Y4ZTE5MjYyYzQxOTRlN2ZkNjNlZjBjMzMwY2M3ZjA2ZmQyMmMuLmFl
ODQ4YWEyYTExNDI5ZjE5ZTE4NTFkZTFjNzRkNDIzMzc2MDRkOWMgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NSBAQAorMjAyMS0wOC0yMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAg
ICAgICAgUHJldmVudCBBdWRpb1Nlc3Npb24gY2F0ZWdvcnkgdG8gbW92ZSBvdXQgb2YgUGxheUFu
ZFJlY29yZCB0byBxdWlja2x5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMjkzMjcKKyAgICAgICAgPHJkYXI6Ly84MTk5NzAyND4KKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEv
bWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4cGVjdGVkLnR4
dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8t
Y2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC90
ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vcmVzb3VyY2VzL2NhcHR1cmUtYXVkaW8tZnJhbWUuaHRt
bDogQWRkZWQuCisKIDIwMjEtMDgtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t
PgogCiAgICAgICAgIFNpZ25hbGluZyBzdGF0ZSBjaGVjayB3aGVuIGFwcGx5aW5nIGEgbG9jYWwg
b3IgcmVtb3RlIGRlc2NyaXB0aW9uIGlzIG5vIGxvbmdlciBhbGlnbmVkIHdpdGggdGhlIFdlYlJU
QyBzcGVjCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0
cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1j
YXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uM2I5YzA2MmEzODYyZmU0NjZk
ZjhjMDQyNmNiMDI1NDVkNzk0YjY4NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0
dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0
dHBzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDMgQEAKKworUEFTUyBWYWxpZGF0ZSBhdWRpbyBz
ZXNzaW9uIGNhdGVnb3J5IGlzIHNldCB0byBQbGF5QW5kUmVjb3JkIGFmdGVyIGZyYW1lIHN0b3Bw
ZWQgY2FwdHVyaW5nCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEv
bWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1j
YXRlZ29yeS5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk2OGRmMmQ4YzNmNjllODEyNzA3NjFjN2Y1
N2E4Mzg2ZjNhNjg0MDMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz
L21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5odG1s
CkBAIC0wLDAgKzEsNDIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRh
IGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpz
Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0Lmpz
Ij48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHNjcmlwdD4KK2Z1bmN0aW9uIHdpdGhfaWZy
YW1lKHVybCkgeworICAgIHJldHVybiBuZXcgUHJvbWlzZShmdW5jdGlvbihyZXNvbHZlKSB7Cisg
ICAgICAgIHZhciBmcmFtZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lmcmFtZScpOworICAg
ICAgICBmcmFtZS5zcmMgPSB1cmw7CisgICAgICAgIGZyYW1lLm9ubG9hZCA9IGZ1bmN0aW9uKCkg
eyByZXNvbHZlKGZyYW1lKTsgfTsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChm
cmFtZSk7CisgICAgfSk7Cit9CisKK3Byb21pc2VfdGVzdChhc3luYyAodCkgPT4geworICAgICBp
ZiAoIXdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgIHJldHVybiBQcm9taXNlLnJlamVjdCgiVGVz
dCByZXF1aXJlIGludGVybmFscyBBUEkiKTsKKworICAgICBjb25zdCBmcmFtZSA9IGF3YWl0IHdp
dGhfaWZyYW1lKCdyZXNvdXJjZXMvY2FwdHVyZS1hdWRpby1mcmFtZS5odG1sJyk7CisKKyAgICAg
YXdhaXQgZnJhbWUuY29udGVudFdpbmRvdy5zdGFydENhcHR1cmUoKTsKKworICAgICBhc3NlcnRf
ZXF1YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29yeSgpLCAiUGxheUFuZFJlY29yZCIs
ICJjYXRlZ29yeSB3aGVuIGNhcHR1cmluZyIpOworICAgIAorICAgICBmcmFtZS5jb250ZW50V2lu
ZG93LnN0b3BDYXB0dXJlKCk7CisgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0
VGltZW91dChyZXNvbHZlLCAxMDApKTsKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVk
aW9TZXNzaW9uQ2F0ZWdvcnkoKSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBkb2N1
bWVudCBkaWQgY2FwdHVyZSBidXQgaXMgbm90IGNhcHR1cmluZyBhbnltb3JlIik7CisKKyAgICAg
ZnJhbWUucmVtb3ZlKCk7CisgICAgIGxldCBjb3VudGVyID0gMDsKKyAgICAgd2hpbGUgKCsrY291
bnRlciA8IDEwMCAmJiBpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSA9PT0gIlBsYXlB
bmRSZWNvcmQiKQorICAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1l
b3V0KHJlc29sdmUsIDUwKSk7CisKKyAgICAgYXNzZXJ0X25vdF9lcXVhbHMoaW50ZXJuYWxzLmF1
ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdoZW4gY2Fw
dHVyaW5nIGRvY3VtZW50IHdlbnQgYXdheSIpOworfSwgIlZhbGlkYXRlIGF1ZGlvIHNlc3Npb24g
Y2F0ZWdvcnkgaXMgc2V0IHRvIFBsYXlBbmRSZWNvcmQgYWZ0ZXIgZnJhbWUgc3RvcHBlZCBjYXB0
dXJpbmciKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vcmVzb3VyY2VzL2NhcHR1cmUtYXVk
aW8tZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFt
L3Jlc291cmNlcy9jYXB0dXJlLWF1ZGlvLWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWM5YjAzNjk5
NGE1YTVhYmM2MjMwN2ZjODRlNDg1YTA1NzFmZmNhYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91
dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL3Jlc291cmNlcy9jYXB0dXJlLWF1
ZGlvLWZyYW1lLmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8bWV0YSBj
aGFyc2V0PSJ1dGYtOCI+Cis8c2NyaXB0PgorbGV0IHRyYWNrOworYXN5bmMgZnVuY3Rpb24gc3Rh
cnRDYXB0dXJlKCkKK3sKKyAgIGNvbnN0IHN0cmVhbSA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURl
dmljZXMuZ2V0VXNlck1lZGlhKHthdWRpbzp0cnVlfSk7CisgICB0cmFjayA9IHN0cmVhbS5nZXRB
dWRpb1RyYWNrcygpWzBdOworfQorZnVuY3Rpb24gc3RvcENhcHR1cmUoKQoreworICAgIHRyYWNr
LnN0b3AoKTsKK30KKzwvc2NyaXB0Pgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435955</attachid>
            <date>2021-08-20 02:09:08 -0700</date>
            <delta_ts>2021-08-20 04:41:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820110906.patch</filename>
            <type>text/plain</type>
            <size>9330</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uNDdkZmRiMWY4YmVhYWNjMjgzNmY1NmNjZDEzMmRj
ODMzYzAzM2U2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSB0byBtb3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvIHF1aWNrbHkKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTMyNworICAg
ICAgICA8cmRhcjovLzgxOTk3MDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEJlZm9yZSB0aGUgcGF0Y2gsIHdlIHdlcmUgY2hhbmdpbmcgYXV0b21h
dGljYWxseSB0byBQbGF5QW5kUmVjb3JkIHdoZW4gc3RhcnRpbmcgdG8gY2FwdHVyZSBhdWRpbywg
d2hpY2ggaXMgbWFuZGF0b3J5IHRvIGFjdHVhbGx5IGNhcHR1cmUgYXVkaW8uCisgICAgICAgIFdo
ZW4gc3RvcHBpbmcgYXVkaW8gY2FwdHVyZSwgd2Ugd2VyZSBhbHNvIGF1dG9tYXRpY2FsbHkgdXBk
YXRpbmcgdGhlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnksIHRvIGEgdmFsdWUgZGlmZmVyZW50IHRv
IFBsYXlBbmRSZWNvcmQuCisgICAgICAgIFRoZSBpbXBhY3QgaXMgdGhhdCB3aGVuIHdlIHN0b3Ag
YXVkaW8gY2FwdHVyZSwgdGhlIGF1ZGlvIGxldmVsIG1pZ2h0IGNoYW5nZSBhIGxvdCBkZXBlbmRp
bmcgb24gdXNlciBzZXR0aW5nIGJldHdlZW4gbm8tYXVkaW8tY2FwdHVyZSBhdWRpbyBsZXZlbCBh
bmQgYXVkaW8tY2FwdHVyZSBhdWRpbyBsZXZlbC4KKyAgICAgICAgVGhpcyBtaWdodCBiZSBkaXNy
dXB0aXZlIGZvciB2aWRlby1jb25mZXJlbmNlIGFwcGxpY2F0aW9ucyB0aGF0IHdpbGwgdGVtcG9y
YXJpbHkgbXV0ZS9zdG9wIGF1ZGlvLgorCisgICAgICAgIFRvIHByZXZlbnQgdGhpcywgd2Uga2Vl
cCBhIHN0YXRlIGluIHRoZSBEb2N1bWVudCB0byBrbm93IHdoZXRoZXIgaXQgZGlkIGF1ZGlvIGNh
cHR1cmUuCisgICAgICAgIElmIGl0IGlzIHRoZSBjYXNlIGFuZCBkb2N1bWVudCBpcyBhY3RpdmUs
IHdlIHN0aWNrIHRvIFBsYXlBbmRSZWNvcmQuCisgICAgICAgIElmIHRoZSBkb2N1bWVudCB0aGF0
IGRpZCBhdWRpbyBjYXB0dXJlIGdvZXMgYXdheSwgdGhlIGF1ZGlvIGNhdGVnb3J5IGNhbiBiZSBz
ZXQgYmFjayB0byBhIHZhbHVlIGRpZmZlcm50IGZyb20gUGxheUFuZFJlY29yZC4KKworICAgICAg
ICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1j
YXRlZ29yeS5odHRwcy5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6RG9jdW1lbnQ6On5Eb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1
bWVudDo6dXBkYXRlSXNQbGF5aW5nTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6
OmlzQ2FwdHVyaW5nQXVkaW8gY29uc3QpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorCiAy
MDIxLTA4LTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBB
ZGQgc3VwcG9ydCBmb3IgUlRDSWNlVHJhbnNwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRl
eCA3MTgxMDA0M2RiM2E4Zjc2ZmZhYjY0NDAyZWU3NjgzYzk2ZmMzZWRmLi5jZWIzYTZhMzNiOWFj
ODliOWI4Nzc5NjU2ZjdiODQzMTMzMTI0ZTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAg
LTc4MCw2ICs3ODAsOSBAQCBEb2N1bWVudDo6fkRvY3VtZW50KCkKIAogICAgIGZvciAodW5zaWdu
ZWQgY291bnQgOiBtX25vZGVMaXN0QW5kQ29sbGVjdGlvbkNvdW50cykKICAgICAgICAgQVNTRVJU
X1VOVVNFRChjb3VudCwgIWNvdW50KTsKKworICAgIGlmIChtX2RpZENhcHR1cmVBdWRpbykKKyAg
ICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkucmVtb3Zl
QXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6cmVtb3ZlZExh
c3RSZWYoKQpAQCAtMjc3MCw2ICsyNzczLDExIEBAIHZvaWQgRG9jdW1lbnQ6OnN1c3BlbmRBY3Rp
dmVET01PYmplY3RzKFJlYXNvbkZvclN1c3BlbnNpb24gd2h5KQogICAgIFNjcmlwdEV4ZWN1dGlv
bkNvbnRleHQ6OnN1c3BlbmRBY3RpdmVET01PYmplY3RzKHdoeSk7CiAgICAgc3VzcGVuZERldmlj
ZU1vdGlvbkFuZE9yaWVudGF0aW9uVXBkYXRlcygpOwogICAgIHBsYXRmb3JtU3VzcGVuZE9yU3Rv
cEFjdGl2ZURPTU9iamVjdHMoKTsKKworICAgIGlmIChtX2RpZENhcHR1cmVBdWRpbykgeworICAg
ICAgICBtX2RpZENhcHR1cmVBdWRpbyA9IGZhbHNlOworICAgICAgICBQbGF0Zm9ybU1lZGlhU2Vz
c2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5yZW1vdmVBdWRpb0NhcHR1cmVTb3VyY2UoKnRo
aXMpOworICAgIH0KIH0KIAogdm9pZCBEb2N1bWVudDo6cmVzdW1lQWN0aXZlRE9NT2JqZWN0cyhS
ZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkKQEAgLTQ0MTgsNiArNDQyNiwxMSBAQCB2b2lkIERvY3Vt
ZW50Ojp1cGRhdGVJc1BsYXlpbmdNZWRpYSgpCiAgICAgaWYgKGF1dG8qIHBhZ2UgPSB0aGlzLT5w
YWdlKCkpCiAgICAgICAgIHBhZ2UtPnVwZGF0ZUlzUGxheWluZ01lZGlhKCk7CiAKKyAgICBpZiAo
IW1fZGlkQ2FwdHVyZUF1ZGlvICYmIHN0YXRlICYgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZTo6
SGFzQWN0aXZlQXVkaW9DYXB0dXJlRGV2aWNlKSB7CisgICAgICAgIG1fZGlkQ2FwdHVyZUF1ZGlv
ID0gdHJ1ZTsKKyAgICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5h
Z2VyKCkuYWRkQXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKKyAgICB9CisKICNpZiBFTkFCTEUo
TUVESUFfU1RSRUFNKQogICAgIGlmIChjYXB0dXJlU3RhdGVDaGFuZ2VkKQogICAgICAgICBtZWRp
YVN0cmVhbUNhcHR1cmVTdGF0ZUNoYW5nZWQoKTsKQEAgLTgyMTQsNiArODIyNywxMyBAQCB2b2lk
IERvY3VtZW50OjptZWRpYVN0cmVhbUNhcHR1cmVTdGF0ZUNoYW5nZWQoKQogCiAjZW5kaWYKIAor
Ym9vbCBEb2N1bWVudDo6aXNDYXB0dXJpbmdBdWRpbygpIGNvbnN0Cit7CisgICAgLy8gV2UgcmV0
dXJuIHRydWUgZXZlbiBpZiB0aGUgZG9jdW1lbnQgc3RvcHBlZCBjYXB0dXJpbmcgYXVkaW8gdG8g
cHJldmVudCBtdWx0aXBsZSBhdWRpbyBzZXNzaW9uIGNhdGVnb3J5IHN3aXRjaGVzLgorICAgIC8v
IEZJWE1FOiBXZSBtaWdodCB3YW50IHRvIHJlc2V0IG1fZGlkQ2FwdHVyZUF1ZGlvIHRvIGZhbHNl
IGluIGNhc2UgcGFnZSBpcyBubyBsb25nZXIgcGxheWluZyBhdWRpby4KKyAgICByZXR1cm4gbV9k
aWRDYXB0dXJlQXVkaW8gJiYgIWFjdGl2ZURPTU9iamVjdHNBcmVTdXNwZW5kZWQoKSAmJiAhYWN0
aXZlRE9NT2JqZWN0c0FyZVN0b3BwZWQoKTsKK30KKwogY29uc3QgQXRvbVN0cmluZyYgRG9jdW1l
bnQ6OmJnQ29sb3IoKSBjb25zdAogewogICAgIFJlZlB0ciBib2R5RWxlbWVudCA9IGJvZHkoKTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNv
cmUvZG9tL0RvY3VtZW50LmgKaW5kZXggNGMyOTVkNDU4ZjFhZTA2MTc5YTU0NmI5NGRiMzgwNzcy
NjU0YzFjNS4uMzNkMmZiMGMyNWE2YmFiZjJiYjE1NzhkNzE0Y2Y1OWQ1MzJhNjFkMyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUv
ZG9tL0RvY3VtZW50LmgKQEAgLTQ4LDYgKzQ4LDcgQEAKICNpbmNsdWRlICJPcmllbnRhdGlvbk5v
dGlmaWVyLmgiCiAjaW5jbHVkZSAiUGFnZUlkZW50aWZpZXIuaCIKICNpbmNsdWRlICJQbGF0Zm9y
bUV2ZW50LmgiCisjaW5jbHVkZSAiUGxhdGZvcm1NZWRpYVNlc3Npb24uaCIKICNpbmNsdWRlICJQ
bGF5YmFja1RhcmdldENsaWVudENvbnRleHRJZGVudGlmaWVyLmgiCiAjaW5jbHVkZSAiUmVmZXJy
ZXJQb2xpY3kuaCIKICNpbmNsdWRlICJSZWdpb24uaCIKQEAgLTM0Myw3ICszNDQsOCBAQCBjbGFz
cyBEb2N1bWVudAogICAgICwgcHVibGljIEZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlcgogICAgICwg
cHVibGljIFN1cHBsZW1lbnRhYmxlPERvY3VtZW50PgogICAgICwgcHVibGljIExvZ2dlcjo6T2Jz
ZXJ2ZXIKLSAgICAsIHB1YmxpYyBDYW52YXNPYnNlcnZlciB7CisgICAgLCBwdWJsaWMgQ2FudmFz
T2JzZXJ2ZXIKKyAgICAsIHByaXZhdGUgUGxhdGZvcm1NZWRpYVNlc3Npb246OkF1ZGlvQ2FwdHVy
ZVNvdXJjZSB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9FWFBPUlQoRG9jdW1lbnQsIFdF
QkNPUkVfRVhQT1JUKTsKIHB1YmxpYzoKICAgICB1c2luZyBXZWFrVmFsdWVUeXBlID0gRXZlbnRU
YXJnZXQ6OldlYWtWYWx1ZVR5cGU7CkBAIC0xNzUzLDYgKzE3NTUsOSBAQCBwcml2YXRlOgogICAg
IHZvaWQgYWRkVG9Eb2N1bWVudHNNYXAoKTsKICAgICB2b2lkIHJlbW92ZUZyb21Eb2N1bWVudHNN
YXAoKTsKIAorICAgIC8vIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpBdWRpb0NhcHR1cmVTb3VyY2UK
KyAgICBib29sIGlzQ2FwdHVyaW5nQXVkaW8oKSBjb25zdCBmaW5hbDsKKwogICAgIGNvbnN0IFJl
Zjxjb25zdCBTZXR0aW5ncz4gbV9zZXR0aW5nczsKIAogICAgIFVuaXF1ZVJlZjxRdWlya3M+IG1f
cXVpcmtzOwpAQCAtMjA1Nyw2ICsyMDYyLDcgQEAgcHJpdmF0ZToKIAogICAgIEluaGVyaXRlZEJv
b2wgbV9kZXNpZ25Nb2RlIHsgaW5oZXJpdCB9OwogICAgIE1lZGlhUHJvZHVjZXI6Ok1lZGlhU3Rh
dGVGbGFncyBtX21lZGlhU3RhdGU7CisgICAgYm9vbCBtX2RpZENhcHR1cmVBdWRpbyB7IGZhbHNl
IH07CiAgICAgYm9vbCBtX3VzZXJIYXNJbnRlcmFjdGVkV2l0aE1lZGlhRWxlbWVudCB7IGZhbHNl
IH07CiAgICAgQmFja0ZvcndhcmRDYWNoZVN0YXRlIG1fYmFja0ZvcndhcmRDYWNoZVN0YXRlIHsg
Tm90SW5CYWNrRm9yd2FyZENhY2hlIH07CiAgICAgc3RkOjpvcHRpb25hbDxSZWZlcnJlclBvbGlj
eT4gbV9yZWZlcnJlclBvbGljeTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi
L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZmNmOGUxOTI2MmM0MTk0ZTdmZDYzZWYwYzMz
MGNjN2YwNmZkMjJjLi5hZTg0OGFhMmExMTQyOWYxOWUxODUxZGUxYzc0ZDQyMzM3NjA0ZDljIDEw
MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDgtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A
YXBwbGUuY29tPgorCisgICAgICAgIFByZXZlbnQgQXVkaW9TZXNzaW9uIGNhdGVnb3J5IHRvIG1v
dmUgb3V0IG9mIFBsYXlBbmRSZWNvcmQgdG8gcXVpY2tseQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzI3CisgICAgICAgIDxyZGFyOi8vODE5OTcw
MjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo
dHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5o
dHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvbWVk
aWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWw6IEFkZGVkLgor
ICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL3Jlc291cmNlcy9jYXB0dXJl
LWF1ZGlvLWZyYW1lLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA4LTE5ICBZb3Vlbm4gRmFibGV0ICA8
eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTaWduYWxpbmcgc3RhdGUgY2hlY2sgd2hlbiBh
cHBseWluZyBhIGxvY2FsIG9yIHJlbW90ZSBkZXNjcmlwdGlvbiBpcyBubyBsb25nZXIgYWxpZ25l
ZCB3aXRoIHRoZSBXZWJSVEMgc3BlYwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhw
ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVk
aW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjNi
OWMwNjJhMzg2MmZlNDY2ZGY4YzA0MjZjYjAyNTQ1ZDc5NGI2ODQKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJl
LWFuZC1jYXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzIEBACisKK1BBU1Mg
VmFsaWRhdGUgYXVkaW8gc2Vzc2lvbiBjYXRlZ29yeSBpcyBzZXQgdG8gUGxheUFuZFJlY29yZCBh
ZnRlciBmcmFtZSBzdG9wcGVkIGNhcHR1cmluZworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5o
dHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVk
aW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp
bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45NjhkZjJkOGMz
ZjY5ZTgxMjcwNzYxYzdmNTdhODM4NmYzYTY4NDAzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0
VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0
ZWdvcnkuaHR0cHMuaHRtbApAQCAtMCwwICsxLDQyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s
PgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNl
cy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0
aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+Citm
dW5jdGlvbiB3aXRoX2lmcmFtZSh1cmwpIHsKKyAgICByZXR1cm4gbmV3IFByb21pc2UoZnVuY3Rp
b24ocmVzb2x2ZSkgeworICAgICAgICB2YXIgZnJhbWUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50
KCdpZnJhbWUnKTsKKyAgICAgICAgZnJhbWUuc3JjID0gdXJsOworICAgICAgICBmcmFtZS5vbmxv
YWQgPSBmdW5jdGlvbigpIHsgcmVzb2x2ZShmcmFtZSk7IH07CisgICAgICAgIGRvY3VtZW50LmJv
ZHkuYXBwZW5kQ2hpbGQoZnJhbWUpOworICAgIH0pOworfQorCitwcm9taXNlX3Rlc3QoYXN5bmMg
KHQpID0+IHsKKyAgICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICByZXR1cm4gUHJv
bWlzZS5yZWplY3QoIlRlc3QgcmVxdWlyZSBpbnRlcm5hbHMgQVBJIik7CisKKyAgICAgY29uc3Qg
ZnJhbWUgPSBhd2FpdCB3aXRoX2lmcmFtZSgncmVzb3VyY2VzL2NhcHR1cmUtYXVkaW8tZnJhbWUu
aHRtbCcpOworCisgICAgIGF3YWl0IGZyYW1lLmNvbnRlbnRXaW5kb3cuc3RhcnRDYXB0dXJlKCk7
CisKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSwg
IlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBjYXB0dXJpbmciKTsKKyAgICAKKyAgICAg
ZnJhbWUuY29udGVudFdpbmRvdy5zdG9wQ2FwdHVyZSgpOworICAgICBhd2FpdCBuZXcgUHJvbWlz
ZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgMTAwKSk7CisgICAgIGFzc2VydF9lcXVh
bHMoaW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNh
dGVnb3J5IHdoZW4gZG9jdW1lbnQgZGlkIGNhcHR1cmUgYnV0IGlzIG5vdCBjYXB0dXJpbmcgYW55
bW9yZSIpOworCisgICAgIGZyYW1lLnJlbW92ZSgpOworICAgICBsZXQgY291bnRlciA9IDA7Cisg
ICAgIHdoaWxlICgrK2NvdW50ZXIgPCAxMDAgJiYgaW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVn
b3J5KCkgPT09ICJQbGF5QW5kUmVjb3JkIikKKyAgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJl
c29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCA1MCkpOworCisgICAgIGFzc2VydF9ub3RfZXF1
YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29yeSgpLCAiUGxheUFuZFJlY29yZCIsICJj
YXRlZ29yeSB3aGVuIGNhcHR1cmluZyBkb2N1bWVudCB3ZW50IGF3YXkiKTsKK30sICJWYWxpZGF0
ZSBhdWRpbyBzZXNzaW9uIGNhdGVnb3J5IGlzIHNldCB0byBQbGF5QW5kUmVjb3JkIGFmdGVyIGZy
YW1lIHN0b3BwZWQgY2FwdHVyaW5nIik7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlm
ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL3Jlc291
cmNlcy9jYXB0dXJlLWF1ZGlvLWZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21l
ZGlhL21lZGlhLXN0cmVhbS9yZXNvdXJjZXMvY2FwdHVyZS1hdWRpby1mcmFtZS5odG1sCm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLmFjOWIwMzY5OTRhNWE1YWJjNjIzMDdmYzg0ZTQ4NWEwNTcxZmZjYWMKLS0tIC9kZXYv
bnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9yZXNv
dXJjZXMvY2FwdHVyZS1hdWRpby1mcmFtZS5odG1sCkBAIC0wLDAgKzEsMTQgQEAKKzwhRE9DVFlQ
RSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdD4KK2xldCB0cmFjazsKK2Fz
eW5jIGZ1bmN0aW9uIHN0YXJ0Q2FwdHVyZSgpCit7CisgICBjb25zdCBzdHJlYW0gPSBhd2FpdCBu
YXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7YXVkaW86dHJ1ZX0pOworICAgdHJh
Y2sgPSBzdHJlYW0uZ2V0QXVkaW9UcmFja3MoKVswXTsKK30KK2Z1bmN0aW9uIHN0b3BDYXB0dXJl
KCkKK3sKKyAgICB0cmFjay5zdG9wKCk7Cit9Cis8L3NjcmlwdD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435971</attachid>
            <date>2021-08-20 04:41:33 -0700</date>
            <delta_ts>2021-08-20 05:48:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820134131.patch</filename>
            <type>text/plain</type>
            <size>9696</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uNDdkZmRiMWY4YmVhYWNjMjgzNmY1NmNjZDEzMmRj
ODMzYzAzM2U2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSB0byBtb3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvIHF1aWNrbHkKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTMyNworICAg
ICAgICA8cmRhcjovLzgxOTk3MDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIEJlZm9yZSB0aGUgcGF0Y2gsIHdlIHdlcmUgY2hhbmdpbmcgYXV0b21h
dGljYWxseSB0byBQbGF5QW5kUmVjb3JkIHdoZW4gc3RhcnRpbmcgdG8gY2FwdHVyZSBhdWRpbywg
d2hpY2ggaXMgbWFuZGF0b3J5IHRvIGFjdHVhbGx5IGNhcHR1cmUgYXVkaW8uCisgICAgICAgIFdo
ZW4gc3RvcHBpbmcgYXVkaW8gY2FwdHVyZSwgd2Ugd2VyZSBhbHNvIGF1dG9tYXRpY2FsbHkgdXBk
YXRpbmcgdGhlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnksIHRvIGEgdmFsdWUgZGlmZmVyZW50IHRv
IFBsYXlBbmRSZWNvcmQuCisgICAgICAgIFRoZSBpbXBhY3QgaXMgdGhhdCB3aGVuIHdlIHN0b3Ag
YXVkaW8gY2FwdHVyZSwgdGhlIGF1ZGlvIGxldmVsIG1pZ2h0IGNoYW5nZSBhIGxvdCBkZXBlbmRp
bmcgb24gdXNlciBzZXR0aW5nIGJldHdlZW4gbm8tYXVkaW8tY2FwdHVyZSBhdWRpbyBsZXZlbCBh
bmQgYXVkaW8tY2FwdHVyZSBhdWRpbyBsZXZlbC4KKyAgICAgICAgVGhpcyBtaWdodCBiZSBkaXNy
dXB0aXZlIGZvciB2aWRlby1jb25mZXJlbmNlIGFwcGxpY2F0aW9ucyB0aGF0IHdpbGwgdGVtcG9y
YXJpbHkgbXV0ZS9zdG9wIGF1ZGlvLgorCisgICAgICAgIFRvIHByZXZlbnQgdGhpcywgd2Uga2Vl
cCBhIHN0YXRlIGluIHRoZSBEb2N1bWVudCB0byBrbm93IHdoZXRoZXIgaXQgZGlkIGF1ZGlvIGNh
cHR1cmUuCisgICAgICAgIElmIGl0IGlzIHRoZSBjYXNlIGFuZCBkb2N1bWVudCBpcyBhY3RpdmUs
IHdlIHN0aWNrIHRvIFBsYXlBbmRSZWNvcmQuCisgICAgICAgIElmIHRoZSBkb2N1bWVudCB0aGF0
IGRpZCBhdWRpbyBjYXB0dXJlIGdvZXMgYXdheSwgdGhlIGF1ZGlvIGNhdGVnb3J5IGNhbiBiZSBz
ZXQgYmFjayB0byBhIHZhbHVlIGRpZmZlcm50IGZyb20gUGxheUFuZFJlY29yZC4KKworICAgICAg
ICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1j
YXRlZ29yeS5odHRwcy5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6RG9jdW1lbnQ6On5Eb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1
bWVudDo6dXBkYXRlSXNQbGF5aW5nTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6
OmlzQ2FwdHVyaW5nQXVkaW8gY29uc3QpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorCiAy
MDIxLTA4LTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBB
ZGQgc3VwcG9ydCBmb3IgUlRDSWNlVHJhbnNwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRl
eCA3MTgxMDA0M2RiM2E4Zjc2ZmZhYjY0NDAyZWU3NjgzYzk2ZmMzZWRmLi4yOWFkZWM2NDM1ZDNj
NWU3MWNjYTE2NmY2NGEwYzNiYzQwZTM0NjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAg
LTc4MCw2ICs3ODAsOSBAQCBEb2N1bWVudDo6fkRvY3VtZW50KCkKIAogICAgIGZvciAodW5zaWdu
ZWQgY291bnQgOiBtX25vZGVMaXN0QW5kQ29sbGVjdGlvbkNvdW50cykKICAgICAgICAgQVNTRVJU
X1VOVVNFRChjb3VudCwgIWNvdW50KTsKKworICAgIGlmIChtX2RpZENhcHR1cmVBdWRpbykKKyAg
ICAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VyKCkucmVtb3Zl
QXVkaW9DYXB0dXJlU291cmNlKCp0aGlzKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6cmVtb3ZlZExh
c3RSZWYoKQpAQCAtMjY3Nyw2ICsyNjgwLDcgQEAgdm9pZCBEb2N1bWVudDo6d2lsbEJlUmVtb3Zl
ZEZyb21GcmFtZSgpCiAKICAgICBpZiAocGFnZSgpICYmICFtX21lZGlhU3RhdGUuaXNFbXB0eSgp
KSB7CiAgICAgICAgIG1fbWVkaWFTdGF0ZSA9IE1lZGlhUHJvZHVjZXI6OklzTm90UGxheWluZzsK
KyAgICAgICAgdXBkYXRlRGlkQ2FwdHVyZUF1ZGlvKEFsbG93U2V0dGluZ0RpZENhcHR1cmVUb0Zh
bHNlOjpZZXMpOwogICAgICAgICBwYWdlKCktPnVwZGF0ZUlzUGxheWluZ01lZGlhKCk7CiAgICAg
fQogCkBAIC0yNzcwLDYgKzI3NzQsOCBAQCB2b2lkIERvY3VtZW50OjpzdXNwZW5kQWN0aXZlRE9N
T2JqZWN0cyhSZWFzb25Gb3JTdXNwZW5zaW9uIHdoeSkKICAgICBTY3JpcHRFeGVjdXRpb25Db250
ZXh0OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0cyh3aHkpOwogICAgIHN1c3BlbmREZXZpY2VNb3Rp
b25BbmRPcmllbnRhdGlvblVwZGF0ZXMoKTsKICAgICBwbGF0Zm9ybVN1c3BlbmRPclN0b3BBY3Rp
dmVET01PYmplY3RzKCk7CisKKyAgICB1cGRhdGVEaWRDYXB0dXJlQXVkaW8oQWxsb3dTZXR0aW5n
RGlkQ2FwdHVyZVRvRmFsc2U6Olllcyk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnJlc3VtZUFjdGl2
ZURPTU9iamVjdHMoUmVhc29uRm9yU3VzcGVuc2lvbiB3aHkpCkBAIC0yNzg3LDYgKzI3OTMsOCBA
QCB2b2lkIERvY3VtZW50OjpzdG9wQWN0aXZlRE9NT2JqZWN0cygpCiAgICAgICAgIG1fZG9jdW1l
bnRUYXNrR3JvdXAtPm1hcmtBc1JlYWR5VG9TdG9wKCk7CiAgICAgU2NyaXB0RXhlY3V0aW9uQ29u
dGV4dDo6c3RvcEFjdGl2ZURPTU9iamVjdHMoKTsKICAgICBwbGF0Zm9ybVN1c3BlbmRPclN0b3BB
Y3RpdmVET01PYmplY3RzKCk7CisKKyAgICB1cGRhdGVEaWRDYXB0dXJlQXVkaW8oQWxsb3dTZXR0
aW5nRGlkQ2FwdHVyZVRvRmFsc2U6Olllcyk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OmNsZWFyQVhP
YmplY3RDYWNoZSgpCkBAIC00NDE4LDYgKzQ0MjYsOCBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVJ
c1BsYXlpbmdNZWRpYSgpCiAgICAgaWYgKGF1dG8qIHBhZ2UgPSB0aGlzLT5wYWdlKCkpCiAgICAg
ICAgIHBhZ2UtPnVwZGF0ZUlzUGxheWluZ01lZGlhKCk7CiAKKyAgICB1cGRhdGVEaWRDYXB0dXJl
QXVkaW8oQWxsb3dTZXR0aW5nRGlkQ2FwdHVyZVRvRmFsc2U6Ok5vKTsKKwogI2lmIEVOQUJMRShN
RURJQV9TVFJFQU0pCiAgICAgaWYgKGNhcHR1cmVTdGF0ZUNoYW5nZWQpCiAgICAgICAgIG1lZGlh
U3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpOwpAQCAtODIxNCw2ICs4MjI0LDI5IEBAIHZvaWQg
RG9jdW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpCiAKICNlbmRpZgogCiti
b29sIERvY3VtZW50Ojppc0NhcHR1cmluZ0F1ZGlvKCkgY29uc3QKK3sKKyAgICAvLyBXZSByZXR1
cm4gdHJ1ZSBldmVuIGlmIHRoZSBkb2N1bWVudCBzdG9wcGVkIGNhcHR1cmluZyBhdWRpbyB0byBw
cmV2ZW50IG11bHRpcGxlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgc3dpdGNoZXMuCisgICAgLy8g
RklYTUU6IFdlIG1pZ2h0IHdhbnQgdG8gcmVzZXQgbV9kaWRDYXB0dXJlQXVkaW8gdG8gZmFsc2Ug
aW4gY2FzZSBwYWdlIGlzIG5vIGxvbmdlciBwbGF5aW5nIGF1ZGlvLgorICAgIHJldHVybiBtX2Rp
ZENhcHR1cmVBdWRpbyAmJiAhYWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCgpICYmICFhY3Rp
dmVET01PYmplY3RzQXJlU3RvcHBlZCgpOworfQorCit2b2lkIERvY3VtZW50Ojp1cGRhdGVEaWRD
YXB0dXJlQXVkaW8oQWxsb3dTZXR0aW5nRGlkQ2FwdHVyZVRvRmFsc2UgcG9saWN5KQoreworICAg
IGJvb2wgaXNDYXB0dXJpbmdBdWRpbyA9ICEhKG1fbWVkaWFTdGF0ZSAmIE1lZGlhUHJvZHVjZXI6
Ok1lZGlhU3RhdGU6Okhhc0FjdGl2ZUF1ZGlvQ2FwdHVyZURldmljZSk7CisgICAgaWYgKGlzQ2Fw
dHVyaW5nQXVkaW8pIHsKKyAgICAgICAgbV9kaWRDYXB0dXJlQXVkaW8gPSB0cnVlOworICAgICAg
ICBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5hZGRBdWRpb0Nh
cHR1cmVTb3VyY2UoKnRoaXMpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKHBv
bGljeSA9PSBBbGxvd1NldHRpbmdEaWRDYXB0dXJlVG9GYWxzZTo6Tm8gfHwgIW1fZGlkQ2FwdHVy
ZUF1ZGlvKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2RpZENhcHR1cmVBdWRpbyA9IGZhbHNl
OworICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigpLnJlbW92
ZUF1ZGlvQ2FwdHVyZVNvdXJjZSgqdGhpcyk7Cit9CisKIGNvbnN0IEF0b21TdHJpbmcmIERvY3Vt
ZW50OjpiZ0NvbG9yKCkgY29uc3QKIHsKICAgICBSZWZQdHIgYm9keUVsZW1lbnQgPSBib2R5KCk7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJD
b3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDRjMjk1ZDQ1OGYxYWUwNjE3OWE1NDZiOTRkYjM4MDc3
MjY1NGMxYzUuLjU5ODRlMzIxMDNhZTExNjBhZTQzYzg2Yzc0YWU5MjE1MGYxM2M4NTQgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L2RvbS9Eb2N1bWVudC5oCkBAIC00OCw2ICs0OCw3IEBACiAjaW5jbHVkZSAiT3JpZW50YXRpb25O
b3RpZmllci5oIgogI2luY2x1ZGUgIlBhZ2VJZGVudGlmaWVyLmgiCiAjaW5jbHVkZSAiUGxhdGZv
cm1FdmVudC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtTWVkaWFTZXNzaW9uLmgiCiAjaW5jbHVkZSAi
UGxheWJhY2tUYXJnZXRDbGllbnRDb250ZXh0SWRlbnRpZmllci5oIgogI2luY2x1ZGUgIlJlZmVy
cmVyUG9saWN5LmgiCiAjaW5jbHVkZSAiUmVnaW9uLmgiCkBAIC0zNDMsNyArMzQ0LDggQEAgY2xh
c3MgRG9jdW1lbnQKICAgICAsIHB1YmxpYyBGcmFtZURlc3RydWN0aW9uT2JzZXJ2ZXIKICAgICAs
IHB1YmxpYyBTdXBwbGVtZW50YWJsZTxEb2N1bWVudD4KICAgICAsIHB1YmxpYyBMb2dnZXI6Ok9i
c2VydmVyCi0gICAgLCBwdWJsaWMgQ2FudmFzT2JzZXJ2ZXIgeworICAgICwgcHVibGljIENhbnZh
c09ic2VydmVyCisgICAgLCBwcml2YXRlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpBdWRpb0NhcHR1
cmVTb3VyY2UgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURURfRVhQT1JUKERvY3VtZW50LCBX
RUJDT1JFX0VYUE9SVCk7CiBwdWJsaWM6CiAgICAgdXNpbmcgV2Vha1ZhbHVlVHlwZSA9IEV2ZW50
VGFyZ2V0OjpXZWFrVmFsdWVUeXBlOwpAQCAtMTc1Myw2ICsxNzU1LDEyIEBAIHByaXZhdGU6CiAg
ICAgdm9pZCBhZGRUb0RvY3VtZW50c01hcCgpOwogICAgIHZvaWQgcmVtb3ZlRnJvbURvY3VtZW50
c01hcCgpOwogCisgICAgZW51bSBjbGFzcyBBbGxvd1NldHRpbmdEaWRDYXB0dXJlVG9GYWxzZSB7
IE5vLCBZZXMgfTsKKyAgICB2b2lkIHVwZGF0ZURpZENhcHR1cmVBdWRpbyhBbGxvd1NldHRpbmdE
aWRDYXB0dXJlVG9GYWxzZSk7CisKKyAgICAvLyBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6QXVkaW9D
YXB0dXJlU291cmNlCisgICAgYm9vbCBpc0NhcHR1cmluZ0F1ZGlvKCkgY29uc3QgZmluYWw7CisK
ICAgICBjb25zdCBSZWY8Y29uc3QgU2V0dGluZ3M+IG1fc2V0dGluZ3M7CiAKICAgICBVbmlxdWVS
ZWY8UXVpcmtzPiBtX3F1aXJrczsKQEAgLTIwNTcsNiArMjA2NSw3IEBAIHByaXZhdGU6CiAKICAg
ICBJbmhlcml0ZWRCb29sIG1fZGVzaWduTW9kZSB7IGluaGVyaXQgfTsKICAgICBNZWRpYVByb2R1
Y2VyOjpNZWRpYVN0YXRlRmxhZ3MgbV9tZWRpYVN0YXRlOworICAgIGJvb2wgbV9kaWRDYXB0dXJl
QXVkaW8geyBmYWxzZSB9OwogICAgIGJvb2wgbV91c2VySGFzSW50ZXJhY3RlZFdpdGhNZWRpYUVs
ZW1lbnQgeyBmYWxzZSB9OwogICAgIEJhY2tGb3J3YXJkQ2FjaGVTdGF0ZSBtX2JhY2tGb3J3YXJk
Q2FjaGVTdGF0ZSB7IE5vdEluQmFja0ZvcndhcmRDYWNoZSB9OwogICAgIHN0ZDo6b3B0aW9uYWw8
UmVmZXJyZXJQb2xpY3k+IG1fcmVmZXJyZXJQb2xpY3k7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGZjZjhlMTkyNjJjNDE5
NGU3ZmQ2M2VmMGMzMzBjYzdmMDZmZDIyYy4uYWU4NDhhYTJhMTE0MjlmMTllMTg1MWRlMWM3NGQ0
MjMzNzYwNGQ5YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91
dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA4LTIwICBZb3Vlbm4gRmFi
bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vzc2lvbiBj
YXRlZ29yeSB0byBtb3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvIHF1aWNrbHkKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTMyNworICAgICAgICA8
cmRhcjovLzgxOTk3MDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1h
bmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rl
c3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5o
dG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9yZXNv
dXJjZXMvY2FwdHVyZS1hdWRpby1mcmFtZS5odG1sOiBBZGRlZC4KKwogMjAyMS0wOC0xOSAgWW91
ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2lnbmFsaW5nIHN0YXRl
IGNoZWNrIHdoZW4gYXBwbHlpbmcgYSBsb2NhbCBvciByZW1vdGUgZGVzY3JpcHRpb24gaXMgbm8g
bG9uZ2VyIGFsaWduZWQgd2l0aCB0aGUgV2ViUlRDIHNwZWMKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVn
b3J5Lmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVk
aWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4cGVjdGVkLnR4dApu
ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwLi4zYjljMDYyYTM4NjJmZTQ2NmRmOGMwNDI2Y2IwMjU0NWQ3OTRiNjg0Ci0tLSAv
ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0v
YXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs
MyBAQAorCitQQVNTIFZhbGlkYXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgaXMgc2V0IHRvIFBs
YXlBbmRSZWNvcmQgYWZ0ZXIgZnJhbWUgc3RvcHBlZCBjYXB0dXJpbmcKKwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1h
bmQtY2F0ZWdvcnkuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVk
aWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uYzEyNWZjZmNkMmM4NDllNzA2ODYzOGE3ODI3MzQzODBmZDZmYTI5ZAotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNh
cHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwKQEAgLTAsMCArMSw0MiBAQAorPCFET0NUWVBF
IGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdCBz
cmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9y
ZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+
Cis8c2NyaXB0PgorZnVuY3Rpb24gd2l0aF9pZnJhbWUodXJsKSB7CisgICAgcmV0dXJuIG5ldyBQ
cm9taXNlKGZ1bmN0aW9uKHJlc29sdmUpIHsKKyAgICAgICAgdmFyIGZyYW1lID0gZG9jdW1lbnQu
Y3JlYXRlRWxlbWVudCgnaWZyYW1lJyk7CisgICAgICAgIGZyYW1lLnNyYyA9IHVybDsKKyAgICAg
ICAgZnJhbWUub25sb2FkID0gZnVuY3Rpb24oKSB7IHJlc29sdmUoZnJhbWUpOyB9OworICAgICAg
ICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGZyYW1lKTsKKyAgICB9KTsKK30KKworcHJvbWlz
ZV90ZXN0KGFzeW5jICh0KSA9PiB7CisgICAgIGlmICghd2luZG93LmludGVybmFscykKKyAgICAg
ICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCJUZXN0IHJlcXVpcmUgaW50ZXJuYWxzIEFQSSIpOwor
CisgICAgIGNvbnN0IGZyYW1lID0gYXdhaXQgd2l0aF9pZnJhbWUoJ3Jlc291cmNlcy9jYXB0dXJl
LWF1ZGlvLWZyYW1lLmh0bWwnKTsKKworICAgICBhd2FpdCBmcmFtZS5jb250ZW50V2luZG93LnN0
YXJ0Q2FwdHVyZSgpOworCisgICAgIGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLmF1ZGlvU2Vzc2lv
bkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdoZW4gY2FwdHVyaW5nIik7
CisKKyAgICAgZnJhbWUuY29udGVudFdpbmRvdy5zdG9wQ2FwdHVyZSgpOworICAgICBhd2FpdCBu
ZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgMTAwKSk7CisgICAgIGFz
c2VydF9lcXVhbHMoaW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVj
b3JkIiwgImNhdGVnb3J5IHdoZW4gZG9jdW1lbnQgZGlkIGNhcHR1cmUgYnV0IGlzIG5vdCBjYXB0
dXJpbmcgYW55bW9yZSIpOworCisgICAgIGZyYW1lLnJlbW92ZSgpOworICAgICBsZXQgY291bnRl
ciA9IDA7CisgICAgIHdoaWxlICgrK2NvdW50ZXIgPCAxMDAgJiYgaW50ZXJuYWxzLmF1ZGlvU2Vz
c2lvbkNhdGVnb3J5KCkgPT09ICJQbGF5QW5kUmVjb3JkIikKKyAgICAgICAgIGF3YWl0IG5ldyBQ
cm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCA1MCkpOworCisgICAgIGFzc2Vy
dF9ub3RfZXF1YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29yeSgpLCAiUGxheUFuZFJl
Y29yZCIsICJjYXRlZ29yeSB3aGVuIGNhcHR1cmluZyBkb2N1bWVudCB3ZW50IGF3YXkiKTsKK30s
ICJWYWxpZGF0ZSBhdWRpbyBzZXNzaW9uIGNhdGVnb3J5IGlzIHNldCB0byBQbGF5QW5kUmVjb3Jk
IGFmdGVyIGZyYW1lIHN0b3BwZWQgY2FwdHVyaW5nIik7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwv
aHRtbD4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435976</attachid>
            <date>2021-08-20 05:48:33 -0700</date>
            <delta_ts>2021-08-20 07:14:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820144831.patch</filename>
            <type>text/plain</type>
            <size>11588</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uZWI4OTZjMjllOTJjNzU5YWRlMTZjNzVkODlmNzcw
ZDk4Mjc3Y2RhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSB0byBtb3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvbyBxdWlja2x5Cisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkzMjcKKyAg
ICAgICAgPHJkYXI6Ly84MTk5NzAyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBJZiBjYXRlZ29yeSBpcyBQbGF5QW5kUmVjb3JkLCB3ZSBzdGljayB0
byBQbGF5QW5kUmVjb3JkIHVudGlsIGF1ZGlvIGlzIG5vIGxvbmdlciBwbGF5aW5nIGF0IHdoaWNo
IHBvaW50IHdlCisgICAgICAgIHRyYW5zaXRpb24gdG8gd2hhdGV2ZXIgY2F0ZWdvcnkgaXMgbW9z
dCBhcHByb3ByaWF0ZS4KKyAgICAgICAgSW50cm9kdWNlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpp
c1BsYXlpbmcgaW4gYWRkaXRpb24gdG8gY2FuUHJvZHVjZUF1ZGlvIHRvIGNvbXB1dGUgd2hldGhl
ciBhdWRpbyBpcyBiZWluZyBwbGF5ZWQuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9tZWRp
YS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbAorCisg
ICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi
Q29yZTo6QXVkaW9Db250ZXh0Ojppc1BsYXlpbmcgY29uc3QpOgorICAgICAgICAqIE1vZHVsZXMv
d2ViYXVkaW8vQXVkaW9Db250ZXh0Lmg6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50
Lmg6CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb246OmlzUGxheWluZyBjb25zdCk6
CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaDoKKyAgICAg
ICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uQ2xpZW50Ojppc1BsYXlpbmcgY29uc3Qp
OgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2Nv
YS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRl
U2Vzc2lvblN0YXRlKToKKwogMjAyMS0wOC0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs
ZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIFJUQ0ljZVRyYW5zcG9ydApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwIGIv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCmluZGV4IDQy
YjllOTNhNmUyNWU2NTk2NGFlYjYwNDMzNjlkYWExYTYxNGE0YzYuLmRmYmRiYzcyZjM2YjBkOTAw
OTgwOWM1YTcwYTZmZmE5ZTUxZGJlNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAKQEAgLTQ4NSw2ICs0ODUsMTEgQEAgYm9vbCBBdWRp
b0NvbnRleHQ6OmlzU3VzcGVuZGVkKCkgY29uc3QKICAgICByZXR1cm4gIWRvY3VtZW50KCkgfHwg
ZG9jdW1lbnQoKS0+YWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCgpIHx8IGRvY3VtZW50KCkt
PmFjdGl2ZURPTU9iamVjdHNBcmVTdG9wcGVkKCk7CiB9CiAKK2Jvb2wgQXVkaW9Db250ZXh0Ojpp
c1BsYXlpbmcoKSBjb25zdAoreworICAgIHJldHVybiBzdGF0ZSgpID09IFN0YXRlOjpSdW5uaW5n
OworfQorCiB2b2lkIEF1ZGlvQ29udGV4dDo6cGFnZU11dGVkU3RhdGVEaWRDaGFuZ2UoKQogewog
ICAgIGlmIChkb2N1bWVudCgpICYmIGRvY3VtZW50KCktPnBhZ2UoKSkKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmggYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oCmluZGV4IDQzMzQ0NTE5OTQxZWVk
MTc5ZDIyZmMzYTVkODRkN2YxYzA4MzZiYTMuLjBmNjU4YjNiN2JjNGNkMzgxOTM2Y2ZhZjZhZmNl
NTZkNTQyNzlkYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v
QXVkaW9Db250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRp
b0NvbnRleHQuaApAQCAtMTMwLDYgKzEzMCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBzaG91bGRP
dmVycmlkZUJhY2tncm91bmRQbGF5YmFja1Jlc3RyaWN0aW9uKFBsYXRmb3JtTWVkaWFTZXNzaW9u
OjpJbnRlcnJ1cHRpb25UeXBlKSBjb25zdCBmaW5hbCB7IHJldHVybiBmYWxzZTsgfQogICAgIGJv
b2wgY2FuUHJvZHVjZUF1ZGlvKCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfQogICAgIGJv
b2wgaXNTdXNwZW5kZWQoKSBjb25zdCBmaW5hbDsKKyAgICBib29sIGlzUGxheWluZygpIGNvbnN0
IGZpbmFsOwogICAgIE1lZGlhU2Vzc2lvbkdyb3VwSWRlbnRpZmllciBtZWRpYVNlc3Npb25Hcm91
cElkZW50aWZpZXIoKSBjb25zdCBmaW5hbDsKIAogICAgIC8vIE1lZGlhQ2FuU3RhcnRMaXN0ZW5l
ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oIGIv
U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggMTE3NmU2NzRmNmYy
NTliMWEyOWU1ODFlZGNlNWE4ZTg2ZDcyMGZjZi4uZmRlODRkZmE1OGQxZWE4ZmRmMTI3NjEyZWQy
MjgwYTllZTQzOTdjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF
bGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKQEAg
LTQ1Nyw3ICs0NTcsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQg
Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmLCBjb25zdCBIYXNoU2V0PFNl
Y3VyaXR5T3JpZ2luRGF0YT4mKTsKICAgICBzdGF0aWMgdm9pZCByZXNldE1lZGlhRW5naW5lcygp
OwogCi0gICAgYm9vbCBpc1BsYXlpbmcoKSBjb25zdCB7IHJldHVybiBtX3BsYXlpbmc7IH0KKyAg
ICBib29sIGlzUGxheWluZygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1fcGxheWluZzsgfQogCiAj
aWYgRU5BQkxFKFdFQl9BVURJTykKICAgICBNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGUqIGF1
ZGlvU291cmNlTm9kZSgpIHsgcmV0dXJuIG1fYXVkaW9Tb3VyY2VOb2RlOyB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAK
aW5kZXggMzliMjg4ZDRjZDZiOGJlODRkZmIzNTMxY2ZlMjcxZDNjY2U1MjAwZS4uZDM3NGM4MmMy
NTBjMTJhMzcyMGFmM2E1NjI0Zjc4Y2Q3YTljNTRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMzIyLDYg
KzMyMiwxMSBAQCBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc1N1c3BlbmRlZCgpIGNvbnN0
CiAgICAgcmV0dXJuIG1fY2xpZW50LmlzU3VzcGVuZGVkKCk7CiB9CiAKK2Jvb2wgUGxhdGZvcm1N
ZWRpYVNlc3Npb246OmlzUGxheWluZygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY2xpZW50Lmlz
UGxheWluZygpOworfQorCiBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpzaG91bGRPdmVycmlk
ZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKSBjb25zdAogewogICAgIHJldHVybiBtX2Ns
aWVudC5zaG91bGRPdmVycmlkZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKTsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9u
LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5o
CmluZGV4IDY0NWFjNWIwNzNkNWQyODJjZmNlOThiNDI3NzU1Yjg1YmY2OTI5OTcuLjM2ZjNiN2Vj
ZGRjNGMyYTYyZWFiZWJjMTIzMzA1OTRlZDA2YmVmYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaApAQCAtMTU4LDYgKzE1
OCw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNIaWRkZW4oKSBjb25zdDsKICAgICBib29sIGlz
U3VzcGVuZGVkKCkgY29uc3Q7CisgICAgYm9vbCBpc1BsYXlpbmcoKSBjb25zdDsKIAogICAgIGJv
b2wgc2hvdWxkT3ZlcnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCkgY29uc3Q7CiAK
QEAgLTI1Miw2ICsyNTMsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuUHJvZHVj
ZUF1ZGlvKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTdXNw
ZW5kZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNQbGF5
aW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH07CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxk
T3ZlcnJpZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbihQbGF0Zm9ybU1lZGlhU2Vzc2lv
bjo6SW50ZXJydXB0aW9uVHlwZSkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRP
dmVycmlkZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKSBjb25zdCB7IHJldHVybiBmYWxz
ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVk
aWFTZXNzaW9uTWFuYWdlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
Y29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCmluZGV4IGM5NjExYzNiMDZjM2NhZWYy
YmJiNDAxZjBjNWU3NzlmZmQ3ZjQ2NzMuLmU0ODFlNTllNDBkNzY3MGEzZDc1YzViNzE0MmZlMzI4
OGNjMjE2Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h
L01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KQEAgLTg2LDYgKzg2LDcg
QEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAg
ICAgaW50IHdlYkF1ZGlvQ291bnQgPSAwOwogICAgIGludCBjYXB0dXJlQ291bnQgPSBjb3VudEFj
dGl2ZUF1ZGlvQ2FwdHVyZVNvdXJjZXMoKTsKICAgICBib29sIGhhc0F1ZGlibGVBdWRpb09yVmlk
ZW9NZWRpYVR5cGUgPSBmYWxzZTsKKyAgICBib29sIGlzUGxheWluZ0F1ZGlvID0gZmFsc2U7CiAg
ICAgZm9yRWFjaFNlc3Npb24oWyZdIChhdXRvJiBzZXNzaW9uKSBtdXRhYmxlIHsKICAgICAgICAg
YXV0byB0eXBlID0gc2Vzc2lvbi5tZWRpYVR5cGUoKTsKICAgICAgICAgc3dpdGNoICh0eXBlKSB7
CkBAIC0xMDEsMTYgKzEwMiwxOSBAQCB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBk
YXRlU2Vzc2lvblN0YXRlKCkKICAgICAgICAgICAgICsrYXVkaW9Db3VudDsKICAgICAgICAgICAg
IGJyZWFrOwogICAgICAgICBjYXNlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6Oldl
YkF1ZGlvOgotICAgICAgICAgICAgaWYgKHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkpCisgICAg
ICAgICAgICBpZiAoc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSkgewogICAgICAgICAgICAgICAg
ICsrd2ViQXVkaW9Db3VudDsKKyAgICAgICAgICAgICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNz
aW9uLmlzUGxheWluZygpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAg
ICAgIH0KIAogICAgICAgICBpZiAoIWhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUpIHsK
LSAgICAgICAgICAgIGlmICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl
OjpWaWRlb0F1ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6
QXVkaW8pICYmIHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5oYXNQbGF5ZWRT
aW5jZUxhc3RJbnRlcnJ1cHRpb24oKSkKLSAgICAgICAgICAgICAgICBoYXNBdWRpYmxlQXVkaW9P
clZpZGVvTWVkaWFUeXBlID0gdHJ1ZTsKLSAgICAgICAgICAgIGlmIChzZXNzaW9uLmlzUGxheWlu
Z1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpKQorICAgICAgICAgICAgYm9vbCBpc1BvdGVudGlh
bGx5QXVkaWJsZSA9IHNlc3Npb24uaXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkg
fHwgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6OlZpZGVvQXVkaW8g
fHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpBdWRpbykgJiYgc2Vz
c2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSAmJiBzZXNzaW9uLmhhc1BsYXllZFNpbmNlTGFzdEludGVy
cnVwdGlvbigpKTsKKyAgICAgICAgICAgIGlmIChpc1BvdGVudGlhbGx5QXVkaWJsZSkgewogICAg
ICAgICAgICAgICAgIGhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUgPSB0cnVlOworICAg
ICAgICAgICAgICAgIGlzUGxheWluZ0F1ZGlvIHw9IHNlc3Npb24uaXNQbGF5aW5nKCk7CisgICAg
ICAgICAgICB9CiAgICAgICAgIH0KICAgICB9KTsKIApAQCAtMTQ2LDYgKzE1MCw5IEBAIHZvaWQg
TWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9uU3RhdGUoKQogICAgIH0gZWxz
ZSBpZiAod2ViQXVkaW9Db3VudCkKICAgICAgICAgY2F0ZWdvcnkgPSBBdWRpb1Nlc3Npb246OkNh
dGVnb3J5VHlwZTo6QW1iaWVudFNvdW5kOwogCisgICAgaWYgKEF1ZGlvU2Vzc2lvbjo6c2hhcmVk
U2Vzc2lvbigpLmNhdGVnb3J5KCkgPT0gQXVkaW9TZXNzaW9uOjpDYXRlZ29yeVR5cGU6OlBsYXlB
bmRSZWNvcmQgJiYgaXNQbGF5aW5nQXVkaW8pCisgICAgICAgIGNhdGVnb3J5ID0gQXVkaW9TZXNz
aW9uOjpDYXRlZ29yeVR5cGU6OlBsYXlBbmRSZWNvcmQ7CisKICAgICBBTFdBWVNfTE9HKExPR0lE
RU5USUZJRVIsICJzZXR0aW5nIGNhdGVnb3J5ID0gIiwgY2F0ZWdvcnksICIsIHBvbGljeSA9ICIs
IHBvbGljeSk7CiAgICAgQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9uKCkuc2V0Q2F0ZWdvcnko
Y2F0ZWdvcnksIHBvbGljeSk7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGZjZjhlMTkyNjJjNDE5NGU3ZmQ2M2VmMGMz
MzBjYzdmMDZmZDIyYy4uODJiNTY2MGQ0NDEzNjQyOTEzNjIwMWE5ZjMyZDk1NjZmZGMwNmJhNCAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA4LTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u
QGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vzc2lvbiBjYXRlZ29yeSB0byBt
b3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvbyBxdWlja2x5CisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkzMjcKKyAgICAgICAgPHJkYXI6Ly84MTk5
NzAyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5
Lmh0dHBzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9t
ZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbDogQWRkZWQu
CisKIDIwMjEtMDgtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg
ICAgIFNpZ25hbGluZyBzdGF0ZSBjaGVjayB3aGVuIGFwcGx5aW5nIGEgbG9jYWwgb3IgcmVtb3Rl
IGRlc2NyaXB0aW9uIGlzIG5vIGxvbmdlciBhbGlnbmVkIHdpdGggdGhlIFdlYlJUQyBzcGVjCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRp
by1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5o
dHRwcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDkxODg5MDI2OWQ2NjBkNjVhYzlhZjMwMmU3
MWNhOWU0MzFlYTkzMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
bWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4cGVj
dGVkLnR4dApAQCAtMCwwICsxLDQgQEAKKworCitQQVNTIFZhbGlkYXRlIGF1ZGlvIHNlc3Npb24g
Y2F0ZWdvcnkgaXMgc2V0IHRvIFBsYXlBbmRSZWNvcmQgYWZ0ZXIgZnJhbWUgc3RvcHBlZCBjYXB0
dXJpbmcgYnV0IGNvbnRpbnVlZCBwbGF5aW5nIGF1ZGlvCisKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVn
b3J5Lmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVh
bS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI2Y2Fh
ZTM4NjEyNzY4YTc5ODdkMDIwNzUxMmRjN2QxNTY1OTZiYWQKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFu
ZC1jYXRlZ29yeS5odHRwcy5odG1sCkBAIC0wLDAgKzEsNTkgQEAKKzwhRE9DVFlQRSBodG1sPgor
PGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQgc3JjPSIvcmVz
b3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2Vz
L3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHZpZGVv
IGlkPSJhdWRpbyIgYXV0b3BsYXkgcGxheXNJbmxpbmU+PC92aWRlbz4KKzxzY3JpcHQ+Cithc3lu
YyBmdW5jdGlvbiBuZWdvdGlhdGUocGMxLCBwYzIpCit7CisgICAgIHBjMS5vbmljZWNhbmRpZGF0
ZSA9IChldmVudCkgPT4geyBwYzIuYWRkSWNlQ2FuZGlkYXRlKGV2ZW50LmNhbmRpZGF0ZSkgfTsK
KyAgICAgcGMyLm9uaWNlY2FuZGlkYXRlID0gKGV2ZW50KSA9PiB7IHBjMS5hZGRJY2VDYW5kaWRh
dGUoZXZlbnQuY2FuZGlkYXRlKSB9OworCisgICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNy
ZWF0ZU9mZmVyKCk7CisgICAgIGF3YWl0IHBjMS5zZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVyKTsK
KyAgICAgYXdhaXQgcGMyLnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsKKyAgICAgY29uc3Qg
YW5zd2VyID0gYXdhaXQgcGMyLmNyZWF0ZUFuc3dlcigpOworICAgICBhd2FpdCBwYzIuc2V0TG9j
YWxEZXNjcmlwdGlvbihhbnN3ZXIpOworICAgICBhd2FpdCBwYzEuc2V0UmVtb3RlRGVzY3JpcHRp
b24oYW5zd2VyKTsKK30KKworcHJvbWlzZV90ZXN0KGFzeW5jICh0KSA9PiB7CisgICAgIGlmICgh
d2luZG93LmludGVybmFscykKKyAgICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCJUZXN0IHJl
cXVpcmUgaW50ZXJuYWxzIEFQSSIpOworCisgICAgIGNvbnN0IHN0cmVhbSA9IGF3YWl0IG5hdmln
YXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHthdWRpbzp0cnVlfSk7CisKKyAgICAgYXNz
ZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSwgIlBsYXlBbmRSZWNv
cmQiLCAiY2F0ZWdvcnkgd2hlbiBjYXB0dXJpbmciKTsKKworICAgICBjb25zdCBwYzEgPSBuZXcg
UlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25uZWN0
aW9uKCk7CisKKyAgICAgcGMxLmFkZFRyYWNrKHN0cmVhbS5nZXRBdWRpb1RyYWNrcygpWzBdLCBz
dHJlYW0pOworCisgICAgIGF3YWl0IG5lZ290aWF0ZShwYzEsIHBjMik7CisKKyAgICAgYXVkaW8u
c3JjT2JqZWN0ID0gbmV3IE1lZGlhU3RyZWFtKFtwYzIuZ2V0UmVjZWl2ZXJzKClbMF0udHJhY2td
KTsKKyAgICAgYXdhaXQgYXVkaW8ucGxheSgpOworCisgICAgIGFzc2VydF9lcXVhbHMoaW50ZXJu
YWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdo
ZW4gY2FwdHVyaW5nIik7CisKKyAgICAgc3RyZWFtLmdldEF1ZGlvVHJhY2tzKClbMF0uc3RvcCgp
OworCisgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZl
LCAxMDApKTsKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdv
cnkoKSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBkb2N1bWVudCBkaWQgY2FwdHVy
ZSBidXQgaXMgbm90IGNhcHR1cmluZyBhbnltb3JlIik7CisKKyAgICAgYXVkaW8ucGF1c2UoKTsK
KworICAgICBsZXQgY291bnRlciA9IDA7CisgICAgIHdoaWxlICgrK2NvdW50ZXIgPCAxMDAgJiYg
aW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCkgPT09ICJQbGF5QW5kUmVjb3JkIikKKyAg
ICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCA1
MCkpOworCisgICAgIGFzc2VydF9ub3RfZXF1YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRl
Z29yeSgpLCAiUGxheUFuZFJlY29yZCIsICJjYXRlZ29yeSB3aGVuIGRvY3VtZW50IGRpZCBjYXB0
dXJlIGJ1dCBzdG9wcGVkIHBsYXlpbmcgYW55IGF1ZGlvIik7Cit9LCAiVmFsaWRhdGUgYXVkaW8g
c2Vzc2lvbiBjYXRlZ29yeSBpcyBzZXQgdG8gUGxheUFuZFJlY29yZCBhZnRlciBmcmFtZSBzdG9w
cGVkIGNhcHR1cmluZyBidXQgY29udGludWVkIHBsYXlpbmcgYXVkaW8iKTsKKzwvc2NyaXB0Pgor
PC9ib2R5PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435981</attachid>
            <date>2021-08-20 07:15:00 -0700</date>
            <delta_ts>2021-08-20 09:02:38 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820161458.patch</filename>
            <type>text/plain</type>
            <size>11756</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uZWI4OTZjMjllOTJjNzU5YWRlMTZjNzVkODlmNzcw
ZDk4Mjc3Y2RhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSB0byBtb3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvbyBxdWlja2x5Cisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkzMjcKKyAg
ICAgICAgPHJkYXI6Ly84MTk5NzAyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBJZiBjYXRlZ29yeSBpcyBQbGF5QW5kUmVjb3JkLCB3ZSBzdGljayB0
byBQbGF5QW5kUmVjb3JkIHVudGlsIGF1ZGlvIGlzIG5vIGxvbmdlciBwbGF5aW5nIGF0IHdoaWNo
IHBvaW50IHdlCisgICAgICAgIHRyYW5zaXRpb24gdG8gd2hhdGV2ZXIgY2F0ZWdvcnkgaXMgbW9z
dCBhcHByb3ByaWF0ZS4KKyAgICAgICAgSW50cm9kdWNlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpp
c1BsYXlpbmcgaW4gYWRkaXRpb24gdG8gY2FuUHJvZHVjZUF1ZGlvIHRvIGNvbXB1dGUgd2hldGhl
ciBhdWRpbyBpcyBiZWluZyBwbGF5ZWQuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9tZWRp
YS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbAorCisg
ICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi
Q29yZTo6QXVkaW9Db250ZXh0Ojppc1BsYXlpbmcgY29uc3QpOgorICAgICAgICAqIE1vZHVsZXMv
d2ViYXVkaW8vQXVkaW9Db250ZXh0Lmg6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50
Lmg6CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwOgor
ICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb246OmlzUGxheWluZyBjb25zdCk6
CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaDoKKyAgICAg
ICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uQ2xpZW50Ojppc1BsYXlpbmcgY29uc3Qp
OgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2Nv
YS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRl
U2Vzc2lvblN0YXRlKToKKwogMjAyMS0wOC0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs
ZS5jb20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIFJUQ0ljZVRyYW5zcG9ydApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwIGIv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCmluZGV4IDQy
YjllOTNhNmUyNWU2NTk2NGFlYjYwNDMzNjlkYWExYTYxNGE0YzYuLmRmYmRiYzcyZjM2YjBkOTAw
OTgwOWM1YTcwYTZmZmE5ZTUxZGJlNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAKQEAgLTQ4NSw2ICs0ODUsMTEgQEAgYm9vbCBBdWRp
b0NvbnRleHQ6OmlzU3VzcGVuZGVkKCkgY29uc3QKICAgICByZXR1cm4gIWRvY3VtZW50KCkgfHwg
ZG9jdW1lbnQoKS0+YWN0aXZlRE9NT2JqZWN0c0FyZVN1c3BlbmRlZCgpIHx8IGRvY3VtZW50KCkt
PmFjdGl2ZURPTU9iamVjdHNBcmVTdG9wcGVkKCk7CiB9CiAKK2Jvb2wgQXVkaW9Db250ZXh0Ojpp
c1BsYXlpbmcoKSBjb25zdAoreworICAgIHJldHVybiBzdGF0ZSgpID09IFN0YXRlOjpSdW5uaW5n
OworfQorCiB2b2lkIEF1ZGlvQ29udGV4dDo6cGFnZU11dGVkU3RhdGVEaWRDaGFuZ2UoKQogewog
ICAgIGlmIChkb2N1bWVudCgpICYmIGRvY3VtZW50KCktPnBhZ2UoKSkKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmggYi9Tb3VyY2UvV2Vi
Q29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oCmluZGV4IDQzMzQ0NTE5OTQxZWVk
MTc5ZDIyZmMzYTVkODRkN2YxYzA4MzZiYTMuLjBmNjU4YjNiN2JjNGNkMzgxOTM2Y2ZhZjZhZmNl
NTZkNTQyNzlkYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v
QXVkaW9Db250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRp
b0NvbnRleHQuaApAQCAtMTMwLDYgKzEzMCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBzaG91bGRP
dmVycmlkZUJhY2tncm91bmRQbGF5YmFja1Jlc3RyaWN0aW9uKFBsYXRmb3JtTWVkaWFTZXNzaW9u
OjpJbnRlcnJ1cHRpb25UeXBlKSBjb25zdCBmaW5hbCB7IHJldHVybiBmYWxzZTsgfQogICAgIGJv
b2wgY2FuUHJvZHVjZUF1ZGlvKCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfQogICAgIGJv
b2wgaXNTdXNwZW5kZWQoKSBjb25zdCBmaW5hbDsKKyAgICBib29sIGlzUGxheWluZygpIGNvbnN0
IGZpbmFsOwogICAgIE1lZGlhU2Vzc2lvbkdyb3VwSWRlbnRpZmllciBtZWRpYVNlc3Npb25Hcm91
cElkZW50aWZpZXIoKSBjb25zdCBmaW5hbDsKIAogICAgIC8vIE1lZGlhQ2FuU3RhcnRMaXN0ZW5l
ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oIGIv
U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggMTE3NmU2NzRmNmYy
NTliMWEyOWU1ODFlZGNlNWE4ZTg2ZDcyMGZjZi4uZmRlODRkZmE1OGQxZWE4ZmRmMTI3NjEyZWQy
MjgwYTllZTQzOTdjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF
bGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKQEAg
LTQ1Nyw3ICs0NTcsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQg
Y2xlYXJNZWRpYUNhY2hlRm9yT3JpZ2lucyhjb25zdCBTdHJpbmcmLCBjb25zdCBIYXNoU2V0PFNl
Y3VyaXR5T3JpZ2luRGF0YT4mKTsKICAgICBzdGF0aWMgdm9pZCByZXNldE1lZGlhRW5naW5lcygp
OwogCi0gICAgYm9vbCBpc1BsYXlpbmcoKSBjb25zdCB7IHJldHVybiBtX3BsYXlpbmc7IH0KKyAg
ICBib29sIGlzUGxheWluZygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1fcGxheWluZzsgfQogCiAj
aWYgRU5BQkxFKFdFQl9BVURJTykKICAgICBNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGUqIGF1
ZGlvU291cmNlTm9kZSgpIHsgcmV0dXJuIG1fYXVkaW9Tb3VyY2VOb2RlOyB9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAK
aW5kZXggMzliMjg4ZDRjZDZiOGJlODRkZmIzNTMxY2ZlMjcxZDNjY2U1MjAwZS4uZDM3NGM4MmMy
NTBjMTJhMzcyMGFmM2E1NjI0Zjc4Y2Q3YTljNTRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMzIyLDYg
KzMyMiwxMSBAQCBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc1N1c3BlbmRlZCgpIGNvbnN0
CiAgICAgcmV0dXJuIG1fY2xpZW50LmlzU3VzcGVuZGVkKCk7CiB9CiAKK2Jvb2wgUGxhdGZvcm1N
ZWRpYVNlc3Npb246OmlzUGxheWluZygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY2xpZW50Lmlz
UGxheWluZygpOworfQorCiBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpzaG91bGRPdmVycmlk
ZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKSBjb25zdAogewogICAgIHJldHVybiBtX2Ns
aWVudC5zaG91bGRPdmVycmlkZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKTsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9u
LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5o
CmluZGV4IDY0NWFjNWIwNzNkNWQyODJjZmNlOThiNDI3NzU1Yjg1YmY2OTI5OTcuLjM2ZjNiN2Vj
ZGRjNGMyYTYyZWFiZWJjMTIzMzA1OTRlZDA2YmVmYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaApAQCAtMTU4LDYgKzE1
OCw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNIaWRkZW4oKSBjb25zdDsKICAgICBib29sIGlz
U3VzcGVuZGVkKCkgY29uc3Q7CisgICAgYm9vbCBpc1BsYXlpbmcoKSBjb25zdDsKIAogICAgIGJv
b2wgc2hvdWxkT3ZlcnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCkgY29uc3Q7CiAK
QEAgLTI1Miw2ICsyNTMsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuUHJvZHVj
ZUF1ZGlvKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTdXNw
ZW5kZWQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfTsKKyAgICB2aXJ0dWFsIGJvb2wgaXNQbGF5
aW5nKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH07CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxk
T3ZlcnJpZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbihQbGF0Zm9ybU1lZGlhU2Vzc2lv
bjo6SW50ZXJydXB0aW9uVHlwZSkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRP
dmVycmlkZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKSBjb25zdCB7IHJldHVybiBmYWxz
ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVk
aWFTZXNzaW9uTWFuYWdlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
Y29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCmluZGV4IGM5NjExYzNiMDZjM2NhZWYy
YmJiNDAxZjBjNWU3NzlmZmQ3ZjQ2NzMuLmU0ODFlNTllNDBkNzY3MGEzZDc1YzViNzE0MmZlMzI4
OGNjMjE2Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h
L01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KQEAgLTg2LDYgKzg2LDcg
QEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAg
ICAgaW50IHdlYkF1ZGlvQ291bnQgPSAwOwogICAgIGludCBjYXB0dXJlQ291bnQgPSBjb3VudEFj
dGl2ZUF1ZGlvQ2FwdHVyZVNvdXJjZXMoKTsKICAgICBib29sIGhhc0F1ZGlibGVBdWRpb09yVmlk
ZW9NZWRpYVR5cGUgPSBmYWxzZTsKKyAgICBib29sIGlzUGxheWluZ0F1ZGlvID0gZmFsc2U7CiAg
ICAgZm9yRWFjaFNlc3Npb24oWyZdIChhdXRvJiBzZXNzaW9uKSBtdXRhYmxlIHsKICAgICAgICAg
YXV0byB0eXBlID0gc2Vzc2lvbi5tZWRpYVR5cGUoKTsKICAgICAgICAgc3dpdGNoICh0eXBlKSB7
CkBAIC0xMDEsMTYgKzEwMiwxOSBAQCB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBk
YXRlU2Vzc2lvblN0YXRlKCkKICAgICAgICAgICAgICsrYXVkaW9Db3VudDsKICAgICAgICAgICAg
IGJyZWFrOwogICAgICAgICBjYXNlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6Oldl
YkF1ZGlvOgotICAgICAgICAgICAgaWYgKHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkpCisgICAg
ICAgICAgICBpZiAoc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSkgewogICAgICAgICAgICAgICAg
ICsrd2ViQXVkaW9Db3VudDsKKyAgICAgICAgICAgICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNz
aW9uLmlzUGxheWluZygpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAg
ICAgIH0KIAogICAgICAgICBpZiAoIWhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUpIHsK
LSAgICAgICAgICAgIGlmICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl
OjpWaWRlb0F1ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6
QXVkaW8pICYmIHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5oYXNQbGF5ZWRT
aW5jZUxhc3RJbnRlcnJ1cHRpb24oKSkKLSAgICAgICAgICAgICAgICBoYXNBdWRpYmxlQXVkaW9P
clZpZGVvTWVkaWFUeXBlID0gdHJ1ZTsKLSAgICAgICAgICAgIGlmIChzZXNzaW9uLmlzUGxheWlu
Z1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpKQorICAgICAgICAgICAgYm9vbCBpc1BvdGVudGlh
bGx5QXVkaWJsZSA9IHNlc3Npb24uaXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkg
fHwgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6OlZpZGVvQXVkaW8g
fHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpBdWRpbykgJiYgc2Vz
c2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSAmJiBzZXNzaW9uLmhhc1BsYXllZFNpbmNlTGFzdEludGVy
cnVwdGlvbigpKTsKKyAgICAgICAgICAgIGlmIChpc1BvdGVudGlhbGx5QXVkaWJsZSkgewogICAg
ICAgICAgICAgICAgIGhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUgPSB0cnVlOworICAg
ICAgICAgICAgICAgIGlzUGxheWluZ0F1ZGlvIHw9IHNlc3Npb24uaXNQbGF5aW5nKCk7CisgICAg
ICAgICAgICB9CiAgICAgICAgIH0KICAgICB9KTsKIApAQCAtMTQ2LDYgKzE1MCw5IEBAIHZvaWQg
TWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9uU3RhdGUoKQogICAgIH0gZWxz
ZSBpZiAod2ViQXVkaW9Db3VudCkKICAgICAgICAgY2F0ZWdvcnkgPSBBdWRpb1Nlc3Npb246OkNh
dGVnb3J5VHlwZTo6QW1iaWVudFNvdW5kOwogCisgICAgaWYgKEF1ZGlvU2Vzc2lvbjo6c2hhcmVk
U2Vzc2lvbigpLmNhdGVnb3J5KCkgPT0gQXVkaW9TZXNzaW9uOjpDYXRlZ29yeVR5cGU6OlBsYXlB
bmRSZWNvcmQgJiYgaXNQbGF5aW5nQXVkaW8pCisgICAgICAgIGNhdGVnb3J5ID0gQXVkaW9TZXNz
aW9uOjpDYXRlZ29yeVR5cGU6OlBsYXlBbmRSZWNvcmQ7CisKICAgICBBTFdBWVNfTE9HKExPR0lE
RU5USUZJRVIsICJzZXR0aW5nIGNhdGVnb3J5ID0gIiwgY2F0ZWdvcnksICIsIHBvbGljeSA9ICIs
IHBvbGljeSk7CiAgICAgQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9uKCkuc2V0Q2F0ZWdvcnko
Y2F0ZWdvcnksIHBvbGljeSk7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGZjZjhlMTkyNjJjNDE5NGU3ZmQ2M2VmMGMz
MzBjYzdmMDZmZDIyYy4uODJiNTY2MGQ0NDEzNjQyOTEzNjIwMWE5ZjMyZDk1NjZmZGMwNmJhNCAx
MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA4LTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u
QGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vzc2lvbiBjYXRlZ29yeSB0byBt
b3ZlIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvbyBxdWlja2x5CisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkzMjcKKyAgICAgICAgPHJkYXI6Ly84MTk5
NzAyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq
IGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5
Lmh0dHBzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9t
ZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbDogQWRkZWQu
CisKIDIwMjEtMDgtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg
ICAgIFNpZ25hbGluZyBzdGF0ZSBjaGVjayB3aGVuIGFwcGx5aW5nIGEgbG9jYWwgb3IgcmVtb3Rl
IGRlc2NyaXB0aW9uIGlzIG5vIGxvbmdlciBhbGlnbmVkIHdpdGggdGhlIFdlYlJUQyBzcGVjCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRp
by1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5o
dHRwcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDkxODg5MDI2OWQ2NjBkNjVhYzlhZjMwMmU3
MWNhOWU0MzFlYTkzMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv
bWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4cGVj
dGVkLnR4dApAQCAtMCwwICsxLDQgQEAKKworCitQQVNTIFZhbGlkYXRlIGF1ZGlvIHNlc3Npb24g
Y2F0ZWdvcnkgaXMgc2V0IHRvIFBsYXlBbmRSZWNvcmQgYWZ0ZXIgZnJhbWUgc3RvcHBlZCBjYXB0
dXJpbmcgYnV0IGNvbnRpbnVlZCBwbGF5aW5nIGF1ZGlvCisKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVn
b3J5Lmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVh
bS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFhNTYz
MWVmNjBhNGZlN2FmZDkwYTQ1MGQwMzExMmJlYTc3YTUzMDUKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFu
ZC1jYXRlZ29yeS5odHRwcy5odG1sCkBAIC0wLDAgKzEsNjEgQEAKKzwhRE9DVFlQRSBodG1sPgor
PGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQgc3JjPSIvcmVz
b3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2Vz
L3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHZpZGVv
IGlkPSJhdWRpbyIgYXV0b3BsYXkgcGxheXNJbmxpbmU+PC92aWRlbz4KKzxzY3JpcHQ+Cithc3lu
YyBmdW5jdGlvbiBuZWdvdGlhdGUocGMxLCBwYzIpCit7CisgICAgIHBjMS5vbmljZWNhbmRpZGF0
ZSA9IChldmVudCkgPT4geyBwYzIuYWRkSWNlQ2FuZGlkYXRlKGV2ZW50LmNhbmRpZGF0ZSkgfTsK
KyAgICAgcGMyLm9uaWNlY2FuZGlkYXRlID0gKGV2ZW50KSA9PiB7IHBjMS5hZGRJY2VDYW5kaWRh
dGUoZXZlbnQuY2FuZGlkYXRlKSB9OworCisgICAgIGNvbnN0IG9mZmVyID0gYXdhaXQgcGMxLmNy
ZWF0ZU9mZmVyKCk7CisgICAgIGF3YWl0IHBjMS5zZXRMb2NhbERlc2NyaXB0aW9uKG9mZmVyKTsK
KyAgICAgYXdhaXQgcGMyLnNldFJlbW90ZURlc2NyaXB0aW9uKG9mZmVyKTsKKyAgICAgY29uc3Qg
YW5zd2VyID0gYXdhaXQgcGMyLmNyZWF0ZUFuc3dlcigpOworICAgICBhd2FpdCBwYzIuc2V0TG9j
YWxEZXNjcmlwdGlvbihhbnN3ZXIpOworICAgICBhd2FpdCBwYzEuc2V0UmVtb3RlRGVzY3JpcHRp
b24oYW5zd2VyKTsKK30KKworcHJvbWlzZV90ZXN0KGFzeW5jICh0KSA9PiB7CisgICAgIGlmICgh
d2luZG93LmludGVybmFscykKKyAgICAgICAgcmV0dXJuIFByb21pc2UucmVqZWN0KCJUZXN0IHJl
cXVpcmUgaW50ZXJuYWxzIEFQSSIpOworCisgICAgIGNvbnN0IHN0cmVhbSA9IGF3YWl0IG5hdmln
YXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHthdWRpbzp0cnVlfSk7CisKKyAgICAgbGV0
IGNvdW50ZXIgPSAwOworICAgICB3aGlsZSAoKytjb3VudGVyIDwgMTAwICYmIGludGVybmFscy5h
dWRpb1Nlc3Npb25DYXRlZ29yeSgpICE9PSAiUGxheUFuZFJlY29yZCIpCisgICAgICAgICBhd2Fp
dCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICAg
YXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSwgIlBsYXlBbmRS
ZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBjYXB0dXJpbmciKTsKKworICAgICBjb25zdCBwYzEgPSBu
ZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKyAgICAgY29uc3QgcGMyID0gbmV3IFJUQ1BlZXJDb25u
ZWN0aW9uKCk7CisKKyAgICAgcGMxLmFkZFRyYWNrKHN0cmVhbS5nZXRBdWRpb1RyYWNrcygpWzBd
LCBzdHJlYW0pOworCisgICAgIGF3YWl0IG5lZ290aWF0ZShwYzEsIHBjMik7CisKKyAgICAgYXVk
aW8uc3JjT2JqZWN0ID0gbmV3IE1lZGlhU3RyZWFtKFtwYzIuZ2V0UmVjZWl2ZXJzKClbMF0udHJh
Y2tdKTsKKyAgICAgYXdhaXQgYXVkaW8ucGxheSgpOworCisgICAgIGFzc2VydF9lcXVhbHMoaW50
ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5
IHdoZW4gY2FwdHVyaW5nIik7CisKKyAgICAgc3RyZWFtLmdldEF1ZGlvVHJhY2tzKClbMF0uc3Rv
cCgpOworCisgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNv
bHZlLCAxMDApKTsKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0
ZWdvcnkoKSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBkb2N1bWVudCBkaWQgY2Fw
dHVyZSBidXQgaXMgbm90IGNhcHR1cmluZyBhbnltb3JlIik7CisKKyAgICAgYXVkaW8ucGF1c2Uo
KTsKKworICAgICBjb3VudGVyID0gMDsKKyAgICAgd2hpbGUgKCsrY291bnRlciA8IDEwMCAmJiBp
bnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSA9PT0gIlBsYXlBbmRSZWNvcmQiKQorICAg
ICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUw
KSk7CisgICAgIGFzc2VydF9ub3RfZXF1YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29y
eSgpLCAiUGxheUFuZFJlY29yZCIsICJjYXRlZ29yeSB3aGVuIGRvY3VtZW50IGRpZCBjYXB0dXJl
IGJ1dCBzdG9wcGVkIHBsYXlpbmcgYW55IGF1ZGlvIik7Cit9LCAiVmFsaWRhdGUgYXVkaW8gc2Vz
c2lvbiBjYXRlZ29yeSBpcyBzZXQgdG8gUGxheUFuZFJlY29yZCBhZnRlciBmcmFtZSBzdG9wcGVk
IGNhcHR1cmluZyBidXQgY29udGludWVkIHBsYXlpbmcgYXVkaW8iKTsKKzwvc2NyaXB0PgorPC9i
b2R5PgorPC9odG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435995</attachid>
            <date>2021-08-20 09:02:43 -0700</date>
            <delta_ts>2021-08-20 09:06:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820180241.patch</filename>
            <type>text/plain</type>
            <size>11842</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uYTFlMjhjNzI5MzdjYzRhMGZhOGJjNDM3NWJjM2Zl
Yjg3MTdhZDJmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSBmcm9tIG1vdmluZyBvdXQgb2YgUGxheUFuZFJlY29yZCB0b28gcXVpY2ts
eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzI3
CisgICAgICAgIDxyZGFyOi8vODE5OTcwMjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgSWYgY2F0ZWdvcnkgaXMgUGxheUFuZFJlY29yZCwgd2Ugc3Rp
Y2sgdG8gUGxheUFuZFJlY29yZCB1bnRpbCBhdWRpbyBpcyBubyBsb25nZXIgcGxheWluZyBhdCB3
aGljaCBwb2ludCB3ZQorICAgICAgICB0cmFuc2l0aW9uIHRvIHdoYXRldmVyIGNhdGVnb3J5IGlz
IG1vc3QgYXBwcm9wcmlhdGUuCisgICAgICAgIEludHJvZHVjZSBQbGF0Zm9ybU1lZGlhU2Vzc2lv
bjo6aXNQbGF5aW5nIGluIGFkZGl0aW9uIHRvIGNhblByb2R1Y2VBdWRpbyB0byBjb21wdXRlIHdo
ZXRoZXIgYXVkaW8gaXMgYmVpbmcgcGxheWVkLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMv
bWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwK
KworICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OkF1ZGlvQ29udGV4dDo6aXNQbGF5aW5nIGNvbnN0KToKKyAgICAgICAgKiBNb2R1
bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxl
bWVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc1BsYXlpbmcgY29u
c3QpOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmg6Cisg
ICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbkNsaWVudDo6aXNQbGF5aW5nIGNv
bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2Vy
Q29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVw
ZGF0ZVNlc3Npb25TdGF0ZSk6CisKIDIwMjEtMDgtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A
YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBSVENJY2VUcmFuc3BvcnQKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcAppbmRl
eCA0MmI5ZTkzYTZlMjVlNjU5NjRhZWI2MDQzMzY5ZGFhMWE2MTRhNGM2Li5kZmJkYmM3MmYzNmIw
ZDkwMDk4MDljNWE3MGE2ZmZhOWU1MWRiZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCkBAIC00ODUsNiArNDg1LDExIEBAIGJvb2wg
QXVkaW9Db250ZXh0Ojppc1N1c3BlbmRlZCgpIGNvbnN0CiAgICAgcmV0dXJuICFkb2N1bWVudCgp
IHx8IGRvY3VtZW50KCktPmFjdGl2ZURPTU9iamVjdHNBcmVTdXNwZW5kZWQoKSB8fCBkb2N1bWVu
dCgpLT5hY3RpdmVET01PYmplY3RzQXJlU3RvcHBlZCgpOwogfQogCitib29sIEF1ZGlvQ29udGV4
dDo6aXNQbGF5aW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGUoKSA9PSBTdGF0ZTo6UnVu
bmluZzsKK30KKwogdm9pZCBBdWRpb0NvbnRleHQ6OnBhZ2VNdXRlZFN0YXRlRGlkQ2hhbmdlKCkK
IHsKICAgICBpZiAoZG9jdW1lbnQoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCkpCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oIGIvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAppbmRleCA0MzM0NDUxOTk0
MWVlZDE3OWQyMmZjM2E1ZDg0ZDdmMWMwODM2YmEzLi4wZjY1OGIzYjdiYzRjZDM4MTkzNmNmYWY2
YWZjZTU2ZDU0Mjc5ZGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1
ZGlvL0F1ZGlvQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v
QXVkaW9Db250ZXh0LmgKQEAgLTEzMCw2ICsxMzAsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgc2hv
dWxkT3ZlcnJpZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbihQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6SW50ZXJydXB0aW9uVHlwZSkgY29uc3QgZmluYWwgeyByZXR1cm4gZmFsc2U7IH0KICAg
ICBib29sIGNhblByb2R1Y2VBdWRpbygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KICAg
ICBib29sIGlzU3VzcGVuZGVkKCkgY29uc3QgZmluYWw7CisgICAgYm9vbCBpc1BsYXlpbmcoKSBj
b25zdCBmaW5hbDsKICAgICBNZWRpYVNlc3Npb25Hcm91cElkZW50aWZpZXIgbWVkaWFTZXNzaW9u
R3JvdXBJZGVudGlmaWVyKCkgY29uc3QgZmluYWw7CiAKICAgICAvLyBNZWRpYUNhblN0YXJ0TGlz
dGVuZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu
aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDExNzZlNjc0
ZjZmMjU5YjFhMjllNTgxZWRjZTVhOGU4NmQ3MjBmY2YuLmZkZTg0ZGZhNThkMWVhOGZkZjEyNzYx
MmVkMjI4MGE5ZWU0Mzk3YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l
ZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o
CkBAIC00NTcsNyArNDU3LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2
b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiwgY29uc3QgSGFzaFNl
dDxTZWN1cml0eU9yaWdpbkRhdGE+Jik7CiAgICAgc3RhdGljIHZvaWQgcmVzZXRNZWRpYUVuZ2lu
ZXMoKTsKIAotICAgIGJvb2wgaXNQbGF5aW5nKCkgY29uc3QgeyByZXR1cm4gbV9wbGF5aW5nOyB9
CisgICAgYm9vbCBpc1BsYXlpbmcoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3BsYXlpbmc7IH0K
IAogI2lmIEVOQUJMRShXRUJfQVVESU8pCiAgICAgTWVkaWFFbGVtZW50QXVkaW9Tb3VyY2VOb2Rl
KiBhdWRpb1NvdXJjZU5vZGUoKSB7IHJldHVybiBtX2F1ZGlvU291cmNlTm9kZTsgfQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u
Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u
Y3BwCmluZGV4IDM5YjI4OGQ0Y2Q2YjhiZTg0ZGZiMzUzMWNmZTI3MWQzY2NlNTIwMGUuLmQzNzRj
ODJjMjUwYzEyYTM3MjBhZjNhNTYyNGY3OGNkN2E5YzU0YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKQEAgLTMy
Miw2ICszMjIsMTEgQEAgYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6aXNTdXNwZW5kZWQoKSBj
b25zdAogICAgIHJldHVybiBtX2NsaWVudC5pc1N1c3BlbmRlZCgpOwogfQogCitib29sIFBsYXRm
b3JtTWVkaWFTZXNzaW9uOjppc1BsYXlpbmcoKSBjb25zdAoreworICAgIHJldHVybiBtX2NsaWVu
dC5pc1BsYXlpbmcoKTsKK30KKwogYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6c2hvdWxkT3Zl
cnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4g
bV9jbGllbnQuc2hvdWxkT3ZlcnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCk7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vz
c2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Np
b24uaAppbmRleCA2NDVhYzViMDczZDVkMjgyY2ZjZTk4YjQyNzc1NWI4NWJmNjkyOTk3Li4zNmYz
YjdlY2RkYzRjMmE2MmVhYmViYzEyMzMwNTk0ZWQwNmJlZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKQEAgLTE1OCw2
ICsxNTgsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzSGlkZGVuKCkgY29uc3Q7CiAgICAgYm9v
bCBpc1N1c3BlbmRlZCgpIGNvbnN0OworICAgIGJvb2wgaXNQbGF5aW5nKCkgY29uc3Q7CiAKICAg
ICBib29sIHNob3VsZE92ZXJyaWRlQmFja2dyb3VuZExvYWRpbmdSZXN0cmljdGlvbigpIGNvbnN0
OwogCkBAIC0yNTIsNiArMjUzLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGNhblBy
b2R1Y2VBdWRpbygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlz
U3VzcGVuZGVkKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH07CisgICAgdmlydHVhbCBib29sIGlz
UGxheWluZygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9OwogCiAgICAgdmlydHVhbCBib29sIHNo
b3VsZE92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oUGxhdGZvcm1NZWRpYVNl
c3Npb246OkludGVycnVwdGlvblR5cGUpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgc2hv
dWxkT3ZlcnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCkgY29uc3QgeyByZXR1cm4g
ZmFsc2U7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h
L01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1
ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQppbmRleCBjOTYxMWMzYjA2YzNj
YWVmMmJiYjQwMWYwYzVlNzc5ZmZkN2Y0NjczLi5lNDgxZTU5ZTQwZDc2NzBhM2Q3NWM1YjcxNDJm
ZTMyODhjYzIxNmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9j
b2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCkBAIC04Niw2ICs4
Niw3IEBAIHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9uU3RhdGUo
KQogICAgIGludCB3ZWJBdWRpb0NvdW50ID0gMDsKICAgICBpbnQgY2FwdHVyZUNvdW50ID0gY291
bnRBY3RpdmVBdWRpb0NhcHR1cmVTb3VyY2VzKCk7CiAgICAgYm9vbCBoYXNBdWRpYmxlQXVkaW9P
clZpZGVvTWVkaWFUeXBlID0gZmFsc2U7CisgICAgYm9vbCBpc1BsYXlpbmdBdWRpbyA9IGZhbHNl
OwogICAgIGZvckVhY2hTZXNzaW9uKFsmXSAoYXV0byYgc2Vzc2lvbikgbXV0YWJsZSB7CiAgICAg
ICAgIGF1dG8gdHlwZSA9IHNlc3Npb24ubWVkaWFUeXBlKCk7CiAgICAgICAgIHN3aXRjaCAodHlw
ZSkgewpAQCAtMTAxLDE2ICsxMDIsMTkgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6
OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAgICAgICAgICAgICArK2F1ZGlvQ291bnQ7CiAgICAgICAg
ICAgICBicmVhazsKICAgICAgICAgY2FzZSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl
OjpXZWJBdWRpbzoKLSAgICAgICAgICAgIGlmIChzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpKQor
ICAgICAgICAgICAgaWYgKHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkpIHsKICAgICAgICAgICAg
ICAgICArK3dlYkF1ZGlvQ291bnQ7CisgICAgICAgICAgICAgICAgaXNQbGF5aW5nQXVkaW8gfD0g
c2Vzc2lvbi5pc1BsYXlpbmcoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwog
ICAgICAgICB9CiAKICAgICAgICAgaWYgKCFoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFUeXBl
KSB7Ci0gICAgICAgICAgICBpZiAoKHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlh
VHlwZTo6VmlkZW9BdWRpbyB8fCB0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5
cGU6OkF1ZGlvKSAmJiBzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpICYmIHNlc3Npb24uaGFzUGxh
eWVkU2luY2VMYXN0SW50ZXJydXB0aW9uKCkpCi0gICAgICAgICAgICAgICAgaGFzQXVkaWJsZUF1
ZGlvT3JWaWRlb01lZGlhVHlwZSA9IHRydWU7Ci0gICAgICAgICAgICBpZiAoc2Vzc2lvbi5pc1Bs
YXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSkKKyAgICAgICAgICAgIGJvb2wgaXNQb3Rl
bnRpYWxseUF1ZGlibGUgPSBzZXNzaW9uLmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1Rhcmdl
dCgpIHx8ICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpWaWRlb0F1
ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6QXVkaW8pICYm
IHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5oYXNQbGF5ZWRTaW5jZUxhc3RJ
bnRlcnJ1cHRpb24oKSk7CisgICAgICAgICAgICBpZiAoaXNQb3RlbnRpYWxseUF1ZGlibGUpIHsK
ICAgICAgICAgICAgICAgICBoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFUeXBlID0gdHJ1ZTsK
KyAgICAgICAgICAgICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNzaW9uLmlzUGxheWluZygpOwor
ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSk7CiAKQEAgLTE0Niw2ICsxNTAsOSBAQCB2
b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRlU2Vzc2lvblN0YXRlKCkKICAgICB9
IGVsc2UgaWYgKHdlYkF1ZGlvQ291bnQpCiAgICAgICAgIGNhdGVnb3J5ID0gQXVkaW9TZXNzaW9u
OjpDYXRlZ29yeVR5cGU6OkFtYmllbnRTb3VuZDsKIAorICAgIGlmIChBdWRpb1Nlc3Npb246OnNo
YXJlZFNlc3Npb24oKS5jYXRlZ29yeSgpID09IEF1ZGlvU2Vzc2lvbjo6Q2F0ZWdvcnlUeXBlOjpQ
bGF5QW5kUmVjb3JkICYmIGlzUGxheWluZ0F1ZGlvKQorICAgICAgICBjYXRlZ29yeSA9IEF1ZGlv
U2Vzc2lvbjo6Q2F0ZWdvcnlUeXBlOjpQbGF5QW5kUmVjb3JkOworCiAgICAgQUxXQVlTX0xPRyhM
T0dJREVOVElGSUVSLCAic2V0dGluZyBjYXRlZ29yeSA9ICIsIGNhdGVnb3J5LCAiLCBwb2xpY3kg
PSAiLCBwb2xpY3kpOwogICAgIEF1ZGlvU2Vzc2lvbjo6c2hhcmVkU2Vzc2lvbigpLnNldENhdGVn
b3J5KGNhdGVnb3J5LCBwb2xpY3kpOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl
TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRmY2Y4ZTE5MjYyYzQxOTRlN2ZkNjNl
ZjBjMzMwY2M3ZjA2ZmQyMmMuLjc4NTc5NDAwNWQzNTUwOWNlM2M5ODgzMDMwYzdlNGIxMzc2NWY5
ZTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wOC0yMCAgWW91ZW5uIEZhYmxldCAgPHlv
dWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgUHJldmVudCBBdWRpb1Nlc3Npb24gY2F0ZWdvcnkg
ZnJvbSBtb3Zpbmcgb3V0IG9mIFBsYXlBbmRSZWNvcmQgdG9vIHF1aWNrbHkKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTMyNworICAgICAgICA8cmRh
cjovLzgxOTk3MDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQt
Y2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz
L21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5odG1s
OiBBZGRlZC4KKwogMjAyMS0wOC0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+
CiAKICAgICAgICAgU2lnbmFsaW5nIHN0YXRlIGNoZWNrIHdoZW4gYXBwbHlpbmcgYSBsb2NhbCBv
ciByZW1vdGUgZGVzY3JpcHRpb24gaXMgbm8gbG9uZ2VyIGFsaWduZWQgd2l0aCB0aGUgV2ViUlRD
IHNwZWMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3Ry
ZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNh
dGVnb3J5Lmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wOTE4ODkwMjY5ZDY2MGQ2NWFj
OWFmMzAyZTcxY2E5ZTQzMWVhOTMwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0
cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorCisKK1BBU1MgVmFsaWRhdGUgYXVkaW8g
c2Vzc2lvbiBjYXRlZ29yeSBpcyBzZXQgdG8gUGxheUFuZFJlY29yZCBhZnRlciBmcmFtZSBzdG9w
cGVkIGNhcHR1cmluZyBidXQgY29udGludWVkIHBsYXlpbmcgYXVkaW8KKwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1h
bmQtY2F0ZWdvcnkuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVk
aWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uYWJlMDUzZjU0M2FjNDZhNTBiOTRjOTY5NzQzMWNmNDlkNmRlOTQ3OQotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNh
cHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwKQEAgLTAsMCArMSw2MiBAQAorPCFET0NUWVBF
IGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdCBz
cmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9y
ZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+
Cis8dmlkZW8gaWQ9ImF1ZGlvIiBhdXRvcGxheSBwbGF5c0lubGluZT48L3ZpZGVvPgorPHNjcmlw
dD4KK2FzeW5jIGZ1bmN0aW9uIG5lZ290aWF0ZShwYzEsIHBjMikKK3sKKyAgICAgcGMxLm9uaWNl
Y2FuZGlkYXRlID0gKGV2ZW50KSA9PiB7IHBjMi5hZGRJY2VDYW5kaWRhdGUoZXZlbnQuY2FuZGlk
YXRlKSB9OworICAgICBwYzIub25pY2VjYW5kaWRhdGUgPSAoZXZlbnQpID0+IHsgcGMxLmFkZElj
ZUNhbmRpZGF0ZShldmVudC5jYW5kaWRhdGUpIH07CisKKyAgICAgY29uc3Qgb2ZmZXIgPSBhd2Fp
dCBwYzEuY3JlYXRlT2ZmZXIoKTsKKyAgICAgYXdhaXQgcGMxLnNldExvY2FsRGVzY3JpcHRpb24o
b2ZmZXIpOworICAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3JpcHRpb24ob2ZmZXIpOworICAg
ICBjb25zdCBhbnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2VyKCk7CisgICAgIGF3YWl0IHBj
Mi5zZXRMb2NhbERlc2NyaXB0aW9uKGFuc3dlcik7CisgICAgIGF3YWl0IHBjMS5zZXRSZW1vdGVE
ZXNjcmlwdGlvbihhbnN3ZXIpOworfQorCitwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+IHsKKyAg
ICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICByZXR1cm4gUHJvbWlzZS5yZWplY3Qo
IlRlc3QgcmVxdWlyZSBpbnRlcm5hbHMgQVBJIik7CisgICAgIGludGVybmFscy5zZXR0aW5ncy5z
ZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSh0cnVlKTsKKworICAgICBjb25zdCBz
dHJlYW0gPSBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7YXVkaW86
dHJ1ZX0pOworCisgICAgIGxldCBjb3VudGVyID0gMDsKKyAgICAgd2hpbGUgKCsrY291bnRlciA8
IDEwMCAmJiBpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSAhPT0gIlBsYXlBbmRSZWNv
cmQiKQorICAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJl
c29sdmUsIDUwKSk7CisgICAgIGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNh
dGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdoZW4gc3RhcnRpbmcgdG8gY2Fw
dHVyZSIpOworCisgICAgIGNvbnN0IHBjMSA9IG5ldyBSVENQZWVyQ29ubmVjdGlvbigpOworICAg
ICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsKKworICAgICBwYzEuYWRkVHJh
Y2soc3RyZWFtLmdldEF1ZGlvVHJhY2tzKClbMF0sIHN0cmVhbSk7CisKKyAgICAgYXdhaXQgbmVn
b3RpYXRlKHBjMSwgcGMyKTsKKworICAgICBhdWRpby5zcmNPYmplY3QgPSBuZXcgTWVkaWFTdHJl
YW0oW3BjMi5nZXRSZWNlaXZlcnMoKVswXS50cmFja10pOworICAgICBhd2FpdCBhdWRpby5wbGF5
KCk7CisKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnko
KSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBjYXB0dXJpbmciKTsKKworICAgICBz
dHJlYW0uZ2V0QXVkaW9UcmFja3MoKVswXS5zdG9wKCk7CisKKyAgICAgYXdhaXQgbmV3IFByb21p
c2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDEwMCkpOworICAgICBhc3NlcnRfZXF1
YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29yeSgpLCAiUGxheUFuZFJlY29yZCIsICJj
YXRlZ29yeSB3aGVuIGRvY3VtZW50IGRpZCBjYXB0dXJlIGJ1dCBpcyBub3QgY2FwdHVyaW5nIGFu
eW1vcmUiKTsKKworICAgICBhdWRpby5wYXVzZSgpOworCisgICAgIGNvdW50ZXIgPSAwOworICAg
ICB3aGlsZSAoKytjb3VudGVyIDwgMTAwICYmIGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29y
eSgpID09PSAiUGxheUFuZFJlY29yZCIpCisgICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNv
bHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICAgYXNzZXJ0X25vdF9lcXVhbHMo
aW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVn
b3J5IHdoZW4gZG9jdW1lbnQgZGlkIGNhcHR1cmUgYnV0IHN0b3BwZWQgcGxheWluZyBhbnkgYXVk
aW8iKTsKK30sICJWYWxpZGF0ZSBhdWRpbyBzZXNzaW9uIGNhdGVnb3J5IGlzIHNldCB0byBQbGF5
QW5kUmVjb3JkIGFmdGVyIGZyYW1lIHN0b3BwZWQgY2FwdHVyaW5nIGJ1dCBjb250aW51ZWQgcGxh
eWluZyBhdWRpbyIpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>435996</attachid>
            <date>2021-08-20 09:06:33 -0700</date>
            <delta_ts>2021-08-20 10:57:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229327-20210820180632.patch</filename>
            <type>text/plain</type>
            <size>11860</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uYTFlMjhjNzI5MzdjYzRhMGZhOGJjNDM3NWJjM2Zl
Yjg3MTdhZDJmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSBmcm9tIG1vdmluZyBvdXQgb2YgUGxheUFuZFJlY29yZCB0b28gcXVpY2ts
eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzI3
CisgICAgICAgIDxyZGFyOi8vODE5OTcwMjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgSWYgY2F0ZWdvcnkgaXMgUGxheUFuZFJlY29yZCwgd2Ugc3Rp
Y2sgdG8gUGxheUFuZFJlY29yZCB1bnRpbCBhdWRpbyBpcyBubyBsb25nZXIgcGxheWluZyBhdCB3
aGljaCBwb2ludCB3ZQorICAgICAgICB0cmFuc2l0aW9uIHRvIHdoYXRldmVyIGNhdGVnb3J5IGlz
IG1vc3QgYXBwcm9wcmlhdGUuCisgICAgICAgIEludHJvZHVjZSBQbGF0Zm9ybU1lZGlhU2Vzc2lv
bjo6aXNQbGF5aW5nIGluIGFkZGl0aW9uIHRvIGNhblByb2R1Y2VBdWRpbyB0byBjb21wdXRlIHdo
ZXRoZXIgYXVkaW8gaXMgYmVpbmcgcGxheWVkLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMv
bWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwK
KworICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAg
KFdlYkNvcmU6OkF1ZGlvQ29udGV4dDo6aXNQbGF5aW5nIGNvbnN0KToKKyAgICAgICAgKiBNb2R1
bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxl
bWVudC5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNw
cDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc1BsYXlpbmcgY29u
c3QpOgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmg6Cisg
ICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbkNsaWVudDo6aXNQbGF5aW5nIGNv
bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2Vy
Q29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVw
ZGF0ZVNlc3Npb25TdGF0ZSk6CisKIDIwMjEtMDgtMTkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A
YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBSVENJY2VUcmFuc3BvcnQKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNw
cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcAppbmRl
eCA0MmI5ZTkzYTZlMjVlNjU5NjRhZWI2MDQzMzY5ZGFhMWE2MTRhNGM2Li5kZmJkYmM3MmYzNmIw
ZDkwMDk4MDljNWE3MGE2ZmZhOWU1MWRiZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N
b2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCkBAIC00ODUsNiArNDg1LDExIEBAIGJvb2wg
QXVkaW9Db250ZXh0Ojppc1N1c3BlbmRlZCgpIGNvbnN0CiAgICAgcmV0dXJuICFkb2N1bWVudCgp
IHx8IGRvY3VtZW50KCktPmFjdGl2ZURPTU9iamVjdHNBcmVTdXNwZW5kZWQoKSB8fCBkb2N1bWVu
dCgpLT5hY3RpdmVET01PYmplY3RzQXJlU3RvcHBlZCgpOwogfQogCitib29sIEF1ZGlvQ29udGV4
dDo6aXNQbGF5aW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGUoKSA9PSBTdGF0ZTo6UnVu
bmluZzsKK30KKwogdm9pZCBBdWRpb0NvbnRleHQ6OnBhZ2VNdXRlZFN0YXRlRGlkQ2hhbmdlKCkK
IHsKICAgICBpZiAoZG9jdW1lbnQoKSAmJiBkb2N1bWVudCgpLT5wYWdlKCkpCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oIGIvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAppbmRleCA0MzM0NDUxOTk0
MWVlZDE3OWQyMmZjM2E1ZDg0ZDdmMWMwODM2YmEzLi4wZjY1OGIzYjdiYzRjZDM4MTkzNmNmYWY2
YWZjZTU2ZDU0Mjc5ZGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1
ZGlvL0F1ZGlvQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v
QXVkaW9Db250ZXh0LmgKQEAgLTEzMCw2ICsxMzAsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgc2hv
dWxkT3ZlcnJpZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbihQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6SW50ZXJydXB0aW9uVHlwZSkgY29uc3QgZmluYWwgeyByZXR1cm4gZmFsc2U7IH0KICAg
ICBib29sIGNhblByb2R1Y2VBdWRpbygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KICAg
ICBib29sIGlzU3VzcGVuZGVkKCkgY29uc3QgZmluYWw7CisgICAgYm9vbCBpc1BsYXlpbmcoKSBj
b25zdCBmaW5hbDsKICAgICBNZWRpYVNlc3Npb25Hcm91cElkZW50aWZpZXIgbWVkaWFTZXNzaW9u
R3JvdXBJZGVudGlmaWVyKCkgY29uc3QgZmluYWw7CiAKICAgICAvLyBNZWRpYUNhblN0YXJ0TGlz
dGVuZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu
aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDExNzZlNjc0
ZjZmMjU5YjFhMjllNTgxZWRjZTVhOGU4NmQ3MjBmY2YuLmZkZTg0ZGZhNThkMWVhOGZkZjEyNzYx
MmVkMjI4MGE5ZWU0Mzk3YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l
ZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o
CkBAIC00NTcsNyArNDU3LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2
b2lkIGNsZWFyTWVkaWFDYWNoZUZvck9yaWdpbnMoY29uc3QgU3RyaW5nJiwgY29uc3QgSGFzaFNl
dDxTZWN1cml0eU9yaWdpbkRhdGE+Jik7CiAgICAgc3RhdGljIHZvaWQgcmVzZXRNZWRpYUVuZ2lu
ZXMoKTsKIAotICAgIGJvb2wgaXNQbGF5aW5nKCkgY29uc3QgeyByZXR1cm4gbV9wbGF5aW5nOyB9
CisgICAgYm9vbCBpc1BsYXlpbmcoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3BsYXlpbmc7IH0K
IAogI2lmIEVOQUJMRShXRUJfQVVESU8pCiAgICAgTWVkaWFFbGVtZW50QXVkaW9Tb3VyY2VOb2Rl
KiBhdWRpb1NvdXJjZU5vZGUoKSB7IHJldHVybiBtX2F1ZGlvU291cmNlTm9kZTsgfQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u
Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u
Y3BwCmluZGV4IDM5YjI4OGQ0Y2Q2YjhiZTg0ZGZiMzUzMWNmZTI3MWQzY2NlNTIwMGUuLmQzNzRj
ODJjMjUwYzEyYTM3MjBhZjNhNTYyNGY3OGNkN2E5YzU0YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKQEAgLTMy
Miw2ICszMjIsMTEgQEAgYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6aXNTdXNwZW5kZWQoKSBj
b25zdAogICAgIHJldHVybiBtX2NsaWVudC5pc1N1c3BlbmRlZCgpOwogfQogCitib29sIFBsYXRm
b3JtTWVkaWFTZXNzaW9uOjppc1BsYXlpbmcoKSBjb25zdAoreworICAgIHJldHVybiBtX2NsaWVu
dC5pc1BsYXlpbmcoKTsKK30KKwogYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6c2hvdWxkT3Zl
cnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCkgY29uc3QKIHsKICAgICByZXR1cm4g
bV9jbGllbnQuc2hvdWxkT3ZlcnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCk7CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vz
c2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Np
b24uaAppbmRleCA2NDVhYzViMDczZDVkMjgyY2ZjZTk4YjQyNzc1NWI4NWJmNjkyOTk3Li4zNmYz
YjdlY2RkYzRjMmE2MmVhYmViYzEyMzMwNTk0ZWQwNmJlZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKQEAgLTE1OCw2
ICsxNTgsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzSGlkZGVuKCkgY29uc3Q7CiAgICAgYm9v
bCBpc1N1c3BlbmRlZCgpIGNvbnN0OworICAgIGJvb2wgaXNQbGF5aW5nKCkgY29uc3Q7CiAKICAg
ICBib29sIHNob3VsZE92ZXJyaWRlQmFja2dyb3VuZExvYWRpbmdSZXN0cmljdGlvbigpIGNvbnN0
OwogCkBAIC0yNTIsNiArMjUzLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGNhblBy
b2R1Y2VBdWRpbygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlz
U3VzcGVuZGVkKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH07CisgICAgdmlydHVhbCBib29sIGlz
UGxheWluZygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9OwogCiAgICAgdmlydHVhbCBib29sIHNo
b3VsZE92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oUGxhdGZvcm1NZWRpYVNl
c3Npb246OkludGVycnVwdGlvblR5cGUpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgc2hv
dWxkT3ZlcnJpZGVCYWNrZ3JvdW5kTG9hZGluZ1Jlc3RyaWN0aW9uKCkgY29uc3QgeyByZXR1cm4g
ZmFsc2U7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h
L01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1
ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQppbmRleCBjOTYxMWMzYjA2YzNj
YWVmMmJiYjQwMWYwYzVlNzc5ZmZkN2Y0NjczLi4yZWQ5NmNkYWViOWVmNThkYmM4NTk0NDk5NzRk
ZmE0Njk4NmFjMGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9j
b2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCkBAIC04Niw2ICs4
Niw3IEBAIHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9uU3RhdGUo
KQogICAgIGludCB3ZWJBdWRpb0NvdW50ID0gMDsKICAgICBpbnQgY2FwdHVyZUNvdW50ID0gY291
bnRBY3RpdmVBdWRpb0NhcHR1cmVTb3VyY2VzKCk7CiAgICAgYm9vbCBoYXNBdWRpYmxlQXVkaW9P
clZpZGVvTWVkaWFUeXBlID0gZmFsc2U7CisgICAgYm9vbCBpc1BsYXlpbmdBdWRpbyA9IGZhbHNl
OwogICAgIGZvckVhY2hTZXNzaW9uKFsmXSAoYXV0byYgc2Vzc2lvbikgbXV0YWJsZSB7CiAgICAg
ICAgIGF1dG8gdHlwZSA9IHNlc3Npb24ubWVkaWFUeXBlKCk7CiAgICAgICAgIHN3aXRjaCAodHlw
ZSkgewpAQCAtMTAxLDE2ICsxMDIsMTkgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6
OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAgICAgICAgICAgICArK2F1ZGlvQ291bnQ7CiAgICAgICAg
ICAgICBicmVhazsKICAgICAgICAgY2FzZSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl
OjpXZWJBdWRpbzoKLSAgICAgICAgICAgIGlmIChzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpKQor
ICAgICAgICAgICAgaWYgKHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkpIHsKICAgICAgICAgICAg
ICAgICArK3dlYkF1ZGlvQ291bnQ7CisgICAgICAgICAgICAgICAgaXNQbGF5aW5nQXVkaW8gfD0g
c2Vzc2lvbi5pc1BsYXlpbmcoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwog
ICAgICAgICB9CiAKICAgICAgICAgaWYgKCFoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFUeXBl
KSB7Ci0gICAgICAgICAgICBpZiAoKHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlh
VHlwZTo6VmlkZW9BdWRpbyB8fCB0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5
cGU6OkF1ZGlvKSAmJiBzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpICYmIHNlc3Npb24uaGFzUGxh
eWVkU2luY2VMYXN0SW50ZXJydXB0aW9uKCkpCi0gICAgICAgICAgICAgICAgaGFzQXVkaWJsZUF1
ZGlvT3JWaWRlb01lZGlhVHlwZSA9IHRydWU7Ci0gICAgICAgICAgICBpZiAoc2Vzc2lvbi5pc1Bs
YXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSkKKyAgICAgICAgICAgIGJvb2wgaXNQb3Rl
bnRpYWxseUF1ZGlibGUgPSBzZXNzaW9uLmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1Rhcmdl
dCgpIHx8ICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpWaWRlb0F1
ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6QXVkaW8pICYm
IHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5oYXNQbGF5ZWRTaW5jZUxhc3RJ
bnRlcnJ1cHRpb24oKSk7CisgICAgICAgICAgICBpZiAoaXNQb3RlbnRpYWxseUF1ZGlibGUpIHsK
ICAgICAgICAgICAgICAgICBoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFUeXBlID0gdHJ1ZTsK
KyAgICAgICAgICAgICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNzaW9uLmlzUGxheWluZygpOwor
ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSk7CiAKQEAgLTEzOCw3ICsxNDIsNyBAQCB2
b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRlU2Vzc2lvblN0YXRlKCkKIAogICAg
IFJvdXRlU2hhcmluZ1BvbGljeSBwb2xpY3kgPSBSb3V0ZVNoYXJpbmdQb2xpY3k6OkRlZmF1bHQ7
CiAgICAgYXV0byBjYXRlZ29yeSA9IEF1ZGlvU2Vzc2lvbjo6Q2F0ZWdvcnlUeXBlOjpOb25lOwot
ICAgIGlmIChjYXB0dXJlQ291bnQpCisgICAgaWYgKGNhcHR1cmVDb3VudCB8fCAoaXNQbGF5aW5n
QXVkaW8gJiYgQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9uKCkuY2F0ZWdvcnkoKSA9PSBBdWRp
b1Nlc3Npb246OkNhdGVnb3J5VHlwZTo6UGxheUFuZFJlY29yZCkpCiAgICAgICAgIGNhdGVnb3J5
ID0gQXVkaW9TZXNzaW9uOjpDYXRlZ29yeVR5cGU6OlBsYXlBbmRSZWNvcmQ7CiAgICAgZWxzZSBp
ZiAoaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSkgewogICAgICAgICBjYXRlZ29yeSA9
IEF1ZGlvU2Vzc2lvbjo6Q2F0ZWdvcnlUeXBlOjpNZWRpYVBsYXliYWNrOwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRmY2Y4
ZTE5MjYyYzQxOTRlN2ZkNjNlZjBjMzMwY2M3ZjA2ZmQyMmMuLjc4NTc5NDAwNWQzNTUwOWNlM2M5
ODgzMDMwYzdlNGIxMzc2NWY5ZTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor
KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wOC0yMCAg
WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgUHJldmVudCBBdWRp
b1Nlc3Npb24gY2F0ZWdvcnkgZnJvbSBtb3Zpbmcgb3V0IG9mIFBsYXlBbmRSZWNvcmQgdG9vIHF1
aWNrbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
OTMyNworICAgICAgICA8cmRhcjovLzgxOTk3MDI0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P
Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0v
YXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg
ICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1j
YXRlZ29yeS5odHRwcy5odG1sOiBBZGRlZC4KKwogMjAyMS0wOC0xOSAgWW91ZW5uIEZhYmxldCAg
PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2lnbmFsaW5nIHN0YXRlIGNoZWNrIHdoZW4g
YXBwbHlpbmcgYSBsb2NhbCBvciByZW1vdGUgZGVzY3JpcHRpb24gaXMgbm8gbG9uZ2VyIGFsaWdu
ZWQgd2l0aCB0aGUgV2ViUlRDIHNwZWMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVz
dHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4
cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1
ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl
IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4w
OTE4ODkwMjY5ZDY2MGQ2NWFjOWFmMzAyZTcxY2E5ZTQzMWVhOTMwCi0tLSAvZGV2L251bGwKKysr
IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVy
ZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorCisKK1BB
U1MgVmFsaWRhdGUgYXVkaW8gc2Vzc2lvbiBjYXRlZ29yeSBpcyBzZXQgdG8gUGxheUFuZFJlY29y
ZCBhZnRlciBmcmFtZSBzdG9wcGVkIGNhcHR1cmluZyBidXQgY29udGludWVkIHBsYXlpbmcgYXVk
aW8KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJl
YW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0
dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0
dHBzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMC4uYWJlMDUzZjU0M2FjNDZhNTBiOTRjOTY5NzQzMWNmNDlkNmRl
OTQ3OQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvbWVk
aWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVnb3J5Lmh0dHBzLmh0bWwKQEAgLTAsMCAr
MSw2MiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0i
dXRmLTgiPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0
PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0
PgorPC9oZWFkPgorPGJvZHk+Cis8dmlkZW8gaWQ9ImF1ZGlvIiBhdXRvcGxheSBwbGF5c0lubGlu
ZT48L3ZpZGVvPgorPHNjcmlwdD4KK2FzeW5jIGZ1bmN0aW9uIG5lZ290aWF0ZShwYzEsIHBjMikK
K3sKKyAgICAgcGMxLm9uaWNlY2FuZGlkYXRlID0gKGV2ZW50KSA9PiB7IHBjMi5hZGRJY2VDYW5k
aWRhdGUoZXZlbnQuY2FuZGlkYXRlKSB9OworICAgICBwYzIub25pY2VjYW5kaWRhdGUgPSAoZXZl
bnQpID0+IHsgcGMxLmFkZEljZUNhbmRpZGF0ZShldmVudC5jYW5kaWRhdGUpIH07CisKKyAgICAg
Y29uc3Qgb2ZmZXIgPSBhd2FpdCBwYzEuY3JlYXRlT2ZmZXIoKTsKKyAgICAgYXdhaXQgcGMxLnNl
dExvY2FsRGVzY3JpcHRpb24ob2ZmZXIpOworICAgICBhd2FpdCBwYzIuc2V0UmVtb3RlRGVzY3Jp
cHRpb24ob2ZmZXIpOworICAgICBjb25zdCBhbnN3ZXIgPSBhd2FpdCBwYzIuY3JlYXRlQW5zd2Vy
KCk7CisgICAgIGF3YWl0IHBjMi5zZXRMb2NhbERlc2NyaXB0aW9uKGFuc3dlcik7CisgICAgIGF3
YWl0IHBjMS5zZXRSZW1vdGVEZXNjcmlwdGlvbihhbnN3ZXIpOworfQorCitwcm9taXNlX3Rlc3Qo
YXN5bmMgKHQpID0+IHsKKyAgICAgaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICByZXR1
cm4gUHJvbWlzZS5yZWplY3QoIlRlc3QgcmVxdWlyZSBpbnRlcm5hbHMgQVBJIik7CisgICAgIGlu
dGVybmFscy5zZXR0aW5ncy5zZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSh0cnVl
KTsKKworICAgICBjb25zdCBzdHJlYW0gPSBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdl
dFVzZXJNZWRpYSh7YXVkaW86dHJ1ZX0pOworCisgICAgIGxldCBjb3VudGVyID0gMDsKKyAgICAg
d2hpbGUgKCsrY291bnRlciA8IDEwMCAmJiBpbnRlcm5hbHMuYXVkaW9TZXNzaW9uQ2F0ZWdvcnko
KSAhPT0gIlBsYXlBbmRSZWNvcmQiKQorICAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2
ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisgICAgIGFzc2VydF9lcXVhbHMoaW50ZXJu
YWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdo
ZW4gc3RhcnRpbmcgdG8gY2FwdHVyZSIpOworCisgICAgIGNvbnN0IHBjMSA9IG5ldyBSVENQZWVy
Q29ubmVjdGlvbigpOworICAgICBjb25zdCBwYzIgPSBuZXcgUlRDUGVlckNvbm5lY3Rpb24oKTsK
KworICAgICBwYzEuYWRkVHJhY2soc3RyZWFtLmdldEF1ZGlvVHJhY2tzKClbMF0sIHN0cmVhbSk7
CisKKyAgICAgYXdhaXQgbmVnb3RpYXRlKHBjMSwgcGMyKTsKKworICAgICBhdWRpby5zcmNPYmpl
Y3QgPSBuZXcgTWVkaWFTdHJlYW0oW3BjMi5nZXRSZWNlaXZlcnMoKVswXS50cmFja10pOworICAg
ICBhd2FpdCBhdWRpby5wbGF5KCk7CisKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMuYXVk
aW9TZXNzaW9uQ2F0ZWdvcnkoKSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBjYXB0
dXJpbmciKTsKKworICAgICBzdHJlYW0uZ2V0QXVkaW9UcmFja3MoKVswXS5zdG9wKCk7CisKKyAg
ICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDEwMCkp
OworICAgICBhc3NlcnRfZXF1YWxzKGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29yeSgpLCAi
UGxheUFuZFJlY29yZCIsICJjYXRlZ29yeSB3aGVuIGRvY3VtZW50IGRpZCBjYXB0dXJlIGJ1dCBp
cyBub3QgY2FwdHVyaW5nIGFueW1vcmUiKTsKKworICAgICBhdWRpby5wYXVzZSgpOworCisgICAg
IGNvdW50ZXIgPSAwOworICAgICB3aGlsZSAoKytjb3VudGVyIDwgMTAwICYmIGludGVybmFscy5h
dWRpb1Nlc3Npb25DYXRlZ29yeSgpID09PSAiUGxheUFuZFJlY29yZCIpCisgICAgICAgICBhd2Fp
dCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICAg
YXNzZXJ0X25vdF9lcXVhbHMoaW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5
QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdoZW4gZG9jdW1lbnQgZGlkIGNhcHR1cmUgYnV0IHN0b3Bw
ZWQgcGxheWluZyBhbnkgYXVkaW8iKTsKK30sICJWYWxpZGF0ZSBhdWRpbyBzZXNzaW9uIGNhdGVn
b3J5IGlzIHNldCB0byBQbGF5QW5kUmVjb3JkIGFmdGVyIGZyYW1lIHN0b3BwZWQgY2FwdHVyaW5n
IGJ1dCBjb250aW51ZWQgcGxheWluZyBhdWRpbyIpOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0
bWw+Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436008</attachid>
            <date>2021-08-20 10:57:19 -0700</date>
            <delta_ts>2021-08-21 00:01:31 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-229327-20210820195718.patch</filename>
            <type>text/plain</type>
            <size>11986</size>
            <attacher name="youenn fablet">youennf</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQ3MTkyZThjNWIzYmZk
OTMwMjU0OTBmMDgyM2FkY2FjZDhkZWY1Zi4uOTNkY2QzMDM5ODFkODcxODdiNDUyNDc5YmY1NTE5
ODZkN2NkOWJhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA4LTIwICBZb3Vl
bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IEF1ZGlvU2Vz
c2lvbiBjYXRlZ29yeSBmcm9tIG1vdmluZyBvdXQgb2YgUGxheUFuZFJlY29yZCB0b28gcXVpY2ts
eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzI3
CisgICAgICAgIDxyZGFyOi8vODE5OTcwMjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBD
YXJsc29uLgorCisgICAgICAgIElmIGNhdGVnb3J5IGlzIFBsYXlBbmRSZWNvcmQsIHdlIHN0aWNr
IHRvIFBsYXlBbmRSZWNvcmQgdW50aWwgYXVkaW8gaXMgbm8gbG9uZ2VyIHBsYXlpbmcgYXQgd2hp
Y2ggcG9pbnQgd2UKKyAgICAgICAgdHJhbnNpdGlvbiB0byB3aGF0ZXZlciBjYXRlZ29yeSBpcyBt
b3N0IGFwcHJvcHJpYXRlLgorICAgICAgICBJbnRyb2R1Y2UgUGxhdGZvcm1NZWRpYVNlc3Npb246
OmlzUGxheWluZyBpbiBhZGRpdGlvbiB0byBjYW5Qcm9kdWNlQXVkaW8gdG8gY29tcHV0ZSB3aGV0
aGVyIGF1ZGlvIGlzIGJlaW5nIHBsYXllZC4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL21l
ZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5odG1sCisK
KyAgICAgICAgKiBNb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpBdWRpb0NvbnRleHQ6OmlzUGxheWluZyBjb25zdCk6CisgICAgICAgICogTW9kdWxl
cy93ZWJhdWRpby9BdWRpb0NvbnRleHQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1l
bnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6aXNQbGF5aW5nIGNvbnN0
KToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oOgorICAg
ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb25DbGllbnQ6OmlzUGxheWluZyBjb25z
dCk6CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNv
Y29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRh
dGVTZXNzaW9uU3RhdGUpOgorCiAyMDIxLTA4LTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw
cGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgUlRDSWNlVHJhbnNwb3J0CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAg
Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAKaW5kZXgg
NDJiOWU5M2E2ZTI1ZTY1OTY0YWViNjA0MzM2OWRhYTFhNjE0YTRjNi4uZGZiZGJjNzJmMzZiMGQ5
MDA5ODA5YzVhNzBhNmZmYTllNTFkYmU0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcApAQCAtNDg1LDYgKzQ4NSwxMSBAQCBib29sIEF1
ZGlvQ29udGV4dDo6aXNTdXNwZW5kZWQoKSBjb25zdAogICAgIHJldHVybiAhZG9jdW1lbnQoKSB8
fCBkb2N1bWVudCgpLT5hY3RpdmVET01PYmplY3RzQXJlU3VzcGVuZGVkKCkgfHwgZG9jdW1lbnQo
KS0+YWN0aXZlRE9NT2JqZWN0c0FyZVN0b3BwZWQoKTsKIH0KIAorYm9vbCBBdWRpb0NvbnRleHQ6
OmlzUGxheWluZygpIGNvbnN0Cit7CisgICAgcmV0dXJuIHN0YXRlKCkgPT0gU3RhdGU6OlJ1bm5p
bmc7Cit9CisKIHZvaWQgQXVkaW9Db250ZXh0OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgpCiB7
CiAgICAgaWYgKGRvY3VtZW50KCkgJiYgZG9jdW1lbnQoKS0+cGFnZSgpKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuaCBiL1NvdXJjZS9X
ZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmgKaW5kZXggNDMzNDQ1MTk5NDFl
ZWQxNzlkMjJmYzNhNWQ4NGQ3ZjFjMDgzNmJhMy4uMGY2NThiM2I3YmM0Y2QzODE5MzZjZmFmNmFm
Y2U1NmQ1NDI3OWRiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp
by9BdWRpb0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1
ZGlvQ29udGV4dC5oCkBAIC0xMzAsNiArMTMwLDcgQEAgcHJpdmF0ZToKICAgICBib29sIHNob3Vs
ZE92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oUGxhdGZvcm1NZWRpYVNlc3Np
b246OkludGVycnVwdGlvblR5cGUpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg
Ym9vbCBjYW5Qcm9kdWNlQXVkaW8oKSBjb25zdCBmaW5hbCB7IHJldHVybiB0cnVlOyB9CiAgICAg
Ym9vbCBpc1N1c3BlbmRlZCgpIGNvbnN0IGZpbmFsOworICAgIGJvb2wgaXNQbGF5aW5nKCkgY29u
c3QgZmluYWw7CiAgICAgTWVkaWFTZXNzaW9uR3JvdXBJZGVudGlmaWVyIG1lZGlhU2Vzc2lvbkdy
b3VwSWRlbnRpZmllcigpIGNvbnN0IGZpbmFsOwogCiAgICAgLy8gTWVkaWFDYW5TdGFydExpc3Rl
bmVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmgg
Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCAxMTc2ZTY3NGY2
ZjI1OWIxYTI5ZTU4MWVkY2U1YThlODZkNzIwZmNmLi5mZGU4NGRmYTU4ZDFlYThmZGYxMjc2MTJl
ZDIyODBhOWVlNDM5N2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp
YUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaApA
QCAtNDU3LDcgKzQ1Nyw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgdm9p
ZCBjbGVhck1lZGlhQ2FjaGVGb3JPcmlnaW5zKGNvbnN0IFN0cmluZyYsIGNvbnN0IEhhc2hTZXQ8
U2VjdXJpdHlPcmlnaW5EYXRhPiYpOwogICAgIHN0YXRpYyB2b2lkIHJlc2V0TWVkaWFFbmdpbmVz
KCk7CiAKLSAgICBib29sIGlzUGxheWluZygpIGNvbnN0IHsgcmV0dXJuIG1fcGxheWluZzsgfQor
ICAgIGJvb2wgaXNQbGF5aW5nKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9wbGF5aW5nOyB9CiAK
ICNpZiBFTkFCTEUoV0VCX0FVRElPKQogICAgIE1lZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZSog
YXVkaW9Tb3VyY2VOb2RlKCkgeyByZXR1cm4gbV9hdWRpb1NvdXJjZU5vZGU7IH0KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNw
cAppbmRleCAzOWIyODhkNGNkNmI4YmU4NGRmYjM1MzFjZmUyNzFkM2NjZTUyMDBlLi5kMzc0Yzgy
YzI1MGMxMmEzNzIwYWYzYTU2MjRmNzhjZDdhOWM1NGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCkBAIC0zMjIs
NiArMzIyLDExIEBAIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OmlzU3VzcGVuZGVkKCkgY29u
c3QKICAgICByZXR1cm4gbV9jbGllbnQuaXNTdXNwZW5kZWQoKTsKIH0KIAorYm9vbCBQbGF0Zm9y
bU1lZGlhU2Vzc2lvbjo6aXNQbGF5aW5nKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9jbGllbnQu
aXNQbGF5aW5nKCk7Cit9CisKIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OnNob3VsZE92ZXJy
aWRlQmFja2dyb3VuZExvYWRpbmdSZXN0cmljdGlvbigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1f
Y2xpZW50LnNob3VsZE92ZXJyaWRlQmFja2dyb3VuZExvYWRpbmdSZXN0cmljdGlvbigpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Np
b24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9u
LmgKaW5kZXggNjQ1YWM1YjA3M2Q1ZDI4MmNmY2U5OGI0Mjc3NTViODViZjY5Mjk5Ny4uMzZmM2I3
ZWNkZGM0YzJhNjJlYWJlYmMxMjMzMDU5NGVkMDZiZWZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCkBAIC0xNTgsNiAr
MTU4LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0hpZGRlbigpIGNvbnN0OwogICAgIGJvb2wg
aXNTdXNwZW5kZWQoKSBjb25zdDsKKyAgICBib29sIGlzUGxheWluZygpIGNvbnN0OwogCiAgICAg
Ym9vbCBzaG91bGRPdmVycmlkZUJhY2tncm91bmRMb2FkaW5nUmVzdHJpY3Rpb24oKSBjb25zdDsK
IApAQCAtMjUyLDYgKzI1Myw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBjYW5Qcm9k
dWNlQXVkaW8oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1N1
c3BlbmRlZCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9OworICAgIHZpcnR1YWwgYm9vbCBpc1Bs
YXlpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfTsKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91
bGRPdmVycmlkZUJhY2tncm91bmRQbGF5YmFja1Jlc3RyaWN0aW9uKFBsYXRmb3JtTWVkaWFTZXNz
aW9uOjpJbnRlcnJ1cHRpb25UeXBlKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBib29sIHNob3Vs
ZE92ZXJyaWRlQmFja2dyb3VuZExvYWRpbmdSZXN0cmljdGlvbigpIGNvbnN0IHsgcmV0dXJuIGZh
bHNlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9N
ZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp
by9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KaW5kZXggYzk2MTFjM2IwNmMzY2Fl
ZjJiYmI0MDFmMGM1ZTc3OWZmZDdmNDY3My4uMmVkOTZjZGFlYjllZjU4ZGJjODU5NDQ5OTc0ZGZh
NDY5ODZhYzBlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29j
b2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQpAQCAtODYsNiArODYs
NyBAQCB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRlU2Vzc2lvblN0YXRlKCkK
ICAgICBpbnQgd2ViQXVkaW9Db3VudCA9IDA7CiAgICAgaW50IGNhcHR1cmVDb3VudCA9IGNvdW50
QWN0aXZlQXVkaW9DYXB0dXJlU291cmNlcygpOwogICAgIGJvb2wgaGFzQXVkaWJsZUF1ZGlvT3JW
aWRlb01lZGlhVHlwZSA9IGZhbHNlOworICAgIGJvb2wgaXNQbGF5aW5nQXVkaW8gPSBmYWxzZTsK
ICAgICBmb3JFYWNoU2Vzc2lvbihbJl0gKGF1dG8mIHNlc3Npb24pIG11dGFibGUgewogICAgICAg
ICBhdXRvIHR5cGUgPSBzZXNzaW9uLm1lZGlhVHlwZSgpOwogICAgICAgICBzd2l0Y2ggKHR5cGUp
IHsKQEAgLTEwMSwxNiArMTAyLDE5IEBAIHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1
cGRhdGVTZXNzaW9uU3RhdGUoKQogICAgICAgICAgICAgKythdWRpb0NvdW50OwogICAgICAgICAg
ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6
V2ViQXVkaW86Ci0gICAgICAgICAgICBpZiAoc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSkKKyAg
ICAgICAgICAgIGlmIChzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpKSB7CiAgICAgICAgICAgICAg
ICAgKyt3ZWJBdWRpb0NvdW50OworICAgICAgICAgICAgICAgIGlzUGxheWluZ0F1ZGlvIHw9IHNl
c3Npb24uaXNQbGF5aW5nKCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAg
ICAgICAgfQogCiAgICAgICAgIGlmICghaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSkg
ewotICAgICAgICAgICAgaWYgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5
cGU6OlZpZGVvQXVkaW8gfHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl
OjpBdWRpbykgJiYgc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSAmJiBzZXNzaW9uLmhhc1BsYXll
ZFNpbmNlTGFzdEludGVycnVwdGlvbigpKQotICAgICAgICAgICAgICAgIGhhc0F1ZGlibGVBdWRp
b09yVmlkZW9NZWRpYVR5cGUgPSB0cnVlOwotICAgICAgICAgICAgaWYgKHNlc3Npb24uaXNQbGF5
aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkpCisgICAgICAgICAgICBib29sIGlzUG90ZW50
aWFsbHlBdWRpYmxlID0gc2Vzc2lvbi5pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQo
KSB8fCAoKHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6VmlkZW9BdWRp
byB8fCB0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6OkF1ZGlvKSAmJiBz
ZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpICYmIHNlc3Npb24uaGFzUGxheWVkU2luY2VMYXN0SW50
ZXJydXB0aW9uKCkpOworICAgICAgICAgICAgaWYgKGlzUG90ZW50aWFsbHlBdWRpYmxlKSB7CiAg
ICAgICAgICAgICAgICAgaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSA9IHRydWU7Cisg
ICAgICAgICAgICAgICAgaXNQbGF5aW5nQXVkaW8gfD0gc2Vzc2lvbi5pc1BsYXlpbmcoKTsKKyAg
ICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0pOwogCkBAIC0xMzgsNyArMTQyLDcgQEAgdm9p
ZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAKICAgICBS
b3V0ZVNoYXJpbmdQb2xpY3kgcG9saWN5ID0gUm91dGVTaGFyaW5nUG9saWN5OjpEZWZhdWx0Owog
ICAgIGF1dG8gY2F0ZWdvcnkgPSBBdWRpb1Nlc3Npb246OkNhdGVnb3J5VHlwZTo6Tm9uZTsKLSAg
ICBpZiAoY2FwdHVyZUNvdW50KQorICAgIGlmIChjYXB0dXJlQ291bnQgfHwgKGlzUGxheWluZ0F1
ZGlvICYmIEF1ZGlvU2Vzc2lvbjo6c2hhcmVkU2Vzc2lvbigpLmNhdGVnb3J5KCkgPT0gQXVkaW9T
ZXNzaW9uOjpDYXRlZ29yeVR5cGU6OlBsYXlBbmRSZWNvcmQpKQogICAgICAgICBjYXRlZ29yeSA9
IEF1ZGlvU2Vzc2lvbjo6Q2F0ZWdvcnlUeXBlOjpQbGF5QW5kUmVjb3JkOwogICAgIGVsc2UgaWYg
KGhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUpIHsKICAgICAgICAgY2F0ZWdvcnkgPSBB
dWRpb1Nlc3Npb246OkNhdGVnb3J5VHlwZTo6TWVkaWFQbGF5YmFjazsKZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZmNmOGUx
OTI2MmM0MTk0ZTdmZDYzZWYwYzMzMGNjN2YwNmZkMjJjLi40ZmRlZTEyYWU1Mzc2YWJhYzg1YmNj
YTBjMTc3YzczMGE5ZTdkNzU3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr
IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDgtMjAgIFlv
dWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFByZXZlbnQgQXVkaW9T
ZXNzaW9uIGNhdGVnb3J5IGZyb20gbW92aW5nIG91dCBvZiBQbGF5QW5kUmVjb3JkIHRvbyBxdWlj
a2x5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkz
MjcKKyAgICAgICAgPHJkYXI6Ly84MTk5NzAyND4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmlj
IENhcmxzb24uCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRp
by1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg
ICAqIGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtc3RyZWFtL2F1ZGlvLWNhcHR1cmUtYW5kLWNhdGVn
b3J5Lmh0dHBzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA4LTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91
ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTaWduYWxpbmcgc3RhdGUgY2hlY2sgd2hlbiBhcHBs
eWluZyBhIGxvY2FsIG9yIHJlbW90ZSBkZXNjcmlwdGlvbiBpcyBubyBsb25nZXIgYWxpZ25lZCB3
aXRoIHRoZSBXZWJSVEMgc3BlYwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9t
ZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0
ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8t
Y2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA5MTg4
OTAyNjlkNjYwZDY1YWM5YWYzMDJlNzFjYTllNDMxZWE5MzAKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9hdWRpby1jYXB0dXJlLWFu
ZC1jYXRlZ29yeS5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisKKworUEFTUyBW
YWxpZGF0ZSBhdWRpbyBzZXNzaW9uIGNhdGVnb3J5IGlzIHNldCB0byBQbGF5QW5kUmVjb3JkIGFm
dGVyIGZyYW1lIHN0b3BwZWQgY2FwdHVyaW5nIGJ1dCBjb250aW51ZWQgcGxheWluZyBhdWRpbwor
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL21lZGlhLXN0cmVhbS9h
dWRpby1jYXB0dXJlLWFuZC1jYXRlZ29yeS5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90
ZXN0cy9tZWRpYS9tZWRpYS1zdHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMu
aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwLi5mYjI2MjQyNDU2ZGFjNTMyNGFjZmVlNTIyYzdjYjJkNWRhMmI1Y2Ri
Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1z
dHJlYW0vYXVkaW8tY2FwdHVyZS1hbmQtY2F0ZWdvcnkuaHR0cHMuaHRtbApAQCAtMCwwICsxLDYz
IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYt
OCI+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8
c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8
L2hlYWQ+Cis8Ym9keT4KKzx2aWRlbyBpZD0iYXVkaW8iIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwv
dmlkZW8+Cis8c2NyaXB0PgorYXN5bmMgZnVuY3Rpb24gbmVnb3RpYXRlKHBjMSwgcGMyKQorewor
ICAgICBwYzEub25pY2VjYW5kaWRhdGUgPSAoZXZlbnQpID0+IHsgcGMyLmFkZEljZUNhbmRpZGF0
ZShldmVudC5jYW5kaWRhdGUpIH07CisgICAgIHBjMi5vbmljZWNhbmRpZGF0ZSA9IChldmVudCkg
PT4geyBwYzEuYWRkSWNlQ2FuZGlkYXRlKGV2ZW50LmNhbmRpZGF0ZSkgfTsKKworICAgICBjb25z
dCBvZmZlciA9IGF3YWl0IHBjMS5jcmVhdGVPZmZlcigpOworICAgICBhd2FpdCBwYzEuc2V0TG9j
YWxEZXNjcmlwdGlvbihvZmZlcik7CisgICAgIGF3YWl0IHBjMi5zZXRSZW1vdGVEZXNjcmlwdGlv
bihvZmZlcik7CisgICAgIGNvbnN0IGFuc3dlciA9IGF3YWl0IHBjMi5jcmVhdGVBbnN3ZXIoKTsK
KyAgICAgYXdhaXQgcGMyLnNldExvY2FsRGVzY3JpcHRpb24oYW5zd2VyKTsKKyAgICAgYXdhaXQg
cGMxLnNldFJlbW90ZURlc2NyaXB0aW9uKGFuc3dlcik7Cit9CisKK3Byb21pc2VfdGVzdChhc3lu
YyAodCkgPT4geworICAgICBpZiAoIXdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgIHJldHVybiBQ
cm9taXNlLnJlamVjdCgiVGVzdCByZXF1aXJlIGludGVybmFscyBBUEkiKTsKKyAgICAgaW50ZXJu
YWxzLnNldHRpbmdzLnNldFNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KHRydWUpOwor
CisgICAgIGNvbnN0IHN0cmVhbSA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNl
ck1lZGlhKHthdWRpbzp0cnVlfSk7CisKKyAgICAgbGV0IGNvdW50ZXIgPSAwOworICAgICB3aGls
ZSAoKytjb3VudGVyIDwgMTAwICYmIGludGVybmFscy5hdWRpb1Nlc3Npb25DYXRlZ29yeSgpICE9
PSAiUGxheUFuZFJlY29yZCIpCisgICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+
IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICAgYXNzZXJ0X2VxdWFscyhpbnRlcm5hbHMu
YXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBj
YXB0dXJpbmcgYW5kIG5vdCBwbGF5aW5nIGF1ZGlvIik7CisKKyAgICAgY29uc3QgcGMxID0gbmV3
IFJUQ1BlZXJDb25uZWN0aW9uKCk7CisgICAgIGNvbnN0IHBjMiA9IG5ldyBSVENQZWVyQ29ubmVj
dGlvbigpOworCisgICAgIHBjMS5hZGRUcmFjayhzdHJlYW0uZ2V0QXVkaW9UcmFja3MoKVswXSwg
c3RyZWFtKTsKKworICAgICBhd2FpdCBuZWdvdGlhdGUocGMxLCBwYzIpOworCisgICAgIC8vIFdl
IHBsYXkgdGhlIHJlbW90ZSB0cmFjaywgd2hpY2ggd2lsbCBzdGF5IGxpdmUgZXZlbiBpZiB0aGUg
bWljcm9waG9uZSB0cmFjayBnZXRzIHN0b3BwZWQuCisgICAgIGF1ZGlvLnNyY09iamVjdCA9IG5l
dyBNZWRpYVN0cmVhbShbcGMyLmdldFJlY2VpdmVycygpWzBdLnRyYWNrXSk7CisgICAgIGF3YWl0
IGF1ZGlvLnBsYXkoKTsKKworICAgICBhc3NlcnRfZXF1YWxzKGludGVybmFscy5hdWRpb1Nlc3Np
b25DYXRlZ29yeSgpLCAiUGxheUFuZFJlY29yZCIsICJjYXRlZ29yeSB3aGVuIGNhcHR1cmluZyBh
bmQgYXVkaW8gaXMgYmVpbmcgcGxheWVkIik7CisKKyAgICAgc3RyZWFtLmdldEF1ZGlvVHJhY2tz
KClbMF0uc3RvcCgpOworCisgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGlt
ZW91dChyZXNvbHZlLCAxMDAwKSk7CisgICAgIGFzc2VydF9lcXVhbHMoaW50ZXJuYWxzLmF1ZGlv
U2Vzc2lvbkNhdGVnb3J5KCksICJQbGF5QW5kUmVjb3JkIiwgImNhdGVnb3J5IHdoZW4gY2FwdHVy
ZSBoYXMgc3RvcHBlZCBidXQgYXVkaW8gY29udGluZXMgdG8gcGxheSIpOworCisgICAgIGF1ZGlv
LnBhdXNlKCk7CisKKyAgICAgY291bnRlciA9IDA7CisgICAgIHdoaWxlICgrK2NvdW50ZXIgPCAx
MDAgJiYgaW50ZXJuYWxzLmF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCkgPT09ICJQbGF5QW5kUmVjb3Jk
IikKKyAgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNv
bHZlLCA1MCkpOworICAgICBhc3NlcnRfbm90X2VxdWFscyhpbnRlcm5hbHMuYXVkaW9TZXNzaW9u
Q2F0ZWdvcnkoKSwgIlBsYXlBbmRSZWNvcmQiLCAiY2F0ZWdvcnkgd2hlbiBjYXB0dXJlIGhhcyBz
dG9wcGVkIGFuZCBhdWRpbyBzdG9wcGVkIHBsYXlpbmciKTsKK30sICJWYWxpZGF0ZSBhdWRpbyBz
ZXNzaW9uIGNhdGVnb3J5IGlzIHNldCB0byBQbGF5QW5kUmVjb3JkIGFmdGVyIGZyYW1lIHN0b3Bw
ZWQgY2FwdHVyaW5nIGJ1dCBjb250aW51ZWQgcGxheWluZyBhdWRpbyIpOworPC9zY3JpcHQ+Cis8
L2JvZHk+Cis8L2h0bWw+Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>