<?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>228708</bug_id>
          
          <creation_ts>2021-08-02 11:25:37 -0700</creation_ts>
          <short_desc>[App Privacy Report] Domains are deleted for ephemeral website data stores</short_desc>
          <delta_ts>2021-08-02 17:55:22 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</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="Kate Cheney">katherine_cheney</reporter>
          <assigned_to name="Kate Cheney">katherine_cheney</assigned_to>
          <cc>achristensen</cc>
    
    <cc>bfulgham</cc>
    
    <cc>jberlin</cc>
    
    <cc>mjs</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1781327</commentid>
    <comment_count>0</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 11:25:37 -0700</bug_when>
    <thetext>[App Privacy Report] Domains are deleted for ephemeral website data stores</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781339</commentid>
    <comment_count>1</comment_count>
      <attachid>434781</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 11:42:50 -0700</bug_when>
    <thetext>Created attachment 434781
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781388</commentid>
    <comment_count>2</comment_count>
      <attachid>434781</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 14:12:11 -0700</bug_when>
    <thetext>Comment on attachment 434781
Patch

Removing r flag, this should probably also fix the Safari Privacy Report case, which is basically an identical fix.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781411</commentid>
    <comment_count>3</comment_count>
      <attachid>434781</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-08-02 15:08:37 -0700</bug_when>
    <thetext>Comment on attachment 434781
Patch

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

&gt; Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1830
&gt; +    if (!dataStoreIsPersistent)

m_sessionID.isEphemeral()
Then you don&apos;t need to pass the redundant bool around.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781413</commentid>
    <comment_count>4</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 15:09:38 -0700</bug_when>
    <thetext>(In reply to Alex Christensen from comment #3)
&gt; Comment on attachment 434781 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=434781&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1830
&gt; &gt; +    if (!dataStoreIsPersistent)
&gt; 
&gt; m_sessionID.isEphemeral()
&gt; Then you don&apos;t need to pass the redundant bool around.

Will an ephemeral website data store automatically use an ephemeral session?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781415</commentid>
    <comment_count>5</comment_count>
      <attachid>434781</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-08-02 15:11:01 -0700</bug_when>
    <thetext>Comment on attachment 434781
Patch

Yes.  WebsiteDataStore::isPersistent() and NetworkSessionCocoa::m_sessionID.isEphemeral() are opposites, getting their information from the same place.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781437</commentid>
    <comment_count>6</comment_count>
      <attachid>434797</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 15:58:20 -0700</bug_when>
    <thetext>Created attachment 434797
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781438</commentid>
    <comment_count>7</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 15:58:30 -0700</bug_when>
    <thetext>(In reply to Alex Christensen from comment #5)
&gt; Comment on attachment 434781 [details]
&gt; Patch
&gt; 
&gt; Yes.  WebsiteDataStore::isPersistent() and
&gt; NetworkSessionCocoa::m_sessionID.isEphemeral() are opposites, getting their
&gt; information from the same place.

TIL.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781462</commentid>
    <comment_count>8</comment_count>
      <attachid>434797</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-08-02 16:50:46 -0700</bug_when>
    <thetext>Comment on attachment 434797
Patch

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

r=me

&gt; Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:1830
&gt; +    if (sessionID().isEphemeral()) {

Could you add a radar link where you requested SPI to add an automated test for this?
// FIXME: Add automated test for this once rdar://???????? is resolved.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781465</commentid>
    <comment_count>9</comment_count>
      <attachid>434802</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 16:56:42 -0700</bug_when>
    <thetext>Created attachment 434802
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781466</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-02 16:57:17 -0700</bug_when>
    <thetext>Tools/Scripts/svn-apply failed to apply attachment 434802 to trunk.
Please resolve the conflicts and upload a new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781467</commentid>
    <comment_count>11</comment_count>
      <attachid>434803</attachid>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 17:00:22 -0700</bug_when>
    <thetext>Created attachment 434803
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781470</commentid>
    <comment_count>12</comment_count>
      <attachid>434781</attachid>
    <who name="Maciej Stachowiak">mjs</who>
    <bug_when>2021-08-02 17:04:03 -0700</bug_when>
    <thetext>Comment on attachment 434781
Patch

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

&gt; Source/WebKit/ChangeLog:11
&gt; +        No new tests. Since this data is not stored in WebKit, we have no
&gt; +        way to test when it gets deleted or not. I tested manually and requested
&gt; +        an automated test at the correct networking layer.

Should we consider making a testing hook for this so that a layout test or API test is possible?

&gt; Source/WebKit/ChangeLog:17
&gt; +        Only clear App Privacy Report data if the website data store is
&gt; +        persistent. Safari calls the SPI to remove website data for ephemeral
&gt; +        data stores in some cases that are unrelated to a user clearing
&gt; +        website data or history and thus should not clear App Privacy Report
&gt; +        data.

Private browsing is also an ephemeral data store. With this change, would private browsing leave traces in the Privacy Report data store, or do we have some other way of avoiding that?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781472</commentid>
    <comment_count>13</comment_count>
    <who name="Maciej Stachowiak">mjs</who>
    <bug_when>2021-08-02 17:08:41 -0700</bug_when>
    <thetext>&lt;rdar://81282432&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781473</commentid>
    <comment_count>14</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-02 17:08:52 -0700</bug_when>
    <thetext>&lt;rdar://problem/81436158&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781474</commentid>
    <comment_count>15</comment_count>
    <who name="Kate Cheney">katherine_cheney</who>
    <bug_when>2021-08-02 17:09:00 -0700</bug_when>
    <thetext>(In reply to Maciej Stachowiak from comment #12)
&gt; Comment on attachment 434781 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=434781&amp;action=review
&gt; 
&gt; &gt; Source/WebKit/ChangeLog:11
&gt; &gt; +        No new tests. Since this data is not stored in WebKit, we have no
&gt; &gt; +        way to test when it gets deleted or not. I tested manually and requested
&gt; &gt; +        an automated test at the correct networking layer.
&gt; 
&gt; Should we consider making a testing hook for this so that a layout test or
&gt; API test is possible?

Yes, I requested this in the radar mentioned in the FIXME. The ideal would be SPI that let us test this directly.

&gt; 
&gt; &gt; Source/WebKit/ChangeLog:17
&gt; &gt; +        Only clear App Privacy Report data if the website data store is
&gt; &gt; +        persistent. Safari calls the SPI to remove website data for ephemeral
&gt; &gt; +        data stores in some cases that are unrelated to a user clearing
&gt; &gt; +        website data or history and thus should not clear App Privacy Report
&gt; &gt; +        data.
&gt; 
&gt; Private browsing is also an ephemeral data store. With this change, would
&gt; private browsing leave traces in the Privacy Report data store, or do we
&gt; have some other way of avoiding that?

Ephemeral sessions in full browsers (aka private browsing) do not log any information in the App Privacy Report. However, ephemeral sessions for non-browsers still log domains to prevent sidesteps of APR by using ephemeral sessions.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781475</commentid>
    <comment_count>16</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-08-02 17:09:10 -0700</bug_when>
    <thetext>&lt;rdar://problem/81436167&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1781490</commentid>
    <comment_count>17</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-02 17:55:21 -0700</bug_when>
    <thetext>Committed r280575 (240197@main): &lt;https://commits.webkit.org/240197@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434803.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434781</attachid>
            <date>2021-08-02 11:42:50 -0700</date>
            <delta_ts>2021-08-02 15:58:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228708-20210802114249.patch</filename>
            <type>text/plain</type>
            <size>18904</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFhM2JkNjU4MGI3YWIzMjNm
Y2U4MjMzMWZkZTZkYzhiMDAxOTg2NjUuLjY5MWYwNWM5ZGQ2NzM1ZjM0NWZkNDEwNmIzMzlkMGQ1
OTExMjhkNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjEtMDgtMDIgIEthdGUgQ2hl
bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgW0FwcCBQcml2YWN5
IFJlcG9ydF0gRG9tYWlucyBhcmUgZGVsZXRlZCBmb3IgZXBoZW1lcmFsIHdlYnNpdGUgZGF0YSBz
dG9yZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODcwOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEyODI0MzI+CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBTaW5jZSB0aGlz
IGRhdGEgaXMgbm90IHN0b3JlZCBpbiBXZWJLaXQsIHdlIGhhdmUgbm8KKyAgICAgICAgd2F5IHRv
IHRlc3Qgd2hlbiBpdCBnZXRzIGRlbGV0ZWQgb3Igbm90LiBJIHRlc3RlZCBtYW51YWxseSBhbmQg
cmVxdWVzdGVkCisgICAgICAgIGFuIGF1dG9tYXRlZCB0ZXN0IGF0IHRoZSBjb3JyZWN0IG5ldHdv
cmtpbmcgbGF5ZXIuCisKKyAgICAgICAgT25seSBjbGVhciBBcHAgUHJpdmFjeSBSZXBvcnQgZGF0
YSBpZiB0aGUgd2Vic2l0ZSBkYXRhIHN0b3JlIGlzCisgICAgICAgIHBlcnNpc3RlbnQuIFNhZmFy
aSBjYWxscyB0aGUgU1BJIHRvIHJlbW92ZSB3ZWJzaXRlIGRhdGEgZm9yIGVwaGVtZXJhbAorICAg
ICAgICBkYXRhIHN0b3JlcyBpbiBzb21lIGNhc2VzIHRoYXQgYXJlIHVucmVsYXRlZCB0byBhIHVz
ZXIgY2xlYXJpbmcKKyAgICAgICAgd2Vic2l0ZSBkYXRhIG9yIGhpc3RvcnkgYW5kIHRodXMgc2hv
dWxkIG5vdCBjbGVhciBBcHAgUHJpdmFjeSBSZXBvcnQKKyAgICAgICAgZGF0YS4KKworICAgICAg
ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6
TmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmV0
d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyk6CisgICAgICAgICogTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9O
ZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2Nv
YS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2Ev
TmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr
U2Vzc2lvbi5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbjo6cmVtb3ZlTmV0d29y
a1dlYnNpdGVEYXRhKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6cmVt
b3ZlTmV0d29ya1dlYnNpdGVEYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9OZXR3
b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94
eTo6ZGVsZXRlV2Vic2l0ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1By
b3h5OjpkZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9O
ZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0
ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRh
U3RvcmU6OnJlbW92ZURhdGEpOgorCiAyMDIxLTA3LTI5ICBQZW5nIExpdSAgPHBlbmcubGl1NkBh
cHBsZS5jb20+CiAKICAgICAgICAgVGhlIGJ1bmRsZSBwYXRoIG9mIGRvd25sZXZlbCBTYWZhcmkg
aXMgd3JvbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y
a1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz
cy5jcHAKaW5kZXggNDM2MDUwMmQxMDYxNzlmNjcyODk1OWNjZTMyY2Y2MDc2ZDExOTA3My4uODBh
YjAzOWRjYmQ3OGUzYzNhMDFjM2FjYjVlMDRiNzgwNmJkMmY3MiAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dl
YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTE1NTUsNyArMTU1NSw3
IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmZldGNoV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQg
c2Vzc2lvbklELCBPcHRpb25TZXQ8V2Vic2l0CiAjZW5kaWYKIH0KIAotdm9pZCBOZXR3b3JrUHJv
Y2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25T
ZXQ8V2Vic2l0ZURhdGFUeXBlPiB3ZWJzaXRlRGF0YVR5cGVzLCBXYWxsVGltZSBtb2RpZmllZFNp
bmNlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lk
IE5ldHdvcmtQcm9jZXNzOjpkZWxldGVXZWJzaXRlRGF0YShQQUw6OlNlc3Npb25JRCBzZXNzaW9u
SUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IHdlYnNpdGVEYXRhVHlwZXMsIFdhbGxUaW1l
IG1vZGlmaWVkU2luY2UsIGJvb2wgaXNQZXJzaXN0ZW50RGF0YVN0b3JlLCBDb21wbGV0aW9uSGFu
ZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAjaWYgUExBVEZPUk0oQ09DT0Ep
IHx8IFVTRShTT1VQKQogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVE
YXRhVHlwZTo6SFNUU0NhY2hlKSkKQEAgLTE2MTEsNyArMTYxMSw3IEBAIHZvaWQgTmV0d29ya1By
b2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9u
U2V0PFdlYnNpCiAjZW5kaWYKIAogICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IHRoaXMt
Pm5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkpCi0gICAgICAgIG5ldHdvcmtTZXNzaW9uLT5yZW1v
dmVOZXR3b3JrV2Vic2l0ZURhdGEobW9kaWZpZWRTaW5jZSwgc3RkOjpudWxsb3B0LCBbY2xlYXJU
YXNrc0hhbmRsZXJdIHsgfSk7CisgICAgICAgIG5ldHdvcmtTZXNzaW9uLT5yZW1vdmVOZXR3b3Jr
V2Vic2l0ZURhdGEobW9kaWZpZWRTaW5jZSwgc3RkOjpudWxsb3B0LCBpc1BlcnNpc3RlbnREYXRh
U3RvcmUsIFtjbGVhclRhc2tzSGFuZGxlcl0geyB9KTsKIAogICAgIGlmICh3ZWJzaXRlRGF0YVR5
cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6RGlza0NhY2hlKSAmJiAhc2Vzc2lvbklELmlz
RXBoZW1lcmFsKCkpCiAgICAgICAgIGNsZWFyRGlza0NhY2hlKG1vZGlmaWVkU2luY2UsIFtjbGVh
clRhc2tzSGFuZGxlciA9IFdURk1vdmUoY2xlYXJUYXNrc0hhbmRsZXIpXSB7IH0pOwpAQCAtMTY1
Myw3ICsxNjUzLDcgQEAgc3RhdGljIHZvaWQgY2xlYXJEaXNrQ2FjaGVFbnRyaWVzKE5ldHdvcmtD
YWNoZTo6Q2FjaGUqIGNhY2hlLCBjb25zdCBWZWN0b3I8U2VjdXIKICAgICB9KTsKIH0KIAotdm9p
ZCBOZXR3b3JrUHJvY2Vzczo6ZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lv
bklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBl
cywgY29uc3QgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4mIG9yaWdpbkRhdGFzLCBjb25zdCBW
ZWN0b3I8U3RyaW5nPiYgY29va2llSG9zdE5hbWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgSFNU
U0NhY2hlSG9zdE5hbWVzLCBjb25zdCBWZWN0b3I8UmVnaXN0cmFibGVEb21haW4+JiByZWdpc3Ry
YWJsZURvbWFpbnMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxl
cikKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OmRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyhQQUw6
OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IHdlYnNpdGVE
YXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JiBvcmlnaW5EYXRhcywg
Y29uc3QgVmVjdG9yPFN0cmluZz4mIGNvb2tpZUhvc3ROYW1lcywgY29uc3QgVmVjdG9yPFN0cmlu
Zz4mIEhTVFNDYWNoZUhvc3ROYW1lcywgY29uc3QgVmVjdG9yPFJlZ2lzdHJhYmxlRG9tYWluPiYg
cmVnaXN0cmFibGVEb21haW5zLCBib29sIGlzUGVyc2lzdGVudERhdGFTdG9yZSwgQ29tcGxldGlv
bkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGlmICh3ZWJzaXRl
RGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6Q29va2llcykpIHsKICAgICAgICAg
aWYgKGF1dG8qIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiA9IHN0b3JhZ2VTZXNzaW9uKHNlc3Npb25J
RCkpCkBAIC0xNzQ1LDcgKzE3NDUsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpkZWxldGVXZWJz
aXRlRGF0YUZvck9yaWdpbnMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpbwogICAgICAg
ICBmb3IgKGF1dG8mIGRvbWFpbiA6IHJlZ2lzdHJhYmxlRG9tYWlucykKICAgICAgICAgICAgIGRv
bWFpbnNUb0RlbGV0ZU5ldHdvcmtEYXRhRm9yLmFkZChkb21haW4pOwogCi0gICAgICAgIG5ldHdv
cmtTZXNzaW9uLT5yZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEoc3RkOjpudWxsb3B0LCBXVEZNb3Zl
KGRvbWFpbnNUb0RlbGV0ZU5ldHdvcmtEYXRhRm9yKSwgW2NsZWFyVGFza3NIYW5kbGVyXSB7IH0p
OworICAgICAgICBuZXR3b3JrU2Vzc2lvbi0+cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRhKHN0ZDo6
bnVsbG9wdCwgV1RGTW92ZShkb21haW5zVG9EZWxldGVOZXR3b3JrRGF0YUZvciksIGlzUGVyc2lz
dGVudERhdGFTdG9yZSwgW2NsZWFyVGFza3NIYW5kbGVyXSB7IH0pOwogICAgIH0KIH0KIApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oIGIv
U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCmluZGV4IGYwNmRh
ZDQ3MjliZGZiZWE3NTNmZjhjOTNhYTNlNzVhOWFkODhiMDMuLmYxNTdkNDI5YTkzNmRjZTRmZjZh
ZDUyNzUzZWE3Y2E0M2YwOTFiYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By
b2Nlc3MvTmV0d29ya1Byb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L05ldHdvcmtQcm9jZXNzLmgKQEAgLTQyNyw4ICs0MjcsOCBAQCBwcml2YXRlOgogICAgIHZvaWQg
Y3JlYXRlTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoV2ViQ29yZTo6UHJvY2Vzc0lkZW50
aWZpZXIsIFBBTDo6U2Vzc2lvbklELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKHN0ZDo6b3B0aW9u
YWw8SVBDOjpBdHRhY2htZW50PiYmLCBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5KT4m
Jik7CiAKICAgICB2b2lkIGZldGNoV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQsIE9wdGlvblNl
dDxXZWJzaXRlRGF0YVR5cGU+LCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4sIENv
bXBsZXRpb25IYW5kbGVyPHZvaWQoV2Vic2l0ZURhdGEmJik+JiYpOwotICAgIHZvaWQgZGVsZXRl
V2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+LCBX
YWxsVGltZSBtb2RpZmllZFNpbmNlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwotICAg
IHZvaWQgZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lvbklELCBPcHRpb25T
ZXQ8V2Vic2l0ZURhdGFUeXBlPiwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu
RGF0YT4mIG9yaWdpbnMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBjb29raWVIb3N0TmFtZXMsIGNv
bnN0IFZlY3RvcjxTdHJpbmc+JiBIU1RTQ2FjaGVIb3N0bmFtZXMsIGNvbnN0IFZlY3RvcjxSZWdp
c3RyYWJsZURvbWFpbj4mLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZvaWQg
ZGVsZXRlV2Vic2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5
cGU+LCBXYWxsVGltZSBtb2RpZmllZFNpbmNlLCBib29sLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk
KCk+JiYpOworICAgIHZvaWQgZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lv
bklELCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlNl
Y3VyaXR5T3JpZ2luRGF0YT4mIG9yaWdpbnMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBjb29raWVI
b3N0TmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBIU1RTQ2FjaGVIb3N0bmFtZXMsIGNvbnN0
IFZlY3RvcjxSZWdpc3RyYWJsZURvbWFpbj4mLCBib29sLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk
KCk+JiYpOwogCiAgICAgdm9pZCBjbGVhckNhY2hlZENyZWRlbnRpYWxzKFBBTDo6U2Vzc2lvbklE
KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzcy5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By
b2Nlc3MubWVzc2FnZXMuaW4KaW5kZXggZTA1ZjJlMzIwNTg0NzM3YjM0N2ZhYjIxYmY2YTJlNjk3
OWE4YzhjZS4uZGFmN2Y5MjE3ZGExMWNkODI1OWZhMGJkYTAxYzU4OGQwYjgxZGExOCAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdl
cy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1l
c3NhZ2VzLmluCkBAIC00Myw4ICs0Myw4IEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNzIExl
Z2FjeVJlY2VpdmVyIHsKICAgICBEZXN0cm95U2Vzc2lvbihQQUw6OlNlc3Npb25JRCBzZXNzaW9u
SUQpCiAKICAgICBGZXRjaFdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0
aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlPiB3ZWJzaXRlRGF0YVR5cGVzLCBPcHRpb25T
ZXQ8V2ViS2l0OjpXZWJzaXRlRGF0YUZldGNoT3B0aW9uPiBmZXRjaE9wdGlvbnMpIC0+IChzdHJ1
Y3QgV2ViS2l0OjpXZWJzaXRlRGF0YSB3ZWJzaXRlRGF0YSkgQXN5bmMKLSAgICBEZWxldGVXZWJz
aXRlRGF0YShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIE9wdGlvblNldDxXZWJLaXQ6OldlYnNp
dGVEYXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBlcywgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSkgLT4g
KCkgQXN5bmMKLSAgICBEZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMoUEFMOjpTZXNzaW9uSUQg
c2Vzc2lvbklELCBPcHRpb25TZXQ8V2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU+IHdlYnNpdGVEYXRh
VHlwZXMsIFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+IG9yaWdpbnMsIFZlY3Rv
cjxTdHJpbmc+IGNvb2tpZUhvc3ROYW1lcywgVmVjdG9yPFN0cmluZz4gSFNUU0NhY2hlSG9zdE5h
bWVzLCBWZWN0b3I8V2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4+IHJlZ2lzdHJhYmxlRG9tYWlu
cykgLT4gKCkgQXN5bmMKKyAgICBEZWxldGVXZWJzaXRlRGF0YShQQUw6OlNlc3Npb25JRCBzZXNz
aW9uSUQsIE9wdGlvblNldDxXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBl
cywgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSwgYm9vbCBpc1BlcnNpc3RlbnQpIC0+ICgpIEFzeW5j
CisgICAgRGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25J
RCwgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlPiB3ZWJzaXRlRGF0YVR5cGVzLCBW
ZWN0b3I8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhPiBvcmlnaW5zLCBWZWN0b3I8U3RyaW5n
PiBjb29raWVIb3N0TmFtZXMsIFZlY3RvcjxTdHJpbmc+IEhTVFNDYWNoZUhvc3ROYW1lcywgVmVj
dG9yPFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluPiByZWdpc3RyYWJsZURvbWFpbnMsIGJvb2wg
aXNQZXJzaXN0ZW50RGF0YVN0b3JlKSAtPiAoKSBBc3luYwogICAgIFJlbmFtZU9yaWdpbkluV2Vi
c2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBVUkwgb2xkRG9tYWluLCBVUkwgbmV3
RG9tYWluLCBPcHRpb25TZXQ8V2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU+IHdlYnNpdGVEYXRhVHlw
ZXMpIC0+ICgpIEFzeW5jCiAKICAgICBEb3dubG9hZFJlcXVlc3QoUEFMOjpTZXNzaW9uSUQgc2Vz
c2lvbklELCBXZWJLaXQ6OkRvd25sb2FkSUQgZG93bmxvYWRJRCwgV2ViQ29yZTo6UmVzb3VyY2VS
ZXF1ZXN0IHJlcXVlc3QsIGVudW06Ym9vbCBzdGQ6Om9wdGlvbmFsPFdlYktpdDo6TmF2aWdhdGlu
Z1RvQXBwQm91bmREb21haW4+IGlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW4sIFN0cmluZyBz
dWdnZXN0ZWRGaWxlbmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y
a1Nlc3Npb24uaAppbmRleCAwZGNmYjI3Y2MyZmE4NWQyNGZiM2I1MjBhNzUxNTkxZWUzMDEyMGU3
Li41NDkxMTVlZTEzNGRhNmI3ZTQxNmNjNWU2NjhmMTUzNDEyZDYwZmE3IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKKysrIGIvU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCkBAIC0xNzEsNyArMTcxLDcg
QEAgcHVibGljOgogICAgIHZvaWQgYWRkUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9h
ZGVyKHN0ZDo6dW5pcXVlX3B0cjxQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE5ldHdvcmtMb2FkZXI+
JiYgbG9hZGVyKSB7IG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVycy5hZGQo
V1RGTW92ZShsb2FkZXIpKTsgfQogICAgIHZvaWQgcmVtb3ZlUHJpdmF0ZUNsaWNrTWVhc3VyZW1l
bnROZXR3b3JrTG9hZGVyKFByaXZhdGVDbGlja01lYXN1cmVtZW50TmV0d29ya0xvYWRlciogbG9h
ZGVyKSB7IG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVycy5yZW1vdmUobG9h
ZGVyKTsgfQogCi0gICAgdmlydHVhbCB2b2lkIHJlbW92ZU5ldHdvcmtXZWJzaXRlRGF0YShzdGQ6
Om9wdGlvbmFsPFdhbGxUaW1lPiwgc3RkOjpvcHRpb25hbDxIYXNoU2V0PFdlYkNvcmU6OlJlZ2lz
dHJhYmxlRG9tYWluPj4mJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25I
YW5kbGVyKSB7IGNvbXBsZXRpb25IYW5kbGVyKCk7IH0KKyAgICB2aXJ0dWFsIHZvaWQgcmVtb3Zl
TmV0d29ya1dlYnNpdGVEYXRhKHN0ZDo6b3B0aW9uYWw8V2FsbFRpbWU+LCBzdGQ6Om9wdGlvbmFs
PEhhc2hTZXQ8V2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4+PiYmLCBib29sLCBDb21wbGV0aW9u
SGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhhbmRsZXIo
KTsgfQogCiAgICAgdmlydHVhbCB2b2lkIGFkZFdlYlBhZ2VOZXR3b3JrUGFyYW1ldGVycyhXZWJQ
YWdlUHJveHlJZGVudGlmaWVyLCBXZWJQYWdlTmV0d29ya1BhcmFtZXRlcnMmJikgeyB9CiAgICAg
dmlydHVhbCB2b2lkIHJlbW92ZVdlYlBhZ2VOZXR3b3JrUGFyYW1ldGVycyhXZWJQYWdlUHJveHlJ
ZGVudGlmaWVyKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKaW5kZXggY2I5N2U4MmQwY2Y3NmE0NzI0YTVl
NDNhOThmZDNiMGUyMmM3Y2Y2YS4uODM1Mzg0NDczOWNmMDJjOTc2NWQ5ZDVjNTNiZmExOWY0YzUy
MWU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3
b3JrU2Vzc2lvbkNvY29hLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2Nv
YS9OZXR3b3JrU2Vzc2lvbkNvY29hLmgKQEAgLTEzNiw3ICsxMzYsNyBAQCBwdWJsaWM6CiAgICAg
CiAgICAgX05TSFNUU1N0b3JhZ2UgKmhzdHNTdG9yYWdlKCkgY29uc3Q7CiAKLSAgICB2b2lkIHJl
bW92ZU5ldHdvcmtXZWJzaXRlRGF0YShzdGQ6Om9wdGlvbmFsPFdhbGxUaW1lPiwgc3RkOjpvcHRp
b25hbDxIYXNoU2V0PFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluPj4mJiwgQ29tcGxldGlvbkhh
bmRsZXI8dm9pZCgpPiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIHJlbW92ZU5ldHdvcmtXZWJzaXRl
RGF0YShzdGQ6Om9wdGlvbmFsPFdhbGxUaW1lPiwgc3RkOjpvcHRpb25hbDxIYXNoU2V0PFdlYkNv
cmU6OlJlZ2lzdHJhYmxlRG9tYWluPj4mJiwgYm9vbCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp
PiYmKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICB2b2lkIGludmFsaWRhdGVBbmRDYW5jZWwo
KSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j
b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCBjODM3ZWU1YWVlZTg2ZjY0OGEzYzc2
NjM4N2UyNTg4ZTQ5ZWFmODIyLi45NDMwMGVhZTZjOGY3NDlhMjY2OGJhYTJlYjBhMGExNzg5NWYw
NWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdv
cmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2Nv
YS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC04Myw3ICs4Myw3IEBAIFNPRlRfTElOS19DT05T
VEFOVF9NQVlfRkFJTChTeW1wdG9tUHJlc2VudGF0aW9uTGl0ZSwga1N5bXB0b21BbmFseXRpY3NT
ZXJ2aWNlRW5kCiAjZW5kaWYKIAogI2Vsc2UKLXZvaWQgV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNv
Y29hOjpyZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEoc3RkOjpvcHRpb25hbDxXYWxsVGltZT4sIHN0
ZDo6b3B0aW9uYWw8SGFzaFNldDxXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbj4+JiYsIENvbXBs
ZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgeyBjb21wbGV0aW9uSGFu
ZGxlcigpOyB9Cit2b2lkIFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6cmVtb3ZlTmV0d29y
a1dlYnNpdGVEYXRhKHN0ZDo6b3B0aW9uYWw8V2FsbFRpbWU+LCBzdGQ6Om9wdGlvbmFsPEhhc2hT
ZXQ8V2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4+PiYmLCBib29sLCBDb21wbGV0aW9uSGFuZGxl
cjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpIHsgY29tcGxldGlvbkhhbmRsZXIoKTsgfQog
I2VuZGlmCiAKICNpbXBvcnQgIkRldmljZU1hbmFnZW1lbnRTb2Z0TGluay5oIgpAQCAtMTgyNCw5
ICsxODI0LDEyIEBAIHN0YXRpYyBib29sIGlzQWN0aW5nT25CZWhhbGZPZkFGdWxsV2ViQnJvd3Nl
cihjb25zdCBTdHJpbmcmIGJ1bmRsZUlEKQogfQogI2VuZGlmCiAKLXZvaWQgTmV0d29ya1Nlc3Np
b25Db2NvYTo6cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRhKHN0ZDo6b3B0aW9uYWw8V2FsbFRpbWU+
IG1vZGlmaWVkU2luY2UsIHN0ZDo6b3B0aW9uYWw8SGFzaFNldDxXZWJDb3JlOjpSZWdpc3RyYWJs
ZURvbWFpbj4+JiYgZG9tYWlucywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRp
b25IYW5kbGVyKQordm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjpyZW1vdmVOZXR3b3JrV2Vic2l0
ZURhdGEoc3RkOjpvcHRpb25hbDxXYWxsVGltZT4gbW9kaWZpZWRTaW5jZSwgc3RkOjpvcHRpb25h
bDxIYXNoU2V0PFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluPj4mJiBkb21haW5zLCBib29sIGRh
dGFTdG9yZUlzUGVyc2lzdGVudCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRp
b25IYW5kbGVyKQogewogI2lmIEVOQUJMRShBUFBfUFJJVkFDWV9SRVBPUlQpICYmIEhBVkUoU1lN
UFRPTVNfRlJBTUVXT1JLKQorICAgIGlmICghZGF0YVN0b3JlSXNQZXJzaXN0ZW50KQorICAgICAg
ICByZXR1cm47CisgICAgCiAgICAgYXV0byBidW5kbGVJRCA9IFdlYkNvcmU6OmFwcGxpY2F0aW9u
QnVuZGxlSWRlbnRpZmllcigpOwogICAgIGlmICghaXNQYXJlbnRQcm9jZXNzQUZ1bGxXZWJCcm93
c2VyKG5ldHdvcmtQcm9jZXNzKCkpICYmICFpc0FjdGluZ09uQmVoYWxmT2ZBRnVsbFdlYkJyb3dz
ZXIoYnVuZGxlSUQpKQogICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoKTsKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94
eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv
eHkuY3BwCmluZGV4IDI5ZGJkOWMzMmU2NjhkOTJiOWQzNmFkYWRmNzNlMGM2ODM1MWUwMzQuLmFi
YTNiNTQ2Mjc3MjNkN2ZlNzYyYTA3MTFiMjBkZDU4ZjA5MjQxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKKysrIGIv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcApA
QCAtMjkxLDE0ICsyOTEsMTQgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpmZXRjaFdlYnNp
dGVEYXRhKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9uU2V0PFcKICAgICBzZW5kV2l0
aEFzeW5jUmVwbHkoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpGZXRjaFdlYnNpdGVEYXRhKHNl
c3Npb25JRCwgZGF0YVR5cGVzLCBmZXRjaE9wdGlvbnMpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k
bGVyKSk7CiB9CiAKLXZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZGVsZXRlV2Vic2l0ZURhdGEo
UEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiBkYXRh
VHlwZXMsIFdhbGxUaW1lIG1vZGlmaWVkU2luY2UsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m
JiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZGVsZXRlV2Vi
c2l0ZURhdGEoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFU
eXBlPiBkYXRhVHlwZXMsIFdhbGxUaW1lIG1vZGlmaWVkU2luY2UsIGJvb2wgaXNQZXJzaXN0ZW50
RGF0YVN0b3JlLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIp
CiB7Ci0gICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpOZXR3b3JrUHJvY2Vzczo6RGVs
ZXRlV2Vic2l0ZURhdGEoc2Vzc2lvbklELCBkYXRhVHlwZXMsIG1vZGlmaWVkU2luY2UpLCBXVEZN
b3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2Vz
OjpOZXR3b3JrUHJvY2Vzczo6RGVsZXRlV2Vic2l0ZURhdGEoc2Vzc2lvbklELCBkYXRhVHlwZXMs
IG1vZGlmaWVkU2luY2UsIGlzUGVyc2lzdGVudERhdGFTdG9yZSksIFdURk1vdmUoY29tcGxldGlv
bkhhbmRsZXIpKTsKIH0KIAotdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpkZWxldGVXZWJzaXRl
RGF0YUZvck9yaWdpbnMoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBPcHRpb25TZXQ8V2Vic2l0
ZURhdGFUeXBlPiBkYXRhVHlwZXMsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpTZWN1cml0eU9yaWdp
bkRhdGE+JiBvcmlnaW5zLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgY29va2llSG9zdE5hbWVzLCBj
b25zdCBWZWN0b3I8U3RyaW5nPiYgSFNUU0NhY2hlSG9zdE5hbWVzLCBjb25zdCBWZWN0b3I8UmVn
aXN0cmFibGVEb21haW4+JiByZWdpc3RyYWJsZURvbWFpbnMsIENvbXBsZXRpb25IYW5kbGVyPHZv
aWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3ZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZGVs
ZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgT3B0aW9u
U2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U2Vj
dXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2lucywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGNvb2tpZUhv
c3ROYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIEhTVFNDYWNoZUhvc3ROYW1lcywgY29uc3Qg
VmVjdG9yPFJlZ2lzdHJhYmxlRG9tYWluPiYgcmVnaXN0cmFibGVEb21haW5zLCBib29sIGlzUGVy
c2lzdGVudERhdGFTdG9yZSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25I
YW5kbGVyKQogewotICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6TmV0d29ya1Byb2Nl
c3M6OkRlbGV0ZVdlYnNpdGVEYXRhRm9yT3JpZ2lucyhzZXNzaW9uSUQsIGRhdGFUeXBlcywgb3Jp
Z2lucywgY29va2llSG9zdE5hbWVzLCBIU1RTQ2FjaGVIb3N0TmFtZXMsIHJlZ2lzdHJhYmxlRG9t
YWlucyksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBzZW5kV2l0aEFzeW5jUmVw
bHkoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpEZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMo
c2Vzc2lvbklELCBkYXRhVHlwZXMsIG9yaWdpbnMsIGNvb2tpZUhvc3ROYW1lcywgSFNUU0NhY2hl
SG9zdE5hbWVzLCByZWdpc3RyYWJsZURvbWFpbnMsIGlzUGVyc2lzdGVudERhdGFTdG9yZSksIFdU
Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIH0KIAogdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5
OjpyZW5hbWVPcmlnaW5JbldlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgY29u
c3QgVVJMJiBvbGROYW1lLCBjb25zdCBVUkwmIG5ld05hbWUsIE9wdGlvblNldDxXZWJzaXRlRGF0
YVR5cGU+IGRhdGFUeXBlcywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25I
YW5kbGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3
b3JrUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdv
cmtQcm9jZXNzUHJveHkuaAppbmRleCBiNjA5ZjM1ZjZiNTliYzNlZmYwNDE0MjA0YjYzMzZkMzBj
YTE0NjUxLi4xZmIwZmI2YTQwOWI1ZjliZDY4YjQxN2E0ZGJkZjIwNmNkNWY5NzY1IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku
aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv
eHkuaApAQCAtMTIzLDggKzEyMyw4IEBAIHB1YmxpYzoKICAgICBEb3dubG9hZFByb3h5JiBjcmVh
dGVEb3dubG9hZFByb3h5KFdlYnNpdGVEYXRhU3RvcmUmLCBXZWJQcm9jZXNzUG9vbCYsIGNvbnN0
IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IEZyYW1lSW5mb0RhdGEmLCBXZWJQYWdl
UHJveHkqIG9yaWdpbmF0aW5nUGFnZSk7CiAKICAgICB2b2lkIGZldGNoV2Vic2l0ZURhdGEoUEFM
OjpTZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+LCBPcHRpb25TZXQ8V2Vic2l0
ZURhdGFGZXRjaE9wdGlvbj4sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2Vic2l0ZURhdGEpPiYm
KTsKLSAgICB2b2lkIGRlbGV0ZVdlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklELCBPcHRpb25TZXQ8
V2Vic2l0ZURhdGFUeXBlPiwgV2FsbFRpbWUgbW9kaWZpZWRTaW5jZSwgQ29tcGxldGlvbkhhbmRs
ZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsKLSAgICB2b2lkIGRlbGV0ZVdlYnNpdGVE
YXRhRm9yT3JpZ2lucyhQQUw6OlNlc3Npb25JRCwgT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURh
dGFUeXBlPiwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YT4mIG9yaWdp
bnMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBjb29raWVIb3N0TmFtZXMsIGNvbnN0IFZlY3RvcjxT
dHJpbmc+JiBIU1RTQ2FjaGVIb3N0TmFtZXMsIGNvbnN0IFZlY3RvcjxSZWdpc3RyYWJsZURvbWFp
bj4mLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAgIHZvaWQgZGVsZXRlV2Vic2l0
ZURhdGEoUEFMOjpTZXNzaW9uSUQsIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+LCBXYWxsVGlt
ZSBtb2RpZmllZFNpbmNlLCBib29sLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOworICAg
IHZvaWQgZGVsZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKFBBTDo6U2Vzc2lvbklELCBPcHRpb25T
ZXQ8V2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU+LCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6U2VjdXJp
dHlPcmlnaW5EYXRhPiYgb3JpZ2lucywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGNvb2tpZUhvc3RO
YW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4mIEhTVFNDYWNoZUhvc3ROYW1lcywgY29uc3QgVmVj
dG9yPFJlZ2lzdHJhYmxlRG9tYWluPiYsIGJvb2wsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m
Jik7CiAgICAgdm9pZCByZW5hbWVPcmlnaW5JbldlYnNpdGVEYXRhKFBBTDo6U2Vzc2lvbklELCBj
b25zdCBVUkwmLCBjb25zdCBVUkwmLCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiwgQ29tcGxl
dGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKIAogICAgIHZvaWQgZ2V0TG9jYWxTdG9yYWdlRGV0YWls
cyhQQUw6OlNlc3Npb25JRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8TG9jYWxTdG9y
YWdlRGF0YWJhc2VUcmFja2VyOjpPcmlnaW5EZXRhaWxzPiYmKT4mJik7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3Bw
CmluZGV4IDBhMGYyMzIwNzQ0MzI4OWU4ZGRmMGY0MWQxMzMzNjIwMDYyMzRmOTMuLjk0MDAyNTcw
NzFiZjAyMGEzODhlN2Q5NGE3YTU3ZTM3ZTM4ZmVkYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC02
ODgsNyArNjg4LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNl
dDxXZWJzaXRlRGF0YVR5cGU+IGRhdGFUeXBlcywgV2FsbFRpbWUKICAgICAgICAgRkFMTFRIUk9V
R0g7CiAgICAgY2FzZSBQcm9jZXNzQWNjZXNzVHlwZTo6T25seUlmTGF1bmNoZWQ6CiAgICAgICAg
IGlmIChtX25ldHdvcmtQcm9jZXNzKSB7Ci0gICAgICAgICAgICBtX25ldHdvcmtQcm9jZXNzLT5k
ZWxldGVXZWJzaXRlRGF0YShtX3Nlc3Npb25JRCwgZGF0YVR5cGVzLCBtb2RpZmllZFNpbmNlLCBb
Y2FsbGJhY2tBZ2dyZWdhdG9yXSB7IH0pOworICAgICAgICAgICAgbV9uZXR3b3JrUHJvY2Vzcy0+
ZGVsZXRlV2Vic2l0ZURhdGEobV9zZXNzaW9uSUQsIGRhdGFUeXBlcywgbW9kaWZpZWRTaW5jZSwg
aXNQZXJzaXN0ZW50KCksIFtjYWxsYmFja0FnZ3JlZ2F0b3JdIHsgfSk7CiAjaWYgRU5BQkxFKFJF
U09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICAgICAgICAgIGRpZE5vdGlmeU5ldHdvcmtQcm9j
ZXNzVG9EZWxldGVXZWJzaXRlRGF0YSA9IHRydWU7CiAjZW5kaWYKQEAgLTgwMyw3ICs4MDMsNyBA
QCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRh
VHlwZT4gZGF0YVR5cGVzLCBXYWxsVGltZQogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJ
U1RJQ1MpCiAgICAgaWYgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6OlJlc291
cmNlTG9hZFN0YXRpc3RpY3MpKSB7CiAgICAgICAgIGlmICghZGlkTm90aWZ5TmV0d29ya1Byb2Nl
c3NUb0RlbGV0ZVdlYnNpdGVEYXRhKQotICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3MoKS5kZWxl
dGVXZWJzaXRlRGF0YShtX3Nlc3Npb25JRCwgZGF0YVR5cGVzLCBtb2RpZmllZFNpbmNlLCBbY2Fs
bGJhY2tBZ2dyZWdhdG9yXSB7IH0pOworICAgICAgICAgICAgbmV0d29ya1Byb2Nlc3MoKS5kZWxl
dGVXZWJzaXRlRGF0YShtX3Nlc3Npb25JRCwgZGF0YVR5cGVzLCBtb2RpZmllZFNpbmNlLCBpc1Bl
cnNpc3RlbnQoKSwgW2NhbGxiYWNrQWdncmVnYXRvcl0geyB9KTsKIAogICAgICAgICBjbGVhclJl
c291cmNlTG9hZFN0YXRpc3RpY3NJbldlYlByb2Nlc3NlcyhbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7
IH0pOwogICAgIH0KQEAgLTg2NSw3ICs4NjUsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJl
bW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBjb25zdCBWZQog
I2VuZGlmCiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIG5ldHdvcmtQcm9jZXNzKCkuZGVs
ZXRlV2Vic2l0ZURhdGFGb3JPcmlnaW5zKG1fc2Vzc2lvbklELCBkYXRhVHlwZXMsIG9yaWdpbnMs
IGNvb2tpZUhvc3ROYW1lcywgSFNUU0NhY2hlSG9zdE5hbWVzLCByZWdpc3RyYWJsZURvbWFpbnMs
IFtjYWxsYmFja0FnZ3JlZ2F0b3IsIHByb2Nlc3NQb29sXSB7IH0pOworICAgICAgICAgICAgbmV0
d29ya1Byb2Nlc3MoKS5kZWxldGVXZWJzaXRlRGF0YUZvck9yaWdpbnMobV9zZXNzaW9uSUQsIGRh
dGFUeXBlcywgb3JpZ2lucywgY29va2llSG9zdE5hbWVzLCBIU1RTQ2FjaGVIb3N0TmFtZXMsIHJl
Z2lzdHJhYmxlRG9tYWlucywgaXNQZXJzaXN0ZW50KCksIFtjYWxsYmFja0FnZ3JlZ2F0b3IsIHBy
b2Nlc3NQb29sXSB7IH0pOwogICAgICAgICB9CiAgICAgfQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434797</attachid>
            <date>2021-08-02 15:58:20 -0700</date>
            <delta_ts>2021-08-02 16:56:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228708-20210802155819.patch</filename>
            <type>text/plain</type>
            <size>2473</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFhM2JkNjU4MGI3YWIzMjNm
Y2U4MjMzMWZkZTZkYzhiMDAxOTg2NjUuLjkxM2Y1MTM5NTMxNjUwYTY0MjJiZGI0OTY0NGU4ODc3
ZjdkZmU3ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDgtMDIgIEthdGUgQ2hl
bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgW0FwcCBQcml2YWN5
IFJlcG9ydF0gRG9tYWlucyBhcmUgZGVsZXRlZCBmb3IgZXBoZW1lcmFsIHdlYnNpdGUgZGF0YSBz
dG9yZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODcwOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEyODI0MzI+CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBTaW5jZSB0aGlz
IGRhdGEgaXMgbm90IHN0b3JlZCBpbiBXZWJLaXQsIHdlIGhhdmUgbm8KKyAgICAgICAgd2F5IHRv
IHRlc3Qgd2hlbiBpdCBnZXRzIGRlbGV0ZWQgb3Igbm90LiBJIHRlc3RlZCBtYW51YWxseSBhbmQg
cmVxdWVzdGVkCisgICAgICAgIGFuIGF1dG9tYXRlZCB0ZXN0IGF0IHRoZSBjb3JyZWN0IG5ldHdv
cmtpbmcgbGF5ZXIuCisKKyAgICAgICAgT25seSBjbGVhciBQcml2YWN5IFJlcG9ydCBkYXRhIGlm
IHRoZSB3ZWJzaXRlIGRhdGEgc3RvcmUgaXMKKyAgICAgICAgcGVyc2lzdGVudC4gU2FmYXJpIGNh
bGxzIHRoZSBTUEkgdG8gcmVtb3ZlIHdlYnNpdGUgZGF0YSBmb3IgZXBoZW1lcmFsCisgICAgICAg
IGRhdGEgc3RvcmVzIGluIHNvbWUgY2FzZXMgdGhhdCBhcmUgdW5yZWxhdGVkIHRvIGEgdXNlciBj
bGVhcmluZworICAgICAgICB3ZWJzaXRlIGRhdGEgb3IgaGlzdG9yeSBhbmQgdGh1cyBzaG91bGQg
bm90IGNsZWFyIEFwcCBQcml2YWN5IFJlcG9ydAorICAgICAgICBkYXRhLiBBZGRpdGlvbmFsbHks
IGl0IGlzIHVuZXhwZWN0ZWQgdGhhdCBjbGVhcmluZyBhbiBlcGhlbWVyYWwgZGF0YQorICAgICAg
ICBzdG9yZSB3b3VsZCBjbGVhciBkaXNrIGRhdGEsIGFzIHdlYnNpdGUgZGF0YSBpcyBvbmx5IHN0
b3JlZCBpbiBtZW1vcnkKKyAgICAgICAgaW4gdGhpcyBjYXNlLgorCisgICAgICAgICogTmV0d29y
a1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6
TmV0d29ya1Nlc3Npb25Db2NvYTo6cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRhKToKKwogMjAyMS0w
Ny0yOSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29tPgogCiAgICAgICAgIFRoZSBidW5k
bGUgcGF0aCBvZiBkb3dubGV2ZWwgU2FmYXJpIGlzIHdyb25nCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5k
ZXggYzgzN2VlNWFlZWU4NmY2NDhhM2M3NjYzODdlMjU4OGU0OWVhZjgyMi4uNzE2ODUyOGNhNzUw
NDNhNGIwMDMyYzgwZWI5MjJhYzNmYTQ5MjljMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O
ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtMTgy
Nyw2ICsxODI3LDExIEBAIHN0YXRpYyBib29sIGlzQWN0aW5nT25CZWhhbGZPZkFGdWxsV2ViQnJv
d3Nlcihjb25zdCBTdHJpbmcmIGJ1bmRsZUlEKQogdm9pZCBOZXR3b3JrU2Vzc2lvbkNvY29hOjpy
ZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEoc3RkOjpvcHRpb25hbDxXYWxsVGltZT4gbW9kaWZpZWRT
aW5jZSwgc3RkOjpvcHRpb25hbDxIYXNoU2V0PFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluPj4m
JiBkb21haW5zLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIp
CiB7CiAjaWYgRU5BQkxFKEFQUF9QUklWQUNZX1JFUE9SVCkgJiYgSEFWRShTWU1QVE9NU19GUkFN
RVdPUkspCisgICAgaWYgKHNlc3Npb25JRCgpLmlzRXBoZW1lcmFsKCkpIHsKKyAgICAgICAgY29t
cGxldGlvbkhhbmRsZXIoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGF1dG8gYnVu
ZGxlSUQgPSBXZWJDb3JlOjphcHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKTsKICAgICBpZiAo
IWlzUGFyZW50UHJvY2Vzc0FGdWxsV2ViQnJvd3NlcihuZXR3b3JrUHJvY2VzcygpKSAmJiAhaXNB
Y3RpbmdPbkJlaGFsZk9mQUZ1bGxXZWJCcm93c2VyKGJ1bmRsZUlEKSkKICAgICAgICAgcmV0dXJu
IGNvbXBsZXRpb25IYW5kbGVyKCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434802</attachid>
            <date>2021-08-02 16:56:42 -0700</date>
            <delta_ts>2021-08-02 17:00:20 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-228708-20210802165641.patch</filename>
            <type>text/plain</type>
            <size>9865</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGMwODU4ZTM4NWZlZDlmNWNhYmI1MjBl
ZmQzOTM4Y2U5MGRhODM0MzEuLjhhNWZhY2E3YTEwMTUzNDYyNTliMmYzNDFjOGQ5OWU2NWU2MzJj
ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDctMjkgIEthdGUgQ2hlbmV5ICA8a2F0aGVy
aW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0SWRlbnRpZmllclN0cmluZ0ZvclBy
ZWZlcnJlZFZvaWNlSW5MaXN0V2l0aExvY2FsZSgpIGlzIGRlcHJlY2F0ZWQgaW4gTW9udGVyZXkK
KyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIyODA2Nj4KKyAgICAgICAgPHJkYXI6Ly9w
cm9ibGVtLzgwNTc3MzEyPgorCisgICAgICAgIFBhdGNoIGJ5IERhdmlkIEtpbHplci4KKworICAg
ICAgICBSZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm1I
YXZlLmg6CisgICAgICAgIC0gQWRkIEhBVkUoU1BFRUNIU1lOVEhFU0lTX01PTlRFUkVZX1NQSSku
CisKIDIwMjEtMDctMjggIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAg
ICAgICBbV2ViQXVkaW9dIEFkZCB3ZWJtL29wdXMgY29udGFpbmVyIHN1cHBvcnQKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp
bmRleCAzZGFiYzU1ODY3ZDA1OTFjMmIzMmRmMmYwZGZlMmNmYjMyNWU3MWE3Li4xN2NkODA1MTUz
MmViOWIxY2YyMDU2NGI4ODMxMWE0OWU1MDM5ZWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg
QEAKKzIwMjEtMDctMjkgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+
CisKKyAgICAgICAgR2V0SWRlbnRpZmllclN0cmluZ0ZvclByZWZlcnJlZFZvaWNlSW5MaXN0V2l0
aExvY2FsZSgpIGlzIGRlcHJlY2F0ZWQgaW4gTW9udGVyZXkKKyAgICAgICAgPGh0dHBzOi8vd2Vi
a2l0Lm9yZy9iLzIyODA2Nj4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgwNTc3MzEyPgorCisg
ICAgICAgIFBhdGNoIGJ5IERhdmlkIEtpbHplci4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXZp
ZCBLaWx6ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGxhdGZvcm1TcGVlY2hTeW50aGVz
aXplck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNwZWVjaFN5bnRoZXNpc0dldERlZmF1bHRW
b2ljZUlkZW50aWZpZXJGb3JMb2NhbGUpOgorICAgICAgICAtIFN3aXRjaCB0byB1c2UKKyAgICAg
ICAgICBDb3B5SWRlbnRpZmllclN0cmluZ0ZvclByZWZlcnJlZFZvaWNlSW5MaXN0V2l0aExvY2Fs
ZSgpCisgICAgICAgICAgaW4gTW9udGVyZXkuCisgICAgICAgIC0gQ2hhbmdlIHRvIHJldHVybiBS
ZXRhaW5QdHI8PiB0byBoYW5kbGUgbGlmZXRpbWUgb2YKKyAgICAgICAgICBvYmplY3QgcmV0dXJu
ZWQgZnJvbSBuZXcgZnVuY3Rpb24uCisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVNwZWVjaFN5
bnRoZXNpemVyOjppbml0aWFsaXplVm9pY2VMaXN0KToKKyAgICAgICAgLSBDaGFuZ2UgdmFyaWJs
ZSB0eXBlIHRvICdhdXRvJyBzaW5jZSByZXR1cm4gdHlwZSBvZgorICAgICAgICAgIHNwZWVjaFN5
bnRoZXNpc0dldERlZmF1bHRWb2ljZUlkZW50aWZpZXJGb3JMb2NhbGUoKQorICAgICAgICAgIGNo
YW5nZWQuCisKIDIwMjEtMDctMjkgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdh
bGlhLmNvbT4KIAogICAgICAgICBbQ01ha2VdIFVzZSBhbiBpbXBvcnRlZCB0YXJnZXQgZm9yIHRo
ZSBsaWJnY3J5cHQgbGlicmFyeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5n
ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKaW5kZXggMzZlOTFlOTk5Mzg2YTY5
MDU4YTZjMTA1MDZkOWZhYWFkZDFmZTg3MC4uMzhhNzY3NjdmY2ZmYzlhMTI1NzA1NDI2Njg0ZTAw
NjZlZjlmMDZmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZworKysg
Yi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDct
MjkgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAg
R2V0SWRlbnRpZmllclN0cmluZ0ZvclByZWZlcnJlZFZvaWNlSW5MaXN0V2l0aExvY2FsZSgpIGlz
IGRlcHJlY2F0ZWQgaW4gTW9udGVyZXkKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIy
ODA2Nj4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgwNTc3MzEyPgorCisgICAgICAgIFBhdGNo
IGJ5IERhdmlkIEtpbHplci4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCisK
KyAgICAgICAgKiBwYWwvc3BpL21hYy9TcGVlY2hTeW50aGVzaXNTUEkuaDoKKyAgICAgICAgKiBw
YWwvc3BpL21hYy9TcGVlY2hTeW50aGVzaXNTUEkuaDoKKyAgICAgICAgKENvcHlJZGVudGlmaWVy
U3RyaW5nRm9yUHJlZmVycmVkVm9pY2VJbkxpc3RXaXRoTG9jYWxlKTogQWRkLgorICAgICAgICAt
IERlZmluZSByZXBsYWNlbWVudCBmdW5jdGlvbiBmb3IKKyAgICAgICAgICBHZXRJZGVudGlmaWVy
U3RyaW5nRm9yUHJlZmVycmVkVm9pY2VJbkxpc3RXaXRoTG9jYWxlKCkKKyAgICAgICAgICBpbiBN
b250ZXJleS4KKwogMjAyMS0wNy0yOCAgSmVhbi1ZdmVzIEF2ZW5hcmQgIDxqeWFAYXBwbGUuY29t
PgogCiAgICAgICAgIFtXZWJBdWRpb10gQWRkIHdlYm0vb3B1cyBjb250YWluZXIgc3VwcG9ydApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n
ZUxvZwppbmRleCAxYTNiZDY1ODBiN2FiMzIzZmNlODIzMzFmZGU2ZGM4YjAwMTk4NjY1Li44NTg2
ZDIyZTFiNTQyMWFhY2NmYTI5YTliYTVjODBlY2U2YmI2YzY4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx
LDI2IEBACisyMDIxLTA4LTAyICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUu
Y29tPgorCisgICAgICAgIFtBcHAgUHJpdmFjeSBSZXBvcnRdIERvbWFpbnMgYXJlIGRlbGV0ZWQg
Zm9yIGVwaGVtZXJhbCB3ZWJzaXRlIGRhdGEgc3RvcmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg3MDgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt
LzgxMjgyNDMyPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAg
ICAgICAgTm8gbmV3IHRlc3RzLiBTaW5jZSB0aGlzIGRhdGEgaXMgbm90IHN0b3JlZCBpbiBXZWJL
aXQsIHdlIGhhdmUgbm8KKyAgICAgICAgd2F5IHRvIHRlc3Qgd2hlbiBpdCBnZXRzIGRlbGV0ZWQg
b3Igbm90LiBJIHRlc3RlZCBtYW51YWxseSBhbmQgcmVxdWVzdGVkCisgICAgICAgIGFuIGF1dG9t
YXRlZCB0ZXN0IGF0IHRoZSBjb3JyZWN0IG5ldHdvcmtpbmcgbGF5ZXIuCisKKyAgICAgICAgT25s
eSBjbGVhciBQcml2YWN5IFJlcG9ydCBkYXRhIGlmIHRoZSB3ZWJzaXRlIGRhdGEgc3RvcmUgaXMK
KyAgICAgICAgcGVyc2lzdGVudC4gU2FmYXJpIGNhbGxzIHRoZSBTUEkgdG8gcmVtb3ZlIHdlYnNp
dGUgZGF0YSBmb3IgZXBoZW1lcmFsCisgICAgICAgIGRhdGEgc3RvcmVzIGluIHNvbWUgY2FzZXMg
dGhhdCBhcmUgdW5yZWxhdGVkIHRvIGEgdXNlciBjbGVhcmluZworICAgICAgICB3ZWJzaXRlIGRh
dGEgb3IgaGlzdG9yeSBhbmQgdGh1cyBzaG91bGQgbm90IGNsZWFyIEFwcCBQcml2YWN5IFJlcG9y
dAorICAgICAgICBkYXRhLiBBZGRpdGlvbmFsbHksIGl0IGlzIHVuZXhwZWN0ZWQgdGhhdCBjbGVh
cmluZyBhbiBlcGhlbWVyYWwgZGF0YQorICAgICAgICBzdG9yZSB3b3VsZCBjbGVhciBkaXNrIGRh
dGEsIGFzIHdlYnNpdGUgZGF0YSBpcyBvbmx5IHN0b3JlZCBpbiBtZW1vcnkKKyAgICAgICAgaW4g
dGhpcyBjYXNlLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Np
b25Db2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6cmVtb3Zl
TmV0d29ya1dlYnNpdGVEYXRhKToKKwogMjAyMS0wNy0yOSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZA
YXBwbGUuY29tPgogCiAgICAgICAgIFRoZSBidW5kbGUgcGF0aCBvZiBkb3dubGV2ZWwgU2FmYXJp
IGlzIHdyb25nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaCBiL1Nv
dXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCmluZGV4IDg2ZjQ0MWU4MGE1MzBhMzRkNWViZDg2
YzU2OGZiOTdmOTczY2IwNTEuLjY5MjNmN2RlODRmZjU3ZmU3MzQ1ODVlMTgwMjNmZTkwMDRmODAy
ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCisrKyBiL1NvdXJj
ZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCkBAIC04NTAsNiArODUwLDEyIEBACiAjZW5kaWYKICNl
bmRpZgogCisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ
UkVEID49IDEyMDAwMAorI2lmICFkZWZpbmVkKEhBVkVfU1BFRUNIU1lOVEhFU0lTX01PTlRFUkVZ
X1NQSSkKKyNkZWZpbmUgSEFWRV9TUEVFQ0hTWU5USEVTSVNfTU9OVEVSRVlfU1BJIDEKKyNlbmRp
ZgorI2VuZGlmCisKICNpZiBQTEFURk9STShDT0NPQSkKICNpZiAhZGVmaW5lZChIQVZFX0NHX0NP
TlRFWFRfRFJBV19QQVRIX0RJUkVDVCkKICNkZWZpbmUgSEFWRV9DR19DT05URVhUX0RSQVdfUEFU
SF9ESVJFQ1QgMQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL1Nw
ZWVjaFN5bnRoZXNpc1NQSS5oIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL1NwZWVj
aFN5bnRoZXNpc1NQSS5oCmluZGV4IGM3Yjc5ZTdhNDFlNGE4ZWUwNDIzNmNhYjlkZTIwOTE3Mzhh
OGFjNDMuLmI5Mjk3ODJiZWIwY2QyYzY5NWRlZTYxY2U4NzdhZTQxNWJjNjhiYzUgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9TcGVlY2hTeW50aGVzaXNTUEkuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvU3BlZWNoU3ludGhlc2lzU1BJLmgK
QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxs
IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNy0yMDIxIEFwcGxlIEluYy4g
QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv
dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg
YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt
MzQsNiArMzQsMTAgQEAKIFdURl9FWFRFUk5fQ19CRUdJTgogCiBDRkFycmF5UmVmIENvcHlTcGVl
Y2hTeW50aGVzaXNWb2ljZXNGb3JNb2RlKENGVHlwZVJlZiBtb2RlKTsKKyNpZiBIQVZFKFNQRUVD
SFNZTlRIRVNJU19NT05URVJFWV9TUEkpCitDRlN0cmluZ1JlZiBDb3B5SWRlbnRpZmllclN0cmlu
Z0ZvclByZWZlcnJlZFZvaWNlSW5MaXN0V2l0aExvY2FsZShDRkFycmF5UmVmIHZvaWNlcywgQ0ZM
b2NhbGVSZWYpOworI2Vsc2UKIENGU3RyaW5nUmVmIEdldElkZW50aWZpZXJTdHJpbmdGb3JQcmVm
ZXJyZWRWb2ljZUluTGlzdFdpdGhMb2NhbGUoQ0ZBcnJheVJlZiB2b2ljZXMsIENGTG9jYWxlUmVm
KTsKKyNlbmRpZgogCiBXVEZfRVhURVJOX0NfRU5ECmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9tYWMvUGxhdGZvcm1TcGVlY2hTeW50aGVzaXplck1hYy5tbSBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNwZWVjaFN5bnRoZXNpemVyTWFjLm1tCmluZGV4
IGMxMWJmMWE4NmYzZTM3NGIxNjM4OGMzNzQ4Y2U1Njg3MmMwNWFhYWYuLjMzZTYwMTM4OGRjOWMz
ODY5MzgyYjA2ZTU1ZGQ1MTE0ZWZhZDFkYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL21hYy9QbGF0Zm9ybVNwZWVjaFN5bnRoZXNpemVyTWFjLm1tCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybVNwZWVjaFN5bnRoZXNpemVyTWFjLm1tCkBAIC0x
LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuICBBbGwgcmln
aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMjEgQXBwbGUgSW5jLiAgQWxs
IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj
ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl
IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjIy
LDE1ICsyMjIsMTYgQEAgc3RhdGljIFJldGFpblB0cjxDRkFycmF5UmVmPiBzcGVlY2hTeW50aGVz
aXNHZXRWb2ljZUlkZW50aWZpZXJzKCkKICAgICByZXR1cm4gYWRvcHRDRihDb3B5U3BlZWNoU3lu
dGhlc2lzVm9pY2VzRm9yTW9kZSgoX19icmlkZ2UgQ0ZBcnJheVJlZilAWyBAIlZvaWNlR3JvdXBE
ZWZhdWx0IiwgQCJWb2ljZUdyb3VwQ29tcGFjdCIgXSkpOwogfQogCi1zdGF0aWMgTlNTdHJpbmcg
KnNwZWVjaFN5bnRoZXNpc0dldERlZmF1bHRWb2ljZUlkZW50aWZpZXJGb3JMb2NhbGUoTlNMb2Nh
bGUgKnVzZXJMb2NhbGUpCitzdGF0aWMgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBzcGVlY2hTeW50
aGVzaXNHZXREZWZhdWx0Vm9pY2VJZGVudGlmaWVyRm9yTG9jYWxlKE5TTG9jYWxlICp1c2VyTG9j
YWxlKQogewogICAgIGlmICghdXNlckxvY2FsZSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAotI3By
YWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKLSNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25v
cmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgotICAgIHJldHVybiAoX19icmlkZ2UgTlNT
dHJpbmcgKilHZXRJZGVudGlmaWVyU3RyaW5nRm9yUHJlZmVycmVkVm9pY2VJbkxpc3RXaXRoTG9j
YWxlKHNwZWVjaFN5bnRoZXNpc0dldFZvaWNlSWRlbnRpZmllcnMoKS5nZXQoKSwgKF9fYnJpZGdl
IENGTG9jYWxlUmVmKXVzZXJMb2NhbGUpOwotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAor
I2lmIEhBVkUoU1BFRUNIU1lOVEhFU0lTX01PTlRFUkVZX1NQSSkgJiYgVVNFKEFQUExFX0lOVEVS
TkFMX1NESykKKyAgICByZXR1cm4gYWRvcHRDRihDb3B5SWRlbnRpZmllclN0cmluZ0ZvclByZWZl
cnJlZFZvaWNlSW5MaXN0V2l0aExvY2FsZShzcGVlY2hTeW50aGVzaXNHZXRWb2ljZUlkZW50aWZp
ZXJzKCkuZ2V0KCksIChfX2JyaWRnZSBDRkxvY2FsZVJlZil1c2VyTG9jYWxlKSk7CisjZWxzZQor
ICAgIHJldHVybiBHZXRJZGVudGlmaWVyU3RyaW5nRm9yUHJlZmVycmVkVm9pY2VJbkxpc3RXaXRo
TG9jYWxlKHNwZWVjaFN5bnRoZXNpc0dldFZvaWNlSWRlbnRpZmllcnMoKS5nZXQoKSwgKF9fYnJp
ZGdlIENGTG9jYWxlUmVmKXVzZXJMb2NhbGUpOworI2VuZGlmCiB9CiAKIHZvaWQgUGxhdGZvcm1T
cGVlY2hTeW50aGVzaXplcjo6aW5pdGlhbGl6ZVZvaWNlTGlzdCgpCkBAIC0yNDQsMTIgKzI0NSwx
MiBAQCB2b2lkIFBsYXRmb3JtU3BlZWNoU3ludGhlc2l6ZXI6OmluaXRpYWxpemVWb2ljZUxpc3Qo
KQogICAgICAgICBOU1N0cmluZyAqdm9pY2VVUkkgPSBbYXR0cmlidXRlcyBvYmplY3RGb3JLZXk6
TlNWb2ljZUlkZW50aWZpZXJdOwogICAgICAgICBOU1N0cmluZyAqbmFtZSA9IFthdHRyaWJ1dGVz
IG9iamVjdEZvcktleTpOU1ZvaWNlTmFtZV07CiAgICAgICAgIE5TU3RyaW5nICpsYW5ndWFnZSA9
IFthdHRyaWJ1dGVzIG9iamVjdEZvcktleTpOU1ZvaWNlTG9jYWxlSWRlbnRpZmllcl07Ci0gICAg
ICAgIE5TU3RyaW5nICpkZWZhdWx0Vm9pY2VVUkkgPSBzcGVlY2hTeW50aGVzaXNHZXREZWZhdWx0
Vm9pY2VJZGVudGlmaWVyRm9yTG9jYWxlKGFkb3B0TlMoW1tOU0xvY2FsZSBhbGxvY10gaW5pdFdp
dGhMb2NhbGVJZGVudGlmaWVyOmxhbmd1YWdlXSkuZ2V0KCkpOworICAgICAgICBhdXRvIGRlZmF1
bHRWb2ljZVVSSSA9IHNwZWVjaFN5bnRoZXNpc0dldERlZmF1bHRWb2ljZUlkZW50aWZpZXJGb3JM
b2NhbGUoYWRvcHROUyhbW05TTG9jYWxlIGFsbG9jXSBpbml0V2l0aExvY2FsZUlkZW50aWZpZXI6
bGFuZ3VhZ2VdKS5nZXQoKSk7CiAKICAgICAgICAgLy8gQ2hhbmdlIHRvIEJDUC00NyBmb3JtYXQg
YXMgZGVmaW5lZCBieSBzcGVjLgogICAgICAgICBsYW5ndWFnZSA9IFtsYW5ndWFnZSBzdHJpbmdC
eVJlcGxhY2luZ09jY3VycmVuY2VzT2ZTdHJpbmc6QCJfIiB3aXRoU3RyaW5nOkAiLSJdOwogCi0g
ICAgICAgIGJvb2wgaXNEZWZhdWx0ID0gW2RlZmF1bHRWb2ljZVVSSSBpc0VxdWFsVG9TdHJpbmc6
dm9pY2VVUkldOworICAgICAgICBib29sIGlzRGVmYXVsdCA9IFsoX19icmlkZ2UgTlNTdHJpbmcg
KilkZWZhdWx0Vm9pY2VVUkkuZ2V0KCkgaXNFcXVhbFRvU3RyaW5nOnZvaWNlVVJJXTsKIAogICAg
ICAgICBtX3ZvaWNlTGlzdC5hcHBlbmQoUGxhdGZvcm1TcGVlY2hTeW50aGVzaXNWb2ljZTo6Y3Jl
YXRlKHZvaWNlVVJJLCBuYW1lLCBsYW5ndWFnZSwgdHJ1ZSwgaXNEZWZhdWx0KSk7CiAgICAgfQpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz
c2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr
U2Vzc2lvbkNvY29hLm1tCmluZGV4IGM4MzdlZTVhZWVlODZmNjQ4YTNjNzY2Mzg3ZTI1ODhlNDll
YWY4MjIuLjVjMTg3ZWUwMmE1Mzg2MzEyY2ZmYzczMGFhMjM5YTRiZDQwMDM4OGQgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2Nv
YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz
aW9uQ29jb2EubW0KQEAgLTE4MjcsNiArMTgyNywxMiBAQCBzdGF0aWMgYm9vbCBpc0FjdGluZ09u
QmVoYWxmT2ZBRnVsbFdlYkJyb3dzZXIoY29uc3QgU3RyaW5nJiBidW5kbGVJRCkKIHZvaWQgTmV0
d29ya1Nlc3Npb25Db2NvYTo6cmVtb3ZlTmV0d29ya1dlYnNpdGVEYXRhKHN0ZDo6b3B0aW9uYWw8
V2FsbFRpbWU+IG1vZGlmaWVkU2luY2UsIHN0ZDo6b3B0aW9uYWw8SGFzaFNldDxXZWJDb3JlOjpS
ZWdpc3RyYWJsZURvbWFpbj4+JiYgZG9tYWlucywgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYm
IGNvbXBsZXRpb25IYW5kbGVyKQogewogI2lmIEVOQUJMRShBUFBfUFJJVkFDWV9SRVBPUlQpICYm
IEhBVkUoU1lNUFRPTVNfRlJBTUVXT1JLKQorICAgIC8vIEZJWE1FOiBBZGQgYXV0b21hdGVkIHRl
c3QgZm9yIHRoaXMgb25jZSByZGFyOi8vODE0MjA3NTMgaXMgcmVzb2x2ZWQuCisgICAgaWYgKHNl
c3Npb25JRCgpLmlzRXBoZW1lcmFsKCkpIHsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsK
KyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGF1dG8gYnVuZGxlSUQgPSBXZWJDb3JlOjph
cHBsaWNhdGlvbkJ1bmRsZUlkZW50aWZpZXIoKTsKICAgICBpZiAoIWlzUGFyZW50UHJvY2Vzc0FG
dWxsV2ViQnJvd3NlcihuZXR3b3JrUHJvY2VzcygpKSAmJiAhaXNBY3RpbmdPbkJlaGFsZk9mQUZ1
bGxXZWJCcm93c2VyKGJ1bmRsZUlEKSkKICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVy
KCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434803</attachid>
            <date>2021-08-02 17:00:22 -0700</date>
            <delta_ts>2021-08-02 17:55:21 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-228708-20210802170022.patch</filename>
            <type>text/plain</type>
            <size>2576</size>
            <attacher name="Kate Cheney">katherine_cheney</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRlNDJlMGMyOGQyNmM1NmVh
MDliYmIyN2U5OWFhYzQwMTg1YjU2NmIuLmUwN2Q1OTgyNWExNzdmMjJiYmYzY2UxZDM2YTE2OTRh
YWJmMWIzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDgtMDIgIEthdGUgQ2hl
bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgW0FwcCBQcml2YWN5
IFJlcG9ydF0gRG9tYWlucyBhcmUgZGVsZXRlZCBmb3IgZXBoZW1lcmFsIHdlYnNpdGUgZGF0YSBz
dG9yZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy
ODcwOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODEyODI0MzI+CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFNpbmNlIHRo
aXMgZGF0YSBpcyBub3Qgc3RvcmVkIGluIFdlYktpdCwgd2UgaGF2ZSBubworICAgICAgICB3YXkg
dG8gdGVzdCB3aGVuIGl0IGdldHMgZGVsZXRlZCBvciBub3QuIEkgdGVzdGVkIG1hbnVhbGx5IGFu
ZCByZXF1ZXN0ZWQKKyAgICAgICAgYW4gYXV0b21hdGVkIHRlc3QgYXQgdGhlIGNvcnJlY3QgbmV0
d29ya2luZyBsYXllci4KKworICAgICAgICBPbmx5IGNsZWFyIFByaXZhY3kgUmVwb3J0IGRhdGEg
aWYgdGhlIHdlYnNpdGUgZGF0YSBzdG9yZSBpcworICAgICAgICBwZXJzaXN0ZW50LiBTYWZhcmkg
Y2FsbHMgdGhlIFNQSSB0byByZW1vdmUgd2Vic2l0ZSBkYXRhIGZvciBlcGhlbWVyYWwKKyAgICAg
ICAgZGF0YSBzdG9yZXMgaW4gc29tZSBjYXNlcyB0aGF0IGFyZSB1bnJlbGF0ZWQgdG8gYSB1c2Vy
IGNsZWFyaW5nCisgICAgICAgIHdlYnNpdGUgZGF0YSBvciBoaXN0b3J5IGFuZCB0aHVzIHNob3Vs
ZCBub3QgY2xlYXIgQXBwIFByaXZhY3kgUmVwb3J0CisgICAgICAgIGRhdGEuIEFkZGl0aW9uYWxs
eSwgaXQgaXMgdW5leHBlY3RlZCB0aGF0IGNsZWFyaW5nIGFuIGVwaGVtZXJhbCBkYXRhCisgICAg
ICAgIHN0b3JlIHdvdWxkIGNsZWFyIGRpc2sgZGF0YSwgYXMgd2Vic2l0ZSBkYXRhIGlzIG9ubHkg
c3RvcmVkIGluIG1lbW9yeQorICAgICAgICBpbiB0aGlzIGNhc2UuCisKKyAgICAgICAgKiBOZXR3
b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0
OjpOZXR3b3JrU2Vzc2lvbkNvY29hOjpyZW1vdmVOZXR3b3JrV2Vic2l0ZURhdGEpOgorCiAyMDIx
LTA4LTAyICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jh
c2ggaW4gLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIHdpbmRvd0RpZEV4aXRGdWxsU2Ny
ZWVuOl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0
d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2Ev
TmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCAzYjg5ZTUwZmI2Nzk3MmRhNDNlNzdjNjMyM2Nm
NWM1MTQxOTUyMDY4Li45ZTQ2NDY0MDUxYTQ1YjhiMmUxNzBlMGU5MjdlMjhjZGM4Y2VlOTViIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz
aW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3
b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC0xODMxLDYgKzE4MzEsMTIgQEAgc3RhdGljIGJvb2wgaXNB
Y3RpbmdPbkJlaGFsZk9mQUZ1bGxXZWJCcm93c2VyKGNvbnN0IFN0cmluZyYgYnVuZGxlSUQpCiB2
b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OnJlbW92ZU5ldHdvcmtXZWJzaXRlRGF0YShzdGQ6Om9w
dGlvbmFsPFdhbGxUaW1lPiBtb2RpZmllZFNpbmNlLCBzdGQ6Om9wdGlvbmFsPEhhc2hTZXQ8V2Vi
Q29yZTo6UmVnaXN0cmFibGVEb21haW4+PiYmIGRvbWFpbnMsIENvbXBsZXRpb25IYW5kbGVyPHZv
aWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICNpZiBFTkFCTEUoQVBQX1BSSVZBQ1lfUkVQ
T1JUKSAmJiBIQVZFKFNZTVBUT01TX0ZSQU1FV09SSykKKyAgICAvLyBGSVhNRTogQWRkIGF1dG9t
YXRlZCB0ZXN0IGZvciB0aGlzIG9uY2UgcmRhcjovLzgxNDIwNzUzIGlzIHJlc29sdmVkLgorICAg
IGlmIChzZXNzaW9uSUQoKS5pc0VwaGVtZXJhbCgpKSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5k
bGVyKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBhdXRvIGJ1bmRsZUlEID0gV2Vi
Q29yZTo6YXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKCk7CiAgICAgaWYgKCFpc1BhcmVudFBy
b2Nlc3NBRnVsbFdlYkJyb3dzZXIobmV0d29ya1Byb2Nlc3MoKSkgJiYgIWlzQWN0aW5nT25CZWhh
bGZPZkFGdWxsV2ViQnJvd3NlcihidW5kbGVJRCkpCiAgICAgICAgIHJldHVybiBjb21wbGV0aW9u
SGFuZGxlcigpOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>