<?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>213625</bug_id>
          
          <creation_ts>2020-06-25 15:43:31 -0700</creation_ts>
          <short_desc>[iOS] Network process is crashing when launching TJMaxx app due to invalid NetworkProcess::DestroySession IPC message</short_desc>
          <delta_ts>2020-06-26 10:37:31 -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>WebKit2</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="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>darin</cc>
    
    <cc>ddkilzer</cc>
    
    <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1666257</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-25 15:43:31 -0700</bug_when>
    <thetext>Network process is crashing when launching TJMaxx app due to invalid NetworkProcess::DestroySession IPC message.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666259</commentid>
    <comment_count>1</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-25 15:43:43 -0700</bug_when>
    <thetext>&lt;rdar://problem/64737890&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666261</commentid>
    <comment_count>2</comment_count>
      <attachid>402822</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-25 15:58:28 -0700</bug_when>
    <thetext>Created attachment 402822
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666262</commentid>
    <comment_count>3</comment_count>
      <attachid>402822</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2020-06-25 16:02:14 -0700</bug_when>
    <thetext>Comment on attachment 402822
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666278</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-25 16:43:43 -0700</bug_when>
    <thetext>Committed r263545: &lt;https://trac.webkit.org/changeset/263545&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402822.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666290</commentid>
    <comment_count>5</comment_count>
      <attachid>402822</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-25 17:02:10 -0700</bug_when>
    <thetext>Comment on attachment 402822
Patch

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

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:125
&gt; +        return [WKWebsiteDataStore defaultDataStore];

I think we need to retain the value we are returning here. And release or dealloc self.

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:127
&gt; +    return nil;

I think we need to release or dealloc self here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666300</commentid>
    <comment_count>6</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-25 17:08:16 -0700</bug_when>
    <thetext>Reopening based on Darin&apos;s comments.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666301</commentid>
    <comment_count>7</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-25 17:10:31 -0700</bug_when>
    <thetext>Reverted r263545 for reason:

Patch will need refining

Committed r263547: &lt;https://trac.webkit.org/changeset/263547&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666331</commentid>
    <comment_count>8</comment_count>
      <attachid>402835</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-25 18:03:05 -0700</bug_when>
    <thetext>Created attachment 402835
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666487</commentid>
    <comment_count>9</comment_count>
      <attachid>402835</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-26 09:42:32 -0700</bug_when>
    <thetext>Comment on attachment 402835
Patch

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

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:124
&gt; +    if (!(self = [super init]))

Why don&apos;t we just call _initWithConfiguration with a non-persistent configuration instead of all this mess?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666492</commentid>
    <comment_count>10</comment_count>
      <attachid>402835</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-26 09:49:09 -0700</bug_when>
    <thetext>Comment on attachment 402835
Patch

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

&gt;&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:124
&gt;&gt; +    if (!(self = [super init]))
&gt; 
&gt; Why don&apos;t we just call _initWithConfiguration with a non-persistent configuration instead of all this mess?

That sounds like a good idea. Let me give this a try:
    auto configuration = adoptNS([[_WKWebsiteDataStoreConfiguration alloc] initNonPersistentConfiguration]);
    return [WKWebsiteDataStore _initWithConfiguration:configuration.get()];</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666493</commentid>
    <comment_count>11</comment_count>
      <attachid>402835</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-06-26 09:49:12 -0700</bug_when>
    <thetext>Comment on attachment 402835
Patch

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

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:127
&gt; +    _bypassWebsiteDataStoreDestructor = YES;

Why is a boolean needed rather than a null check?

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:128
&gt; +    [self autorelease];

Why autorelease rather than release or dealloc?

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:131
&gt; +    // FIXME: We should eventually drop this and always return nil.

Not sure we really need this comment. I think linkedOnOrAfter above makes the point about our long term goals. And I think we should eventually drop this and always *raise an exception*.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666498</commentid>
    <comment_count>12</comment_count>
      <attachid>402877</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-26 09:54:16 -0700</bug_when>
    <thetext>Created attachment 402877
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666499</commentid>
    <comment_count>13</comment_count>
      <attachid>402877</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-06-26 09:56:12 -0700</bug_when>
    <thetext>Comment on attachment 402877
Patch

ObjC doesn&apos;t really like calling another initializer from init, but this does the same thing.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666501</commentid>
    <comment_count>14</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-26 09:56:57 -0700</bug_when>
    <thetext>(In reply to Alex Christensen from comment #12)
&gt; Created attachment 402877 [details]
&gt; Patch

Ok, let me validate this patch on device to make sure the app is happy with it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666505</commentid>
    <comment_count>15</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2020-06-26 10:11:51 -0700</bug_when>
    <thetext>(In reply to Chris Dumez from comment #14)
&gt; (In reply to Alex Christensen from comment #12)
&gt; &gt; Created attachment 402877 [details]
&gt; &gt; Patch
&gt; 
&gt; Ok, let me validate this patch on device to make sure the app is happy with
&gt; it.

Yes, this works fine.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666512</commentid>
    <comment_count>16</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-26 10:37:30 -0700</bug_when>
    <thetext>Committed r263570: &lt;https://trac.webkit.org/changeset/263570&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402877.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402822</attachid>
            <date>2020-06-25 15:58:28 -0700</date>
            <delta_ts>2020-06-25 18:03:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213625-20200625155827.patch</filename>
            <type>text/plain</type>
            <size>6146</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkZDZkMDEzY2VmMTEzNTk2
ZTAwOGRkMDUxZDE5MDA1OTJjYzk5YjguLmY5ZWI4NGUxNGQ1ZTA2NTEzZDc5NGNmYzU3MDBjYjMw
YzliNGE3OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjAtMDYtMjUgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBOZXR3b3JrIHByb2Nlc3Mg
aXMgY3Jhc2hpbmcgd2hlbiBsYXVuY2hpbmcgVEpNYXh4IGFwcCBkdWUgdG8gaW52YWxpZCBOZXR3
b3JrUHJvY2Vzczo6RGVzdHJveVNlc3Npb24gSVBDIG1lc3NhZ2UKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYyNQorICAgICAgICA8cmRhcjovL3By
b2JsZW0vNjQ3Mzc4OTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgVGhlIGFwcCBpcyBjYWxsaW5nIFtXS1dlYnNpdGVEYXRhU3RvcmUgaW5pdF0gZGVz
cGl0ZSB0aGUgbWV0aG9kIGJlaW5nIG1hcmtlZCBhcyB1bmF2YWlsYWJsZSBpbgorICAgICAgICBX
S1dlYnNpdGVEYXRhU3RvcmUuaC4gQXMgYSByZXN1bHQsIHRoZXkgZW5kIHVwIHdpdGggYSBXS1dl
YnNpdGVEYXRhU3RvcmUgb2JqZWN0IHdob3NlIGludGVybmFsCisgICAgICAgIF93ZWJzaXRlRGF0
YVN0b3JlIGlzIGJhZCBiZWNhdXNlIGl0cyBjb25zdHJ1Y3RvciB3YXMgbmV2ZXIgY2FsbGVkLiBX
aGVuIFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVhbGxvY10KKyAgICAgICAgZ2V0cyBjYWxsZWQgbGF0
ZXIgb3duLCBpdCBjYWxscyB0aGUgfldlYnNpdGVEYXRhU3RvcmUoKSBkZXN0cnVjdG9yIGZvciBf
d2Vic2l0ZURhdGFTdG9yZSBidXQgaXRzCisgICAgICAgIG1fc2Vzc2lvbklEIGlzIDAgYmVjYXVz
ZSB3ZSBuZXZlciBjYWxsZWQgdGhlIGNvbnN0cnVjdG9yLiBUaGlzIGNhdXNlcyB1cyB0byBzZW5k
IGEKKyAgICAgICAgTmV0d29ya1Byb2Nlc3M6OkRlc3Ryb3lTZXNzaW9uIElQQyB3aXRoIGEgc2Vz
c2lvbklEIHRoYXQgaXMgMCwgd2hpY2ggaXMgbm90IHZhbGlkIHNvIHRoZQorICAgICAgICBOZXR3
b3JrUHJvY2VzcyBjcmFzaGVzLgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBu
b3cgcHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiBbV0tXZWJzaXRlRGF0YVN0b3JlIGluaXRd
IHdoaWNoIHJldHVybnMgbmlsCisgICAgICAgIGJlaGluZCBhIGxpbmtlZC1vbi1hZnRlciBjaGVj
ayAoc2luY2UgdGhpcyBjcmFzaGVzIHRoZSBhcHApLiBUbyBrZWVwIHRoZSBhcHAgd29ya2luZywK
KyAgICAgICAgW1dLV2Vic2l0ZURhdGFTdG9yZSBpbml0XSByZXR1cm5zIHRoZSBkZWZhdWx0IGRh
dGEgc3RvcmUgdW50aWwgcmVidWlsdCB3aXRoIHRoZSBuZXcgU0RLLiBOb3RlIHRoYXQKKyAgICAg
ICAgSSB0cmllZCByZXR1cm5pbmcgYSBuZXcgZXBoZW1lcmFsIGRhdGEgc3RvcmUgaW5zdGVhZCBi
dXQgdGhpcyB3YXMgZ2V0dGluZyB0aGUgYXBwIGluIGEgYmFkIHN0YXRlLgorCisgICAgICAgICog
VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAgICAgTWFyayAi
bmV3IiBhcyB1bmF2YWlsYWJsZSwgb3RoZXJ3aXNlIFtXS1dlYnNpdGVEYXRhU3RvcmUgbmV3XSBi
dWlsZHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9y
ZS5tbToKKyAgICAgICAgKC1bV0tXZWJzaXRlRGF0YVN0b3JlIGluaXRdKToKKyAgICAgICAgUmV0
dXJuIG5pbCB3aXRoIGxhdGVzdCBTREssIHRoZSBkZWZhdWx0IGRhdGEgc3RvcmUgb3RoZXJ3aXNl
LgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1ZlcnNpb25DaGVja3MuaDoKKyAgICAgICAg
QWRkIGxpbmtlZC1vbi1hZnRlciBjaGVjay4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRl
RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFT
dG9yZTo6fldlYnNpdGVEYXRhU3RvcmUpOgorICAgICAgICBBZGQgYSByZWxlYXNlIGFzc2VydGlv
biB0byBtYWtlIHN1cmUgdGhhdCBtX3Nlc3Npb25JRCBpcyBhbHdheXMgdmFsaWQgd2hlbiB0aGUg
ZGVzdHJ1Y3RvciBpcyBjYWxsZWQuCisKIDIwMjAtMDYtMjUgIFlvdWVubiBGYWJsZXQgIDx5b3Vl
bm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhUmVjb3JkZXIgc3RvcFJlY29yZGVyKCkgcmV0
dXJucyBlbXB0eSBCbG9iIGFmdGVyIGZpcnN0IHVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IDcyNmM0OTcy
YWEwYjMyZTBkYzYwMmUwYWIyZDcxZjZhZThlZjkzYWUuLjI0NTU4MGQ3ZTE1Njc5YjgyYTYxYzQ2
Mzk4NTBkYTAyZDgxYTRlMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ
SS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTQ3LDYgKzQ3LDcgQEAgV0tfQ0xB
U1NfQVZBSUxBQkxFKG1hY29zKDEwLjExKSwgaW9zKDkuMCkpCiAqLwogKyAoV0tXZWJzaXRlRGF0
YVN0b3JlICopbm9uUGVyc2lzdGVudERhdGFTdG9yZTsKIAorLSAoaW5zdGFuY2V0eXBlKW5ldyBO
U19VTkFWQUlMQUJMRTsKIC0gKGluc3RhbmNldHlwZSlpbml0IE5TX1VOQVZBSUxBQkxFOwogCiAv
KiEgQGFic3RyYWN0IFdoZXRoZXIgdGhlIGRhdGEgc3RvcmUgaXMgcGVyc2lzdGVudCBvciBub3Qu
ICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJz
aXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi
c2l0ZURhdGFTdG9yZS5tbQppbmRleCA1OTE0MjhmN2Y1NzllNzZmZjAxYmM5NGI4M2Y1OTk0YWY4
ZTQ4ZTAwLi4zM2ZiYTliOWQxZjRkNDk3MDI0MzBlMmViMGVjNzk4MDk1YmYzNGFlIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3Jl
Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRh
U3RvcmUubW0KQEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIkF1dGhlbnRpY2F0aW9uQ2hhbGxl
bmdlRGlzcG9zaXRpb25Db2NvYS5oIgogI2ltcG9ydCAiQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hl
Y2tlci5oIgogI2ltcG9ydCAiU2hvdWxkR3JhbmRmYXRoZXJTdGF0aXN0aWNzLmgiCisjaW1wb3J0
ICJWZXJzaW9uQ2hlY2tzLmgiCiAjaW1wb3J0ICJXS0hUVFBDb29raWVTdG9yZUludGVybmFsLmgi
CiAjaW1wb3J0ICJXS05TQXJyYXkuaCIKICNpbXBvcnQgIldLTlNVUkxBdXRoZW50aWNhdGlvbkNo
YWxsZW5nZS5oIgpAQCAtMTE1LDYgKzExNiwxNyBAQCArIChXS1dlYnNpdGVEYXRhU3RvcmUgKilu
b25QZXJzaXN0ZW50RGF0YVN0b3JlCiAgICAgcmV0dXJuIHdyYXBwZXIoV2ViS2l0OjpXZWJzaXRl
RGF0YVN0b3JlOjpjcmVhdGVOb25QZXJzaXN0ZW50KCkpOwogfQogCistIChpbnN0YW5jZXR5cGUp
aW5pdAoreworICAgIC8vIFRoaXMgaXMgYSB3b3JrYXJvdW5kIGZvciBhcHBzIHRoYXQgd2VyZSBt
YW5hZ2luZyB0byBjYWxsIFtXS1dlYnNpdGVEYXRhU3RvcmUgaW5pdF0uCisgICAgLy8gRklYTUU6
IFdlIHNob3VsZCBldmVudHVhbGx5IGRyb3AgdGhpcyBhbmQgYWx3YXlzIHJldHVybiBuaWwuCisg
ICAgaWYgKCFXZWJLaXQ6OmxpbmtlZE9uT3JBZnRlcihXZWJLaXQ6OlNES1ZlcnNpb246OkZpcnN0
V2l0aFdLV2Vic2l0ZURhdGFTdG9yZUluaXRSZXR1cm5pbmdOaWwpKSB7CisgICAgICAgIFJFTEVB
U0VfTE9HX0VSUk9SKFByb2Nlc3MsICJBcHBsaWNhdGlvbiBpcyBjYWxsaW5nIFtXS1dlYnNpdGVE
YXRhU3RvcmUgaW5pdF0sIHdoaWNoIGlzIG5vdCBzdXBwb3J0ZWQiKTsKKyAgICAgICAgcmV0dXJu
IFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV07CisgICAgfQorICAgIHJldHVy
biBuaWw7Cit9CisKIC0gKHZvaWQpZGVhbGxvYwogewogICAgIF93ZWJzaXRlRGF0YVN0b3JlLT5X
ZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6On5XZWJzaXRlRGF0YVN0b3JlKCk7CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WZXJzaW9uQ2hlY2tzLmggYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WZXJzaW9uQ2hlY2tzLmgKaW5kZXggMmQxZjU4NzBmM2Mx
MmViYTg0OTg4YjIyNjc5MjQ5ZjI1NTUwYmRmYS4uODgxZTk3Mzk3NzU3NmI4M2ZhNmUxMjA4ODI4
Zjc2MjE3NmJiZmQ3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev
VmVyc2lvbkNoZWNrcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZlcnNp
b25DaGVja3MuaApAQCAtOTQsNiArOTQsNyBAQCBlbnVtIGNsYXNzIFNES1ZlcnNpb24gOiB1aW50
MzJfdCB7CiAgICAgRmlyc3RXaXRoU2Vzc2lvbkNsZWFudXBCeURlZmF1bHQgPSBEWUxEX0lPU19W
RVJTSU9OX0ZJUlNUX1dJVEhfU0VTU0lPTl9DTEVBTlVQX0JZX0RFRkFVTFQsCiAgICAgRmlyc3RU
aGF0U2VuZHNOYXRpdmVNb3VzZUV2ZW50cyA9IERZTERfSU9TX1ZFUlNJT05fMTNfNCwKICAgICBG
aXJzdFdpdGhJbml0aWFsaXplV2ViS2l0Mk1haW5UaHJlYWRBc3NlcnRpb24gPSBEWUxEX0lPU19W
RVJTSU9OXzE0XzAsCisgICAgRmlyc3RXaXRoV0tXZWJzaXRlRGF0YVN0b3JlSW5pdFJldHVybmlu
Z05pbCA9IERZTERfSU9TX1ZFUlNJT05fMTRfMCwKICNlbGlmIFBMQVRGT1JNKE1BQykKICAgICBG
aXJzdFdpdGhOZXR3b3JrQ2FjaGUgPSBEWUxEX01BQ09TWF9WRVJTSU9OXzEwXzExLAogICAgIEZp
cnN0V2l0aEV4Y2VwdGlvbnNGb3JEdXBsaWNhdGVDb21wbGV0aW9uSGFuZGxlckNhbGxzID0gRFlM
RF9NQUNPU1hfVkVSU0lPTl8xMF8xMywKQEAgLTEwNyw2ICsxMDgsNyBAQCBlbnVtIGNsYXNzIFNE
S1ZlcnNpb24gOiB1aW50MzJfdCB7CiAgICAgRmlyc3RUaGF0UmVzdHJpY3RzQmFzZVVSTFNjaGVt
ZXMgPSBEWUxEX01BQ09TWF9WRVJTSU9OXzEwXzE1XzQsCiAgICAgRmlyc3RXaXRoU2Vzc2lvbkNs
ZWFudXBCeURlZmF1bHQgPSBEWUxEX01BQ09TX1ZFUlNJT05fRklSU1RfV0lUSF9TRVNTSU9OX0NM
RUFOVVBfQllfREVGQVVMVCwKICAgICBGaXJzdFdpdGhJbml0aWFsaXplV2ViS2l0Mk1haW5UaHJl
YWRBc3NlcnRpb24gPSBEWUxEX01BQ09TWF9WRVJTSU9OXzEwXzE2LAorICAgIEZpcnN0V2l0aFdL
V2Vic2l0ZURhdGFTdG9yZUluaXRSZXR1cm5pbmdOaWwgPSBEWUxEX01BQ09TWF9WRVJTSU9OXzEw
XzE2LAogI2VuZGlmCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDE1ZmU0YzEzZGNhYzU2OTJk
YzBjODhhZmQxNGJlNWMxOWYzMWNjNDUuLmFkZTFmMjAyNzY0ODI0YTEzYjRmMDI3NWNhYjY3ZjI5
YTljZDdkMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh
L1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNp
dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xMjQsNiArMTI0LDcgQEAgV2Vic2l0ZURh
dGFTdG9yZTo6V2Vic2l0ZURhdGFTdG9yZShSZWY8V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRp
b24+JiYgY29uZmlndXIKIFdlYnNpdGVEYXRhU3RvcmU6On5XZWJzaXRlRGF0YVN0b3JlKCkKIHsK
ICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgIFJFTEVBU0VfQVNTRVJUKG1fc2Vz
c2lvbklELmlzVmFsaWQoKSk7CiAKICAgICBwbGF0Zm9ybURlc3Ryb3koKTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402835</attachid>
            <date>2020-06-25 18:03:05 -0700</date>
            <delta_ts>2020-06-26 09:54:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213625-20200625180304.patch</filename>
            <type>text/plain</type>
            <size>7000</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY5YTE4MWVmOTcxZmZjM2Ew
NGUyODlhZDU4NmI0ODE1ZGE4M2Y5YTcuLmE0ZmJlNjg3YjM5ZTg5NDhhYWZkYmVhNDM5NWQ3YjAz
MDRmN2RlZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjAtMDYtMjUgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBOZXR3b3JrIHByb2Nlc3Mg
aXMgY3Jhc2hpbmcgd2hlbiBsYXVuY2hpbmcgVEpNYXh4IGFwcCBkdWUgdG8gaW52YWxpZCBOZXR3
b3JrUHJvY2Vzczo6RGVzdHJveVNlc3Npb24gSVBDIG1lc3NhZ2UKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYyNQorICAgICAgICA8cmRhcjovL3By
b2JsZW0vNjQ3Mzc4OTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgVGhlIGFwcCBpcyBjYWxsaW5nIFtXS1dlYnNpdGVEYXRhU3RvcmUgaW5pdF0gZGVz
cGl0ZSB0aGUgbWV0aG9kIGJlaW5nIG1hcmtlZCBhcyB1bmF2YWlsYWJsZSBpbgorICAgICAgICBX
S1dlYnNpdGVEYXRhU3RvcmUuaC4gQXMgYSByZXN1bHQsIHRoZXkgZW5kIHVwIHdpdGggYSBXS1dl
YnNpdGVEYXRhU3RvcmUgb2JqZWN0IHdob3NlIGludGVybmFsCisgICAgICAgIF93ZWJzaXRlRGF0
YVN0b3JlIGlzIGJhZCBiZWNhdXNlIGl0cyBjb25zdHJ1Y3RvciB3YXMgbmV2ZXIgY2FsbGVkLiBX
aGVuIFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVhbGxvY10KKyAgICAgICAgZ2V0cyBjYWxsZWQgbGF0
ZXIgb3duLCBpdCBjYWxscyB0aGUgfldlYnNpdGVEYXRhU3RvcmUoKSBkZXN0cnVjdG9yIGZvciBf
d2Vic2l0ZURhdGFTdG9yZSBidXQgaXRzCisgICAgICAgIG1fc2Vzc2lvbklEIGlzIDAgYmVjYXVz
ZSB3ZSBuZXZlciBjYWxsZWQgdGhlIGNvbnN0cnVjdG9yLiBUaGlzIGNhdXNlcyB1cyB0byBzZW5k
IGEKKyAgICAgICAgTmV0d29ya1Byb2Nlc3M6OkRlc3Ryb3lTZXNzaW9uIElQQyB3aXRoIGEgc2Vz
c2lvbklEIHRoYXQgaXMgMCwgd2hpY2ggaXMgbm90IHZhbGlkIHNvIHRoZQorICAgICAgICBOZXR3
b3JrUHJvY2VzcyBjcmFzaGVzLgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBu
b3cgcHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiBbV0tXZWJzaXRlRGF0YVN0b3JlIGluaXRd
IHdoaWNoIHJhaXNlcyBhbgorICAgICAgICBleGNlcHRpb24sIGJlaGluZCBhIGxpbmtlZC1vbi1h
ZnRlciBjaGVjay4gVG8ga2VlcCB0aGUgYXBwIHdvcmtpbmcsIFtXS1dlYnNpdGVEYXRhU3RvcmUg
aW5pdF0gcmV0dXJucworICAgICAgICBhIG5ldyBlcGhlbWVyYWwgZGF0YSBzdG9yZSB1bnRpbCBy
ZWJ1aWx0IHdpdGggdGhlIG5ldyBTREsuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h
L1dLV2Vic2l0ZURhdGFTdG9yZS5oOgorICAgICAgICBNYXJrICJuZXciIGFzIHVuYXZhaWxhYmxl
LCBvdGhlcndpc2UgW1dLV2Vic2l0ZURhdGFTdG9yZSBuZXddIGJ1aWxkcy4KKworICAgICAgICAq
IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoLVtX
S1dlYnNpdGVEYXRhU3RvcmUgaW5pdF0pOgorICAgICAgICBSYWlzZSBhbiBleGNlcHRpb24gd2l0
aCBsYXRlc3QgU0RLLCBhIG5ldyBlcGhlbWVyYWwgZGF0YSBzdG9yZSBvdGhlcndpc2UuCisKKyAg
ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVmVyc2lvbkNoZWNrcy5oOgorICAgICAgICBBZGQgbGlu
a2VkLW9uLWFmdGVyIGNoZWNrLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl
YnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjp+
V2Vic2l0ZURhdGFTdG9yZSk6CisgICAgICAgIEFkZCBhIHJlbGVhc2UgYXNzZXJ0aW9uIHRvIG1h
a2Ugc3VyZSB0aGF0IG1fc2Vzc2lvbklEIGlzIGFsd2F5cyB2YWxpZCB3aGVuIHRoZSBkZXN0cnVj
dG9yIGlzIGNhbGxlZC4KKwogMjAyMC0wNi0yNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu
Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjYzNTQ1LgpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5o
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5o
CmluZGV4IDcyNmM0OTcyYWEwYjMyZTBkYzYwMmUwYWIyZDcxZjZhZThlZjkzYWUuLjI0NTU4MGQ3
ZTE1Njc5YjgyYTYxYzQ2Mzk4NTBkYTAyZDgxYTRlMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUuaAorKysgYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTQ3LDYg
KzQ3LDcgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKDEwLjExKSwgaW9zKDkuMCkpCiAqLwog
KyAoV0tXZWJzaXRlRGF0YVN0b3JlICopbm9uUGVyc2lzdGVudERhdGFTdG9yZTsKIAorLSAoaW5z
dGFuY2V0eXBlKW5ldyBOU19VTkFWQUlMQUJMRTsKIC0gKGluc3RhbmNldHlwZSlpbml0IE5TX1VO
QVZBSUxBQkxFOwogCiAvKiEgQGFic3RyYWN0IFdoZXRoZXIgdGhlIGRhdGEgc3RvcmUgaXMgcGVy
c2lzdGVudCBvciBub3QuICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B
UEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
QVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCA1OTE0MjhmN2Y1NzllNzZmZjAx
YmM5NGI4M2Y1OTk0YWY4ZTQ4ZTAwLi5hNTk2NjBlOThmOWU0OThkMDIyYjU1YmNkYThiMWYzOTk4
NGI2YThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX
ZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv
YS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KQEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIkF1dGhl
bnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb25Db2NvYS5oIgogI2ltcG9ydCAiQ29tcGxldGlv
bkhhbmRsZXJDYWxsQ2hlY2tlci5oIgogI2ltcG9ydCAiU2hvdWxkR3JhbmRmYXRoZXJTdGF0aXN0
aWNzLmgiCisjaW1wb3J0ICJWZXJzaW9uQ2hlY2tzLmgiCiAjaW1wb3J0ICJXS0hUVFBDb29raWVT
dG9yZUludGVybmFsLmgiCiAjaW1wb3J0ICJXS05TQXJyYXkuaCIKICNpbXBvcnQgIldLTlNVUkxB
dXRoZW50aWNhdGlvbkNoYWxsZW5nZS5oIgpAQCAtMTE1LDkgKzExNiwyNyBAQCArIChXS1dlYnNp
dGVEYXRhU3RvcmUgKilub25QZXJzaXN0ZW50RGF0YVN0b3JlCiAgICAgcmV0dXJuIHdyYXBwZXIo
V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpjcmVhdGVOb25QZXJzaXN0ZW50KCkpOwogfQogCist
IChpbnN0YW5jZXR5cGUpaW5pdAoreworICAgIGlmIChXZWJLaXQ6OmxpbmtlZE9uT3JBZnRlcihX
ZWJLaXQ6OlNES1ZlcnNpb246OkZpcnN0V2l0aFdLV2Vic2l0ZURhdGFTdG9yZUluaXRSZXR1cm5p
bmdOaWwpKQorICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNHZW5lcmljRXhjZXB0aW9uIGZv
cm1hdDpAIkNhbGxpbmcgW1dLV2Vic2l0ZURhdGFTdG9yZSBpbml0XSBpcyBub3Qgc3VwcG9ydGVk
LiJdOworCisgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCisgICAgICAgIHJldHVybiBu
aWw7CisKKyAgICBfYnlwYXNzV2Vic2l0ZURhdGFTdG9yZURlc3RydWN0b3IgPSBZRVM7CisgICAg
W3NlbGYgYXV0b3JlbGVhc2VdOworCisgICAgLy8gVGhpcyBpcyBhIHdvcmthcm91bmQgZm9yIGFw
cHMgdGhhdCB3ZXJlIG1hbmFnaW5nIHRvIGNhbGwgW1dLV2Vic2l0ZURhdGFTdG9yZSBpbml0XS4K
KyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGV2ZW50dWFsbHkgZHJvcCB0aGlzIGFuZCBhbHdheXMg
cmV0dXJuIG5pbC4KKyAgICBSRUxFQVNFX0xPR19FUlJPUihTdG9yYWdlLCAiQXBwbGljYXRpb24g
aXMgY2FsbGluZyBbV0tXZWJzaXRlRGF0YVN0b3JlIGluaXRdLCB3aGljaCBpcyBub3Qgc3VwcG9y
dGVkIik7CisgICAgcmV0dXJuIFtbV0tXZWJzaXRlRGF0YVN0b3JlIG5vblBlcnNpc3RlbnREYXRh
U3RvcmVdIHJldGFpbl07Cit9CisKIC0gKHZvaWQpZGVhbGxvYwogewotICAgIF93ZWJzaXRlRGF0
YVN0b3JlLT5XZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6On5XZWJzaXRlRGF0YVN0b3JlKCk7Cisg
ICAgaWYgKCFfYnlwYXNzV2Vic2l0ZURhdGFTdG9yZURlc3RydWN0b3IpCisgICAgICAgIF93ZWJz
aXRlRGF0YVN0b3JlLT5XZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6On5XZWJzaXRlRGF0YVN0b3Jl
KCk7CiAKICAgICBbc3VwZXIgZGVhbGxvY107CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlSW50ZXJuYWwuaCBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVJbnRlcm5hbC5o
CmluZGV4IDA4MThlNGQyNGYwYmNiYTIzYmJjNGRiOTk5YjQzNTRhNzhlZTIzODQuLjM5NjNjMjBk
MzFkNTg0NTNiODM3NjZhNGQ5MGFmZWI2Y2UxZjY1NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVJbnRlcm5hbC5oCisrKyBi
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmVJbnRl
cm5hbC5oCkBAIC00MSw1ICs0MSw2IEBAIHRlbXBsYXRlPD4gc3RydWN0IFdyYXBwZXJUcmFpdHM8
V2Vic2l0ZURhdGFTdG9yZT4gewogQHBhY2thZ2UKICAgICBBUEk6Ok9iamVjdFN0b3JhZ2U8V2Vi
S2l0OjpXZWJzaXRlRGF0YVN0b3JlPiBfd2Vic2l0ZURhdGFTdG9yZTsKICAgICBXZWFrT2JqQ1B0
cjxpZCA8X1dLV2Vic2l0ZURhdGFTdG9yZURlbGVnYXRlPiA+IF9kZWxlZ2F0ZTsKKyAgICBCT09M
IF9ieXBhc3NXZWJzaXRlRGF0YVN0b3JlRGVzdHJ1Y3RvcjsKIH0KIEBlbmQKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZlcnNpb25DaGVja3MuaCBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZlcnNpb25DaGVja3MuaAppbmRleCAyZDFmNTg3MGYzYzEy
ZWJhODQ5ODhiMjI2NzkyNDlmMjU1NTBiZGZhLi44ODFlOTczOTc3NTc2YjgzZmE2ZTEyMDg4Mjhm
NzYyMTc2YmJmZDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9W
ZXJzaW9uQ2hlY2tzLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmVyc2lv
bkNoZWNrcy5oCkBAIC05NCw2ICs5NCw3IEBAIGVudW0gY2xhc3MgU0RLVmVyc2lvbiA6IHVpbnQz
Ml90IHsKICAgICBGaXJzdFdpdGhTZXNzaW9uQ2xlYW51cEJ5RGVmYXVsdCA9IERZTERfSU9TX1ZF
UlNJT05fRklSU1RfV0lUSF9TRVNTSU9OX0NMRUFOVVBfQllfREVGQVVMVCwKICAgICBGaXJzdFRo
YXRTZW5kc05hdGl2ZU1vdXNlRXZlbnRzID0gRFlMRF9JT1NfVkVSU0lPTl8xM180LAogICAgIEZp
cnN0V2l0aEluaXRpYWxpemVXZWJLaXQyTWFpblRocmVhZEFzc2VydGlvbiA9IERZTERfSU9TX1ZF
UlNJT05fMTRfMCwKKyAgICBGaXJzdFdpdGhXS1dlYnNpdGVEYXRhU3RvcmVJbml0UmV0dXJuaW5n
TmlsID0gRFlMRF9JT1NfVkVSU0lPTl8xNF8wLAogI2VsaWYgUExBVEZPUk0oTUFDKQogICAgIEZp
cnN0V2l0aE5ldHdvcmtDYWNoZSA9IERZTERfTUFDT1NYX1ZFUlNJT05fMTBfMTEsCiAgICAgRmly
c3RXaXRoRXhjZXB0aW9uc0ZvckR1cGxpY2F0ZUNvbXBsZXRpb25IYW5kbGVyQ2FsbHMgPSBEWUxE
X01BQ09TWF9WRVJTSU9OXzEwXzEzLApAQCAtMTA3LDYgKzEwOCw3IEBAIGVudW0gY2xhc3MgU0RL
VmVyc2lvbiA6IHVpbnQzMl90IHsKICAgICBGaXJzdFRoYXRSZXN0cmljdHNCYXNlVVJMU2NoZW1l
cyA9IERZTERfTUFDT1NYX1ZFUlNJT05fMTBfMTVfNCwKICAgICBGaXJzdFdpdGhTZXNzaW9uQ2xl
YW51cEJ5RGVmYXVsdCA9IERZTERfTUFDT1NfVkVSU0lPTl9GSVJTVF9XSVRIX1NFU1NJT05fQ0xF
QU5VUF9CWV9ERUZBVUxULAogICAgIEZpcnN0V2l0aEluaXRpYWxpemVXZWJLaXQyTWFpblRocmVh
ZEFzc2VydGlvbiA9IERZTERfTUFDT1NYX1ZFUlNJT05fMTBfMTYsCisgICAgRmlyc3RXaXRoV0tX
ZWJzaXRlRGF0YVN0b3JlSW5pdFJldHVybmluZ05pbCA9IERZTERfTUFDT1NYX1ZFUlNJT05fMTBf
MTYsCiAjZW5kaWYKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl
YnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggMTVmZTRjMTNkY2FjNTY5MmRj
MGM4OGFmZDE0YmU1YzE5ZjMxY2M0NS4uYWRlMWYyMDI3NjQ4MjRhMTNiNGYwMjc1Y2FiNjdmMjlh
OWNkN2QxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv
V2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0
ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTEyNCw2ICsxMjQsNyBAQCBXZWJzaXRlRGF0
YVN0b3JlOjpXZWJzaXRlRGF0YVN0b3JlKFJlZjxXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv
bj4mJiBjb25maWd1cgogV2Vic2l0ZURhdGFTdG9yZTo6fldlYnNpdGVEYXRhU3RvcmUoKQogewog
ICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisgICAgUkVMRUFTRV9BU1NFUlQobV9zZXNz
aW9uSUQuaXNWYWxpZCgpKTsKIAogICAgIHBsYXRmb3JtRGVzdHJveSgpOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402877</attachid>
            <date>2020-06-26 09:54:16 -0700</date>
            <delta_ts>2020-06-26 10:37:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213625-20200626095415.patch</filename>
            <type>text/plain</type>
            <size>5788</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjM1NTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDIwLTA2LTI2ICBDaHJpcyBEdW1l
eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTmV0d29yayBwcm9jZXNzIGlz
IGNyYXNoaW5nIHdoZW4gbGF1bmNoaW5nIFRKTWF4eCBhcHAgZHVlIHRvIGludmFsaWQgTmV0d29y
a1Byb2Nlc3M6OkRlc3Ryb3lTZXNzaW9uIElQQyBtZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM2MjUKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzY0NzM3ODkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisK
KyAgICAgICAgVGhlIGFwcCBpcyBjYWxsaW5nIFtXS1dlYnNpdGVEYXRhU3RvcmUgaW5pdF0gZGVz
cGl0ZSB0aGUgbWV0aG9kIGJlaW5nIG1hcmtlZCBhcyB1bmF2YWlsYWJsZSBpbgorICAgICAgICBX
S1dlYnNpdGVEYXRhU3RvcmUuaC4gQXMgYSByZXN1bHQsIHRoZXkgZW5kIHVwIHdpdGggYSBXS1dl
YnNpdGVEYXRhU3RvcmUgb2JqZWN0IHdob3NlIGludGVybmFsCisgICAgICAgIF93ZWJzaXRlRGF0
YVN0b3JlIGlzIGJhZCBiZWNhdXNlIGl0cyBjb25zdHJ1Y3RvciB3YXMgbmV2ZXIgY2FsbGVkLiBX
aGVuIFtXS1dlYnNpdGVEYXRhU3RvcmUgZGVhbGxvY10KKyAgICAgICAgZ2V0cyBjYWxsZWQgbGF0
ZXIgb3duLCBpdCBjYWxscyB0aGUgfldlYnNpdGVEYXRhU3RvcmUoKSBkZXN0cnVjdG9yIGZvciBf
d2Vic2l0ZURhdGFTdG9yZSBidXQgaXRzCisgICAgICAgIG1fc2Vzc2lvbklEIGlzIDAgYmVjYXVz
ZSB3ZSBuZXZlciBjYWxsZWQgdGhlIGNvbnN0cnVjdG9yLiBUaGlzIGNhdXNlcyB1cyB0byBzZW5k
IGEKKyAgICAgICAgTmV0d29ya1Byb2Nlc3M6OkRlc3Ryb3lTZXNzaW9uIElQQyB3aXRoIGEgc2Vz
c2lvbklEIHRoYXQgaXMgMCwgd2hpY2ggaXMgbm90IHZhbGlkIHNvIHRoZQorICAgICAgICBOZXR3
b3JrUHJvY2VzcyBjcmFzaGVzLgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBu
b3cgcHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiBbV0tXZWJzaXRlRGF0YVN0b3JlIGluaXRd
IHdoaWNoIHJhaXNlcyBhbgorICAgICAgICBleGNlcHRpb24sIGJlaGluZCBhIGxpbmtlZC1vbi1h
ZnRlciBjaGVjay4gVG8ga2VlcCB0aGUgYXBwIHdvcmtpbmcsIFtXS1dlYnNpdGVEYXRhU3RvcmUg
aW5pdF0gcmV0dXJucworICAgICAgICBhIG5ldyBlcGhlbWVyYWwgZGF0YSBzdG9yZSB1bnRpbCBy
ZWJ1aWx0IHdpdGggdGhlIG5ldyBTREsuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h
L1dLV2Vic2l0ZURhdGFTdG9yZS5oOgorICAgICAgICBNYXJrICJuZXciIGFzIHVuYXZhaWxhYmxl
LCBvdGhlcndpc2UgW1dLV2Vic2l0ZURhdGFTdG9yZSBuZXddIGJ1aWxkcy4KKworICAgICAgICAq
IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoLVtX
S1dlYnNpdGVEYXRhU3RvcmUgaW5pdF0pOgorICAgICAgICBSYWlzZSBhbiBleGNlcHRpb24gd2l0
aCBsYXRlc3QgU0RLLCBhIG5ldyBlcGhlbWVyYWwgZGF0YSBzdG9yZSBvdGhlcndpc2UuCisKKyAg
ICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVmVyc2lvbkNoZWNrcy5oOgorICAgICAgICBBZGQgbGlu
a2VkLW9uLWFmdGVyIGNoZWNrLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl
YnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjp+
V2Vic2l0ZURhdGFTdG9yZSk6CisgICAgICAgIEFkZCBhIHJlbGVhc2UgYXNzZXJ0aW9uIHRvIG1h
a2Ugc3VyZSB0aGF0IG1fc2Vzc2lvbklEIGlzIGFsd2F5cyB2YWxpZCB3aGVuIHRoZSBkZXN0cnVj
dG9yIGlzIGNhbGxlZC4KKwogMjAyMC0wNi0yNSAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu
ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVwc3RyZWFtIGRhdGUvdGltZSBwaWNrZXIgc3R5bGUK
SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3Rv
cmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX
ZWJzaXRlRGF0YVN0b3JlLmgJKHJldmlzaW9uIDI2MzQ1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAt
NDcsNiArNDcsNyBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTEpLCBpb3MoOS4wCiAq
LwogKyAoV0tXZWJzaXRlRGF0YVN0b3JlICopbm9uUGVyc2lzdGVudERhdGFTdG9yZTsKIAorLSAo
aW5zdGFuY2V0eXBlKW5ldyBOU19VTkFWQUlMQUJMRTsKIC0gKGluc3RhbmNldHlwZSlpbml0IE5T
X1VOQVZBSUxBQkxFOwogCiAvKiEgQGFic3RyYWN0IFdoZXRoZXIgdGhlIGRhdGEgc3RvcmUgaXMg
cGVyc2lzdGVudCBvciBub3QuICovCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv
Q29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0JKHJldmlzaW9uIDI2MzQ1
OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3Rv
cmUubW0JKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICNpbXBvcnQgIkF1dGhlbnRp
Y2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb25Db2NvYS5oIgogI2ltcG9ydCAiQ29tcGxldGlvbkhh
bmRsZXJDYWxsQ2hlY2tlci5oIgogI2ltcG9ydCAiU2hvdWxkR3JhbmRmYXRoZXJTdGF0aXN0aWNz
LmgiCisjaW1wb3J0ICJWZXJzaW9uQ2hlY2tzLmgiCiAjaW1wb3J0ICJXS0hUVFBDb29raWVTdG9y
ZUludGVybmFsLmgiCiAjaW1wb3J0ICJXS05TQXJyYXkuaCIKICNpbXBvcnQgIldLTlNVUkxBdXRo
ZW50aWNhdGlvbkNoYWxsZW5nZS5oIgpAQCAtMTE1LDYgKzExNiwyMCBAQCArIChXS1dlYnNpdGVE
YXRhU3RvcmUgKilub25QZXJzaXN0ZW50RGF0CiAgICAgcmV0dXJuIHdyYXBwZXIoV2ViS2l0OjpX
ZWJzaXRlRGF0YVN0b3JlOjpjcmVhdGVOb25QZXJzaXN0ZW50KCkpOwogfQogCistIChpbnN0YW5j
ZXR5cGUpaW5pdAoreworICAgIGlmIChXZWJLaXQ6OmxpbmtlZE9uT3JBZnRlcihXZWJLaXQ6OlNE
S1ZlcnNpb246OkZpcnN0V2l0aFdLV2Vic2l0ZURhdGFTdG9yZUluaXRSZXR1cm5pbmdOaWwpKQor
ICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNHZW5lcmljRXhjZXB0aW9uIGZvcm1hdDpAIkNh
bGxpbmcgW1dLV2Vic2l0ZURhdGFTdG9yZSBpbml0XSBpcyBub3Qgc3VwcG9ydGVkLiJdOworICAg
IAorICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQorICAgICAgICByZXR1cm4gbmlsOwor
CisgICAgUkVMRUFTRV9MT0dfRVJST1IoU3RvcmFnZSwgIkFwcGxpY2F0aW9uIGlzIGNhbGxpbmcg
W1dLV2Vic2l0ZURhdGFTdG9yZSBpbml0XSwgd2hpY2ggaXMgbm90IHN1cHBvcnRlZCIpOworICAg
IEFQSTo6T2JqZWN0Ojpjb25zdHJ1Y3RJbldyYXBwZXI8V2ViS2l0OjpXZWJzaXRlRGF0YVN0b3Jl
PihzZWxmLCBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uOjpjcmVhdGUoV2Vi
S2l0OjpJc1BlcnNpc3RlbnQ6Ok5vKSwgUEFMOjpTZXNzaW9uSUQ6OmdlbmVyYXRlRXBoZW1lcmFs
U2Vzc2lvbklEKCkpOworCisgICAgcmV0dXJuIHNlbGY7Cit9CisKIC0gKHZvaWQpZGVhbGxvYwog
ewogICAgIF93ZWJzaXRlRGF0YVN0b3JlLT5XZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6On5XZWJz
aXRlRGF0YVN0b3JlKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WZXJz
aW9uQ2hlY2tzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev
VmVyc2lvbkNoZWNrcy5oCShyZXZpc2lvbiAyNjM0NTkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9Db2NvYS9WZXJzaW9uQ2hlY2tzLmgJKHdvcmtpbmcgY29weSkKQEAgLTk0LDYgKzk0LDcg
QEAgZW51bSBjbGFzcyBTREtWZXJzaW9uIDogdWludDMyX3QgewogICAgIEZpcnN0V2l0aFNlc3Np
b25DbGVhbnVwQnlEZWZhdWx0ID0gRFlMRF9JT1NfVkVSU0lPTl9GSVJTVF9XSVRIX1NFU1NJT05f
Q0xFQU5VUF9CWV9ERUZBVUxULAogICAgIEZpcnN0VGhhdFNlbmRzTmF0aXZlTW91c2VFdmVudHMg
PSBEWUxEX0lPU19WRVJTSU9OXzEzXzQsCiAgICAgRmlyc3RXaXRoSW5pdGlhbGl6ZVdlYktpdDJN
YWluVGhyZWFkQXNzZXJ0aW9uID0gRFlMRF9JT1NfVkVSU0lPTl8xNF8wLAorICAgIEZpcnN0V2l0
aFdLV2Vic2l0ZURhdGFTdG9yZUluaXRSZXR1cm5pbmdOaWwgPSBEWUxEX0lPU19WRVJTSU9OXzE0
XzAsCiAjZWxpZiBQTEFURk9STShNQUMpCiAgICAgRmlyc3RXaXRoTmV0d29ya0NhY2hlID0gRFlM
RF9NQUNPU1hfVkVSU0lPTl8xMF8xMSwKICAgICBGaXJzdFdpdGhFeGNlcHRpb25zRm9yRHVwbGlj
YXRlQ29tcGxldGlvbkhhbmRsZXJDYWxscyA9IERZTERfTUFDT1NYX1ZFUlNJT05fMTBfMTMsCkBA
IC0xMDcsNiArMTA4LDcgQEAgZW51bSBjbGFzcyBTREtWZXJzaW9uIDogdWludDMyX3QgewogICAg
IEZpcnN0VGhhdFJlc3RyaWN0c0Jhc2VVUkxTY2hlbWVzID0gRFlMRF9NQUNPU1hfVkVSU0lPTl8x
MF8xNV80LAogICAgIEZpcnN0V2l0aFNlc3Npb25DbGVhbnVwQnlEZWZhdWx0ID0gRFlMRF9NQUNP
U19WRVJTSU9OX0ZJUlNUX1dJVEhfU0VTU0lPTl9DTEVBTlVQX0JZX0RFRkFVTFQsCiAgICAgRmly
c3RXaXRoSW5pdGlhbGl6ZVdlYktpdDJNYWluVGhyZWFkQXNzZXJ0aW9uID0gRFlMRF9NQUNPU1hf
VkVSU0lPTl8xMF8xNiwKKyAgICBGaXJzdFdpdGhXS1dlYnNpdGVEYXRhU3RvcmVJbml0UmV0dXJu
aW5nTmlsID0gRFlMRF9NQUNPU1hfVkVSU0lPTl8xMF8xNiwKICNlbmRpZgogfTsKIApJbmRleDog
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0
ZURhdGFTdG9yZS5jcHAJKHJldmlzaW9uIDI2MzQ1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x
MjQsNiArMTI0LDcgQEAgV2Vic2l0ZURhdGFTdG9yZTo6V2Vic2l0ZURhdGFTdG9yZShSZWY8Vwog
V2Vic2l0ZURhdGFTdG9yZTo6fldlYnNpdGVEYXRhU3RvcmUoKQogewogICAgIEFTU0VSVChSdW5M
b29wOjppc01haW4oKSk7CisgICAgUkVMRUFTRV9BU1NFUlQobV9zZXNzaW9uSUQuaXNWYWxpZCgp
KTsKIAogICAgIHBsYXRmb3JtRGVzdHJveSgpOwogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>