<?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>237455</bug_id>
          
          <creation_ts>2022-03-03 15:53:40 -0800</creation_ts>
          <short_desc>IDB serialization thread should pass isolated copy of IndexIDToIndexKeyMap to storage thread</short_desc>
          <delta_ts>2022-03-04 10:05:17 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebCore Misc.</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="Sihui Liu">sihui_liu</reporter>
          <assigned_to name="Sihui Liu">sihui_liu</assigned_to>
          <cc>alecflett</cc>
    
    <cc>beidson</cc>
    
    <cc>cdumez</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>jsbell</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1848101</commentid>
    <comment_count>0</comment_count>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-03-03 15:53:40 -0800</bug_when>
    <thetext>...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848104</commentid>
    <comment_count>1</comment_count>
      <attachid>453792</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-03-03 15:56:43 -0800</bug_when>
    <thetext>Created attachment 453792
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848124</commentid>
    <comment_count>2</comment_count>
      <attachid>453798</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-03-03 17:07:48 -0800</bug_when>
    <thetext>Created attachment 453798
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848307</commentid>
    <comment_count>3</comment_count>
      <attachid>453798</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2022-03-04 08:34:28 -0800</bug_when>
    <thetext>Comment on attachment 453798
Patch

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

r=me with improvement suggestion

&gt; Source/WebCore/bindings/js/IDBBindingUtilities.cpp:506
&gt; +        indexKeys.add(entry.key, indexKey.isolatedCopy());

I recommend `WTFMove(indexKey).isolatedCopy()`. A lot of types (like String) have special optimizations when isolatedCopy() is called on a r-value expression.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848315</commentid>
    <comment_count>4</comment_count>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-03-04 08:47:35 -0800</bug_when>
    <thetext>(In reply to Chris Dumez from comment #3)
&gt; Comment on attachment 453798 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=453798&amp;action=review
&gt; 
&gt; r=me with improvement suggestion
&gt; 
&gt; &gt; Source/WebCore/bindings/js/IDBBindingUtilities.cpp:506
&gt; &gt; +        indexKeys.add(entry.key, indexKey.isolatedCopy());
&gt; 
&gt; I recommend `WTFMove(indexKey).isolatedCopy()`. A lot of types (like String)
&gt; have special optimizations when isolatedCopy() is called on a r-value
&gt; expression.

Sure, will change.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848317</commentid>
    <comment_count>5</comment_count>
      <attachid>453848</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-03-04 08:50:05 -0800</bug_when>
    <thetext>Created attachment 453848
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848343</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-03-04 10:04:44 -0800</bug_when>
    <thetext>Committed r290836 (248072@main): &lt;https://commits.webkit.org/248072@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 453848.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1848344</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-03-04 10:05:17 -0800</bug_when>
    <thetext>&lt;rdar://problem/89820257&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453792</attachid>
            <date>2022-03-03 15:56:43 -0800</date>
            <delta_ts>2022-03-03 17:16:45 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237455-20220303155642.patch</filename>
            <type>text/plain</type>
            <size>2842</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM3NjI3YTk1ZDkyNTBi
ZTQzNzBkMTZkMTQ4NGQzMDBiMWRmYmI2Yy4uYTcwODY5NmFkZDJmZDFjN2RiNDcxMzRlMmQ1YjUy
YjJhNDM4NjAwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTAzICBTaWh1
aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIElEQiBzZXJpYWxpemF0aW9u
IHRocmVhZCBzaG91bGQgcGFzcyBpc29sYXRlZCBjb3B5IG9mIEluZGV4SURUb0luZGV4S2V5TWFw
IHRvIHN0b3JhZ2UgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzc0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6Ok1lbW9yeU9iamVjdFN0b3JlOjphZGRS
ZWNvcmQpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRh
YmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNl
OjpwdXRPckFkZCk6CisKIDIwMjItMDMtMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh
cHBsZS5jb20+CiAKICAgICAgICAgbmFzYS5nb3YgcGFnZSB3aXRoIGZpeGVkIGJhY2tncm91bmRz
IHBhaW50cyBpbmNvcnJlY3RseSBvbiBzY3JvbGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwCmlu
ZGV4IDJiNDc1ODg3NWVhZTQ1MGYwZTRlYzY3ODcxNWRhMTA4ZjgwOWY0ZmYuLmQ1OWRmNDA3OWM2
MDg3M2ZhMTQ5M2I3ZWUxYWI1NDJkNjJjNDhkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeU9iamVjdFN0b3JlLmNw
cApAQCAtMjQ3LDcgKzI0Nyw3IEBAIElEQkVycm9yIE1lbW9yeU9iamVjdFN0b3JlOjphZGRSZWNv
cmQoTWVtb3J5QmFja2luZ1N0b3JlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uCiB7CiAgICAgSW5k
ZXhJRFRvSW5kZXhLZXlNYXAgaW5kZXhLZXlzOwogICAgIGNhbGxPbklEQlNlcmlhbGl6YXRpb25U
aHJlYWRBbmRXYWl0KFtpbmZvID0gbV9pbmZvLmlzb2xhdGVkQ29weSgpLCBrZXlEYXRhID0ga2V5
RGF0YS5pc29sYXRlZENvcHkoKSwgdmFsdWUgPSB2YWx1ZS5pc29sYXRlZENvcHkoKSwgJmluZGV4
S2V5c10oYXV0byYgZ2xvYmFsT2JqZWN0KSB7Ci0gICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRl
SW5kZXhLZXlNYXBGb3JWYWx1ZShnbG9iYWxPYmplY3QsIGluZm8sIGtleURhdGEsIHZhbHVlKTsK
KyAgICAgICAgaW5kZXhLZXlzID0gZ2VuZXJhdGVJbmRleEtleU1hcEZvclZhbHVlKGdsb2JhbE9i
amVjdCwgaW5mbywga2V5RGF0YSwgdmFsdWUpLmlzb2xhdGVkQ29weSgpOwogICAgIH0pOwogICAg
IHJldHVybiBhZGRSZWNvcmQodHJhbnNhY3Rpb24sIGtleURhdGEsIGluZGV4S2V5cywgdmFsdWUp
OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy
L1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi
L3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKaW5kZXggODY4YzU3NDJlNTIzNjg0MjM5ODA1
NGNkN2JhZmUxMWM3MGE0YjFiOC4uY2Q5ODAzOTI5M2FkZmEyMjhjODg1ZGYzMGViZDRmNWNiOTQw
NTBiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy
L1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4
ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBAIC04ODgsNyArODg4LDcgQEAgdm9p
ZCBVbmlxdWVJREJEYXRhYmFzZTo6cHV0T3JBZGQoY29uc3QgSURCUmVxdWVzdERhdGEmIHJlcXVl
c3REYXRhLCBjb25zdCBJREJLZXkKICAgICAvLyBHZW5lcmF0ZSBpbmRleCBrZXlzIHVwIGZyb250
IGZvciBtb3JlIGFjY3VyYXRlIHF1b3RhIGNoZWNrLgogICAgIEluZGV4SURUb0luZGV4S2V5TWFw
IGluZGV4S2V5czsKICAgICBjYWxsT25JREJTZXJpYWxpemF0aW9uVGhyZWFkQW5kV2FpdChbb2Jq
ZWN0U3RvcmVJbmZvID0gb2JqZWN0U3RvcmVJbmZvLT5pc29sYXRlZENvcHkoKSwga2V5ID0gdXNl
ZEtleS5pc29sYXRlZENvcHkoKSwgdmFsdWUgPSB2YWx1ZS5pc29sYXRlZENvcHkoKSwgJmluZGV4
S2V5c10oYXV0byYgZ2xvYmFsT2JqZWN0KSB7Ci0gICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRl
SW5kZXhLZXlNYXBGb3JWYWx1ZShnbG9iYWxPYmplY3QsIG9iamVjdFN0b3JlSW5mbywga2V5LCB2
YWx1ZSk7CisgICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZShn
bG9iYWxPYmplY3QsIG9iamVjdFN0b3JlSW5mbywga2V5LCB2YWx1ZSkuaXNvbGF0ZWRDb3B5KCk7
CiAgICAgfSk7CiAKICAgICBnZW5lcmF0ZWRLZXlSZXNldHRlci5yZWxlYXNlKCk7Cg==
</data>
<flag name="commit-queue"
          id="481274"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453798</attachid>
            <date>2022-03-03 17:07:48 -0800</date>
            <delta_ts>2022-03-04 08:50:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-237455-20220303170747.patch</filename>
            <type>text/plain</type>
            <size>5218</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM3NjI3YTk1ZDkyNTBi
ZTQzNzBkMTZkMTQ4NGQzMDBiMWRmYmI2Yy4uMzZmOGNkMThjZjgzM2VhNmU3NTYxMWM2MTYwMWZm
NjI4N2M4ODA0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAzLTAzICBTaWh1
aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIElEQiBzZXJpYWxpemF0aW9u
IHRocmVhZCBzaG91bGQgcGFzcyBpc29sYXRlZCBjb3B5IG9mIEluZGV4SURUb0luZGV4S2V5TWFw
IHRvIHN0b3JhZ2UgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzc0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6Ok1lbW9yeU9iamVjdFN0b3JlOjphZGRS
ZWNvcmQpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRh
YmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNl
OjpwdXRPckFkZCk6CisgICAgICAgICogYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpnZW5lcmF0ZUluZGV4S2V5TWFwRm9yVmFsdWVJc29sYXRl
ZENvcHkpOgorICAgICAgICAoV2ViQ29yZTo6Z2VuZXJhdGVJbmRleEtleU1hcEZvclZhbHVlKTog
RGVsZXRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmg6CisK
IDIwMjItMDMtMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg
ICAgICAgbmFzYS5nb3YgcGFnZSB3aXRoIGZpeGVkIGJhY2tncm91bmRzIHBhaW50cyBpbmNvcnJl
Y3RseSBvbiBzY3JvbGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl
ZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz
L2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwCmluZGV4IDJiNDc1ODg3NWVh
ZTQ1MGYwZTRlYzY3ODcxNWRhMTA4ZjgwOWY0ZmYuLmM5ZGQxZDAzNmU3YzE5NGE5Y2NiMTQ2YzA1
YTA3NjMxYWQzZGRiM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl
ZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k
dWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeU9iamVjdFN0b3JlLmNwcApAQCAtMjQ3LDcgKzI0
Nyw3IEBAIElEQkVycm9yIE1lbW9yeU9iamVjdFN0b3JlOjphZGRSZWNvcmQoTWVtb3J5QmFja2lu
Z1N0b3JlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uCiB7CiAgICAgSW5kZXhJRFRvSW5kZXhLZXlN
YXAgaW5kZXhLZXlzOwogICAgIGNhbGxPbklEQlNlcmlhbGl6YXRpb25UaHJlYWRBbmRXYWl0KFtp
bmZvID0gbV9pbmZvLmlzb2xhdGVkQ29weSgpLCBrZXlEYXRhID0ga2V5RGF0YS5pc29sYXRlZENv
cHkoKSwgdmFsdWUgPSB2YWx1ZS5pc29sYXRlZENvcHkoKSwgJmluZGV4S2V5c10oYXV0byYgZ2xv
YmFsT2JqZWN0KSB7Ci0gICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JW
YWx1ZShnbG9iYWxPYmplY3QsIGluZm8sIGtleURhdGEsIHZhbHVlKTsKKyAgICAgICAgaW5kZXhL
ZXlzID0gZ2VuZXJhdGVJbmRleEtleU1hcEZvclZhbHVlSXNvbGF0ZWRDb3B5KGdsb2JhbE9iamVj
dCwgaW5mbywga2V5RGF0YSwgdmFsdWUpOwogICAgIH0pOwogICAgIHJldHVybiBhZGRSZWNvcmQo
dHJhbnNhY3Rpb24sIGtleURhdGEsIGluZGV4S2V5cywgdmFsdWUpOwogfQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNl
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJE
YXRhYmFzZS5jcHAKaW5kZXggODY4YzU3NDJlNTIzNjg0MjM5ODA1NGNkN2JhZmUxMWM3MGE0YjFi
OC4uNWI3NmVkNjNkMzM4YWJmMjMzYTg3YTRlNjI5NDc4MmJmNGIwYWVlNSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNl
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVl
SURCRGF0YWJhc2UuY3BwCkBAIC04ODgsNyArODg4LDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFz
ZTo6cHV0T3JBZGQoY29uc3QgSURCUmVxdWVzdERhdGEmIHJlcXVlc3REYXRhLCBjb25zdCBJREJL
ZXkKICAgICAvLyBHZW5lcmF0ZSBpbmRleCBrZXlzIHVwIGZyb250IGZvciBtb3JlIGFjY3VyYXRl
IHF1b3RhIGNoZWNrLgogICAgIEluZGV4SURUb0luZGV4S2V5TWFwIGluZGV4S2V5czsKICAgICBj
YWxsT25JREJTZXJpYWxpemF0aW9uVGhyZWFkQW5kV2FpdChbb2JqZWN0U3RvcmVJbmZvID0gb2Jq
ZWN0U3RvcmVJbmZvLT5pc29sYXRlZENvcHkoKSwga2V5ID0gdXNlZEtleS5pc29sYXRlZENvcHko
KSwgdmFsdWUgPSB2YWx1ZS5pc29sYXRlZENvcHkoKSwgJmluZGV4S2V5c10oYXV0byYgZ2xvYmFs
T2JqZWN0KSB7Ci0gICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1
ZShnbG9iYWxPYmplY3QsIG9iamVjdFN0b3JlSW5mbywga2V5LCB2YWx1ZSk7CisgICAgICAgIGlu
ZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZUlzb2xhdGVkQ29weShnbG9iYWxP
YmplY3QsIG9iamVjdFN0b3JlSW5mbywga2V5LCB2YWx1ZSk7CiAgICAgfSk7CiAKICAgICBnZW5l
cmF0ZWRLZXlSZXNldHRlci5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i
aW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp
bmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuY3BwCmluZGV4IDFjYTBkNjU3MzIxMGJmMWE4MGQ4
OTJhYTJiNzE4ZTY1YWVjNjA0NmUuLjU0ZWRmYzRmYmEzMzMwNDFiMDFlNWE4NTU3NGJhMzc0ZGNi
ZDMxZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdV
dGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdV
dGlsaXRpZXMuY3BwCkBAIC00ODEsNyArNDgxLDcgQEAgdm9pZCBnZW5lcmF0ZUluZGV4S2V5Rm9y
VmFsdWUoSlNHbG9iYWxPYmplY3QmIGxleGljYWxHbG9iYWxPYmplY3QsIGNvbnN0IElEQkluZGUK
ICAgICBvdXRLZXkgPSBJbmRleEtleShXVEZNb3ZlKGtleURhdGFzKSk7CiB9CiAKLUluZGV4SURU
b0luZGV4S2V5TWFwIGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZShKU0M6OkpTR2xvYmFsT2Jq
ZWN0JiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBjb25zdCBJREJPYmplY3RTdG9yZUluZm8mIHN0b3Jl
SW5mbywgY29uc3QgSURCS2V5RGF0YSYga2V5LCBjb25zdCBJREJWYWx1ZSYgdmFsdWUpCitJbmRl
eElEVG9JbmRleEtleU1hcCBnZW5lcmF0ZUluZGV4S2V5TWFwRm9yVmFsdWVJc29sYXRlZENvcHko
SlNDOjpKU0dsb2JhbE9iamVjdCYgbGV4aWNhbEdsb2JhbE9iamVjdCwgY29uc3QgSURCT2JqZWN0
U3RvcmVJbmZvJiBzdG9yZUluZm8sIGNvbnN0IElEQktleURhdGEmIGtleSwgY29uc3QgSURCVmFs
dWUmIHZhbHVlKQogewogICAgIGF1dG8mIGluZGV4TWFwID0gc3RvcmVJbmZvLmluZGV4TWFwKCk7
CiAgICAgYXV0byBpbmRleENvdW50ID0gaW5kZXhNYXAuc2l6ZSgpOwpAQCAtNTAzLDcgKzUwMyw3
IEBAIEluZGV4SURUb0luZGV4S2V5TWFwIGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZShKU0M6
OkpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvCiAgICAgICAgIGlmIChpbmRleEtleS5pc051bGwo
KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGluZGV4S2V5cy5hZGQoZW50cnku
a2V5LCBXVEZNb3ZlKGluZGV4S2V5KSk7CisgICAgICAgIGluZGV4S2V5cy5hZGQoZW50cnkua2V5
LCBpbmRleEtleS5pc29sYXRlZENvcHkoKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGluZGV4S2V5
czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGls
aXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMu
aAppbmRleCBhMGRkMTE2OWQ1NDU2ZGQxMzczNTQyZTVmZGM3NzdhMTdiMzc5OGVkLi42NDYzNDJi
YzNhZDY2ZmRiZTJlOWUzMDRmYTY4NmRkMGU5YzlkNjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNv
cmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5oCkBAIC01Miw3ICs1Miw3IEBAIGJv
b2wgaW5qZWN0SURCS2V5SW50b1NjcmlwdFZhbHVlKEpTQzo6SlNHbG9iYWxPYmplY3QmLCBjb25z
dCBJREJLZXlEYXRhJiwgSlNDOjpKCiAKIHZvaWQgZ2VuZXJhdGVJbmRleEtleUZvclZhbHVlKEpT
Qzo6SlNHbG9iYWxPYmplY3QmLCBjb25zdCBJREJJbmRleEluZm8mLCBKU0M6OkpTVmFsdWUsIElu
ZGV4S2V5JiBvdXRLZXksIGNvbnN0IHN0ZDo6b3B0aW9uYWw8SURCS2V5UGF0aD4mLCBjb25zdCBJ
REJLZXlEYXRhJik7CiAKLUluZGV4SURUb0luZGV4S2V5TWFwIGdlbmVyYXRlSW5kZXhLZXlNYXBG
b3JWYWx1ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiwgY29uc3QgSURCT2JqZWN0U3RvcmVJbmZvJiwg
Y29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IElEQlZhbHVlJik7CitJbmRleElEVG9JbmRleEtleU1h
cCBnZW5lcmF0ZUluZGV4S2V5TWFwRm9yVmFsdWVJc29sYXRlZENvcHkoSlNDOjpKU0dsb2JhbE9i
amVjdCYsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIGNvbnN0IElEQktleURhdGEmLCBjb25z
dCBJREJWYWx1ZSYpOwogCiBSZWY8SURCS2V5PiBzY3JpcHRWYWx1ZVRvSURCS2V5KEpTQzo6SlNH
bG9iYWxPYmplY3QmLCBKU0M6OkpTVmFsdWUpOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>453848</attachid>
            <date>2022-03-04 08:50:05 -0800</date>
            <delta_ts>2022-03-04 10:04:46 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-237455-20220304085005.patch</filename>
            <type>text/plain</type>
            <size>5179</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ5NjA5NzYyYjgwNTJk
ODdiMWUzNjBiNjVhNzhmMzYyZjk1YjM5YS4uMzdkYTBmMjE5Y2I4MjNiMTJmZTg3ODljNGZmZGNi
ZWM1MWQzNjA1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAzLTA0ICBTaWh1
aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIElEQiBzZXJpYWxpemF0aW9u
IHRocmVhZCBzaG91bGQgcGFzcyBpc29sYXRlZCBjb3B5IG9mIEluZGV4SURUb0luZGV4S2V5TWFw
IHRvIHN0b3JhZ2UgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzc0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKwor
ICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6Ok1lbW9yeU9iamVjdFN0b3JlOjphZGRSZWNv
cmQpOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFz
ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpw
dXRPckFkZCk6CisgICAgICAgICogYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpnZW5lcmF0ZUluZGV4S2V5TWFwRm9yVmFsdWVJc29sYXRlZENv
cHkpOgorICAgICAgICAoV2ViQ29yZTo6Z2VuZXJhdGVJbmRleEtleU1hcEZvclZhbHVlKTogRGVs
ZXRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmg6CisKIDIw
MjItMDMtMDQgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBUb3AgbGF5
ZXJzIHNob3VsZCBub3QgYmUgbW92ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29y
ZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvTWVtb3J5T2JqZWN0U3RvcmUuY3BwCmluZGV4IDJi
NDc1ODg3NWVhZTQ1MGYwZTRlYzY3ODcxNWRhMTA4ZjgwOWY0ZmYuLmM5ZGQxZDAzNmU3YzE5NGE5
Y2NiMTQ2YzA1YTA3NjMxYWQzZGRiM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs
ZXMvaW5kZXhlZGRiL3NlcnZlci9NZW1vcnlPYmplY3RTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL01lbW9yeU9iamVjdFN0b3JlLmNwcApAQCAt
MjQ3LDcgKzI0Nyw3IEBAIElEQkVycm9yIE1lbW9yeU9iamVjdFN0b3JlOjphZGRSZWNvcmQoTWVt
b3J5QmFja2luZ1N0b3JlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uCiB7CiAgICAgSW5kZXhJRFRv
SW5kZXhLZXlNYXAgaW5kZXhLZXlzOwogICAgIGNhbGxPbklEQlNlcmlhbGl6YXRpb25UaHJlYWRB
bmRXYWl0KFtpbmZvID0gbV9pbmZvLmlzb2xhdGVkQ29weSgpLCBrZXlEYXRhID0ga2V5RGF0YS5p
c29sYXRlZENvcHkoKSwgdmFsdWUgPSB2YWx1ZS5pc29sYXRlZENvcHkoKSwgJmluZGV4S2V5c10o
YXV0byYgZ2xvYmFsT2JqZWN0KSB7Ci0gICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhL
ZXlNYXBGb3JWYWx1ZShnbG9iYWxPYmplY3QsIGluZm8sIGtleURhdGEsIHZhbHVlKTsKKyAgICAg
ICAgaW5kZXhLZXlzID0gZ2VuZXJhdGVJbmRleEtleU1hcEZvclZhbHVlSXNvbGF0ZWRDb3B5KGds
b2JhbE9iamVjdCwgaW5mbywga2V5RGF0YSwgdmFsdWUpOwogICAgIH0pOwogICAgIHJldHVybiBh
ZGRSZWNvcmQodHJhbnNhY3Rpb24sIGtleURhdGEsIGluZGV4S2V5cywgdmFsdWUpOwogfQpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlE
QkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9V
bmlxdWVJREJEYXRhYmFzZS5jcHAKaW5kZXggODY4YzU3NDJlNTIzNjg0MjM5ODA1NGNkN2JhZmUx
MWM3MGE0YjFiOC4uNWI3NmVkNjNkMzM4YWJmMjMzYTg3YTRlNjI5NDc4MmJmNGIwYWVlNSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlE
QkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2
ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBAIC04ODgsNyArODg4LDcgQEAgdm9pZCBVbmlxdWVJ
REJEYXRhYmFzZTo6cHV0T3JBZGQoY29uc3QgSURCUmVxdWVzdERhdGEmIHJlcXVlc3REYXRhLCBj
b25zdCBJREJLZXkKICAgICAvLyBHZW5lcmF0ZSBpbmRleCBrZXlzIHVwIGZyb250IGZvciBtb3Jl
IGFjY3VyYXRlIHF1b3RhIGNoZWNrLgogICAgIEluZGV4SURUb0luZGV4S2V5TWFwIGluZGV4S2V5
czsKICAgICBjYWxsT25JREJTZXJpYWxpemF0aW9uVGhyZWFkQW5kV2FpdChbb2JqZWN0U3RvcmVJ
bmZvID0gb2JqZWN0U3RvcmVJbmZvLT5pc29sYXRlZENvcHkoKSwga2V5ID0gdXNlZEtleS5pc29s
YXRlZENvcHkoKSwgdmFsdWUgPSB2YWx1ZS5pc29sYXRlZENvcHkoKSwgJmluZGV4S2V5c10oYXV0
byYgZ2xvYmFsT2JqZWN0KSB7Ci0gICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhLZXlN
YXBGb3JWYWx1ZShnbG9iYWxPYmplY3QsIG9iamVjdFN0b3JlSW5mbywga2V5LCB2YWx1ZSk7Cisg
ICAgICAgIGluZGV4S2V5cyA9IGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZUlzb2xhdGVkQ29w
eShnbG9iYWxPYmplY3QsIG9iamVjdFN0b3JlSW5mbywga2V5LCB2YWx1ZSk7CiAgICAgfSk7CiAK
ICAgICBnZW5lcmF0ZWRLZXlSZXNldHRlci5yZWxlYXNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuY3BwCmluZGV4IDFjYTBkNjU3MzIx
MGJmMWE4MGQ4OTJhYTJiNzE4ZTY1YWVjNjA0NmUuLjA2YWNjYTM1NWQ3Zjg0NjE4ZjBkNWNkM2Fj
MmY1M2ZmMDE0ODM1OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lE
QkJpbmRpbmdVdGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lE
QkJpbmRpbmdVdGlsaXRpZXMuY3BwCkBAIC00ODEsNyArNDgxLDcgQEAgdm9pZCBnZW5lcmF0ZUlu
ZGV4S2V5Rm9yVmFsdWUoSlNHbG9iYWxPYmplY3QmIGxleGljYWxHbG9iYWxPYmplY3QsIGNvbnN0
IElEQkluZGUKICAgICBvdXRLZXkgPSBJbmRleEtleShXVEZNb3ZlKGtleURhdGFzKSk7CiB9CiAK
LUluZGV4SURUb0luZGV4S2V5TWFwIGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZShKU0M6OkpT
R2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBjb25zdCBJREJPYmplY3RTdG9yZUlu
Zm8mIHN0b3JlSW5mbywgY29uc3QgSURCS2V5RGF0YSYga2V5LCBjb25zdCBJREJWYWx1ZSYgdmFs
dWUpCitJbmRleElEVG9JbmRleEtleU1hcCBnZW5lcmF0ZUluZGV4S2V5TWFwRm9yVmFsdWVJc29s
YXRlZENvcHkoSlNDOjpKU0dsb2JhbE9iamVjdCYgbGV4aWNhbEdsb2JhbE9iamVjdCwgY29uc3Qg
SURCT2JqZWN0U3RvcmVJbmZvJiBzdG9yZUluZm8sIGNvbnN0IElEQktleURhdGEmIGtleSwgY29u
c3QgSURCVmFsdWUmIHZhbHVlKQogewogICAgIGF1dG8mIGluZGV4TWFwID0gc3RvcmVJbmZvLmlu
ZGV4TWFwKCk7CiAgICAgYXV0byBpbmRleENvdW50ID0gaW5kZXhNYXAuc2l6ZSgpOwpAQCAtNTAz
LDcgKzUwMyw3IEBAIEluZGV4SURUb0luZGV4S2V5TWFwIGdlbmVyYXRlSW5kZXhLZXlNYXBGb3JW
YWx1ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvCiAgICAgICAgIGlmIChpbmRleEtl
eS5pc051bGwoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGluZGV4S2V5cy5h
ZGQoZW50cnkua2V5LCBXVEZNb3ZlKGluZGV4S2V5KSk7CisgICAgICAgIGluZGV4S2V5cy5hZGQo
ZW50cnkua2V5LCBXVEZNb3ZlKGluZGV4S2V5KS5pc29sYXRlZENvcHkoKSk7CiAgICAgfQogCiAg
ICAgcmV0dXJuIGluZGV4S2V5czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz
L2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lE
QkJpbmRpbmdVdGlsaXRpZXMuaAppbmRleCBhMGRkMTE2OWQ1NDU2ZGQxMzczNTQyZTVmZGM3Nzdh
MTdiMzc5OGVkLi42NDYzNDJiYzNhZDY2ZmRiZTJlOWUzMDRmYTY4NmRkMGU5YzlkNjcyIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmgK
KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5oCkBA
IC01Miw3ICs1Miw3IEBAIGJvb2wgaW5qZWN0SURCS2V5SW50b1NjcmlwdFZhbHVlKEpTQzo6SlNH
bG9iYWxPYmplY3QmLCBjb25zdCBJREJLZXlEYXRhJiwgSlNDOjpKCiAKIHZvaWQgZ2VuZXJhdGVJ
bmRleEtleUZvclZhbHVlKEpTQzo6SlNHbG9iYWxPYmplY3QmLCBjb25zdCBJREJJbmRleEluZm8m
LCBKU0M6OkpTVmFsdWUsIEluZGV4S2V5JiBvdXRLZXksIGNvbnN0IHN0ZDo6b3B0aW9uYWw8SURC
S2V5UGF0aD4mLCBjb25zdCBJREJLZXlEYXRhJik7CiAKLUluZGV4SURUb0luZGV4S2V5TWFwIGdl
bmVyYXRlSW5kZXhLZXlNYXBGb3JWYWx1ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiwgY29uc3QgSURC
T2JqZWN0U3RvcmVJbmZvJiwgY29uc3QgSURCS2V5RGF0YSYsIGNvbnN0IElEQlZhbHVlJik7CitJ
bmRleElEVG9JbmRleEtleU1hcCBnZW5lcmF0ZUluZGV4S2V5TWFwRm9yVmFsdWVJc29sYXRlZENv
cHkoSlNDOjpKU0dsb2JhbE9iamVjdCYsIGNvbnN0IElEQk9iamVjdFN0b3JlSW5mbyYsIGNvbnN0
IElEQktleURhdGEmLCBjb25zdCBJREJWYWx1ZSYpOwogCiBSZWY8SURCS2V5PiBzY3JpcHRWYWx1
ZVRvSURCS2V5KEpTQzo6SlNHbG9iYWxPYmplY3QmLCBKU0M6OkpTVmFsdWUpOwogCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>