<?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>236905</bug_id>
          
          <creation_ts>2022-02-19 21:14:23 -0800</creation_ts>
          <short_desc>Fetching website data may get wrong record after migrating data to general storage directory</short_desc>
          <delta_ts>2022-02-21 01:25:18 -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>Website Storage</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>cdumez</cc>
    
    <cc>sihui_liu</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1843964</commentid>
    <comment_count>0</comment_count>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-02-19 21:14:23 -0800</bug_when>
    <thetext>...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844025</commentid>
    <comment_count>1</comment_count>
      <attachid>452679</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-02-19 23:12:34 -0800</bug_when>
    <thetext>Created attachment 452679
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844116</commentid>
    <comment_count>2</comment_count>
      <attachid>452712</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-02-20 23:09:17 -0800</bug_when>
    <thetext>Created attachment 452712
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844118</commentid>
    <comment_count>3</comment_count>
      <attachid>452713</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2022-02-20 23:09:57 -0800</bug_when>
    <thetext>Created attachment 452713
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844147</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-21 01:24:50 -0800</bug_when>
    <thetext>Committed r290239 (247564@main): &lt;https://commits.webkit.org/247564@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 452713.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1844148</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2022-02-21 01:25:18 -0800</bug_when>
    <thetext>&lt;rdar://problem/89223493&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452679</attachid>
            <date>2022-02-19 23:12:34 -0800</date>
            <delta_ts>2022-02-20 23:09:13 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-236905-20220219231233.patch</filename>
            <type>text/plain</type>
            <size>6123</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNGJmYTU0YWE3MzEyZGZk
OWJkNzBlNGM3MmVlMTNjMjU5MjU1YmEuLjJmOGRmMWM5M2U2MDg0ODY5OTlkMzE4YTI5MjM4MGVi
MDNkYjdkNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDItMTkgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmV0Y2hpbmcgd2Vic2l0ZSBkYXRh
IG1heSBnZXQgd3JvbmcgcmVjb3JkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3Rv
cmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzNjkwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFRvIGRlY2lkZSBpZiBhbiBvcmlnaW4gaGFzIGRhdGEsIHdlIG5lZWQgdG8gbm90IG9u
bHkgY2hlY2sgaWYgaXRzIGRpcmVjdG9yeSBleGlzdHMgYnV0IGFsc28gaWYgdGhlIGRpcmVjdG9y
eSBpcyAKKyAgICAgICAgZW1wdHkuCisKKyAgICAgICAgTW9kaWZpZWQgZXhpc3RpbmcgdGVzdCB0
byBhZGQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2Uv
T3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdl
TWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6cmVzb2x2ZWRMb2NhbFN0b3JhZ2VQYXRoKToKKyAgICAg
ICAgKFdlYktpdDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OnJlc29sdmVk
SURCU3RvcmFnZVBhdGgpOiBkaXJlY3Rvcnkgc2hvdWxkIGJlIGNyZWF0ZWQgYmVmb3JlIG1vdmlu
ZworICAgICAgICBmaWxlcy4KKyAgICAgICAgKFdlYktpdDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6
OlN0b3JhZ2VCdWNrZXQ6OmZldGNoRGF0YVR5cGVzSW5MaXN0RnJvbURpc2spOiBnaXZlbiB0aGF0
IElEQiBhbmQgTG9jYWxTdG9yYWdlIGNhbgorICAgICAgICBoYXZlIGN1c3RvbSBwYXRocywgd2Ug
bWF5IGp1c3QgY2hlY2sgZGF0YSBieSB0eXBlLgorCiAyMDIyLTAyLTE5ICBUaW0gSG9ydG9uICA8
dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIG1hY0NhdGFseXN0OiBXS1dlYlZp
ZXcgY3Jhc2hlcyB3aGVuZXZlciB0aGUgdmlldyBmcmFtZSBjaGFuZ2VzCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIu
Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VN
YW5hZ2VyLmNwcAppbmRleCA0MWUzMThjMDk3ZjkzZDI0ZWFkN2MwYmM5ZGNiMTEzNDRkOTA1OTdm
Li5iZGRmNmJlY2MzMTczNWNmNTk4ZDE4YTZmYjFlNzlkNzIzMzdhMGQyIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9PcmlnaW5TdG9y
YWdlTWFuYWdlci5jcHAKQEAgLTI1OCw3ICsyNTgsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBG
aWxlU3lzdGVtOjpleGNsdWRlRnJvbUJhY2t1cChsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwogCiAg
ICAgICAgICAgICBhdXRvIGxvY2FsU3RvcmFnZVBhdGggPSBMb2NhbFN0b3JhZ2VNYW5hZ2VyOjps
b2NhbFN0b3JhZ2VGaWxlUGF0aChsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwotICAgICAgICAgICAg
aWYgKCFtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpICYmICFGaWxlU3lzdGVtOjpm
aWxlRXhpc3RzKGxvY2FsU3RvcmFnZVBhdGgpKQorICAgICAgICAgICAgaWYgKCFtX2N1c3RvbUxv
Y2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpICYmICFGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKGxvY2Fs
U3RvcmFnZVBhdGgpICYmIEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobV9jdXN0b21Mb2NhbFN0b3Jh
Z2VQYXRoKSkKICAgICAgICAgICAgICAgICBXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVtOjptb3Zl
RGF0YWJhc2VGaWxlKG1fY3VzdG9tTG9jYWxTdG9yYWdlUGF0aCwgbG9jYWxTdG9yYWdlUGF0aCk7
CiAKICAgICAgICAgICAgIG1fcmVzb2x2ZWRMb2NhbFN0b3JhZ2VQYXRoID0gbG9jYWxTdG9yYWdl
UGF0aDsKQEAgLTI4MCw5ICsyODAsOSBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX3Jlc29sdmVk
SURCU3RvcmFnZVBhdGggPSBtX2N1c3RvbUlEQlN0b3JhZ2VQYXRoOwogICAgICAgICB9IGVsc2Ug
ewogICAgICAgICAgICAgYXV0byBpZGJTdG9yYWdlUGF0aCA9IHR5cGVTdG9yYWdlUGF0aChTdG9y
YWdlVHlwZTo6SW5kZXhlZERCKTsKLSAgICAgICAgICAgIGlmICghbV9jdXN0b21JREJTdG9yYWdl
UGF0aC5pc0VtcHR5KCkgJiYgIUZpbGVTeXN0ZW06OmZpbGVFeGlzdHMoaWRiU3RvcmFnZVBhdGgp
KSB7Ci0gICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6bW92ZUZpbGUobV9jdXN0b21JREJTdG9y
YWdlUGF0aCwgaWRiU3RvcmFnZVBhdGgpOworICAgICAgICAgICAgaWYgKCFtX2N1c3RvbUlEQlN0
b3JhZ2VQYXRoLmlzRW1wdHkoKSAmJiAhRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhpZGJTdG9yYWdl
UGF0aCkgJiYgRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhtX2N1c3RvbUlEQlN0b3JhZ2VQYXRoKSkg
ewogICAgICAgICAgICAgICAgIEZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3RvcmllcyhpZGJTdG9y
YWdlUGF0aCk7CisgICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6bW92ZUZpbGUobV9jdXN0b21J
REJTdG9yYWdlUGF0aCwgaWRiU3RvcmFnZVBhdGgpOwogICAgICAgICAgICAgfQogCiAgICAgICAg
ICAgICBtX3Jlc29sdmVkSURCU3RvcmFnZVBhdGggPSBpZGJTdG9yYWdlUGF0aDsKQEAgLTMxNywx
NyArMzE3LDE4IEBAIHByaXZhdGU6CiAgICAgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZmV0
Y2hEYXRhVHlwZXNJbkxpc3RGcm9tRGlzayhPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiB0eXBl
cykKICAgICB7CiAgICAgICAgIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IHJlc3VsdDsKLSAg
ICAgICAgZm9yIChhdXRvJiBzdG9yYWdlVHlwZSA6IEZpbGVTeXN0ZW06Omxpc3REaXJlY3Rvcnko
bV9yb290UGF0aCkpIHsKLSAgICAgICAgICAgIGlmIChhdXRvIHR5cGUgPSB0b1dlYnNpdGVEYXRh
VHlwZShzdG9yYWdlVHlwZSk7IHR5cGUgJiYgdHlwZXMuY29udGFpbnMoKnR5cGUpKQotICAgICAg
ICAgICAgICAgIHJlc3VsdC5hZGQoKnR5cGUpOworICAgICAgICBpZiAodHlwZXMuY29udGFpbnMo
V2Vic2l0ZURhdGFUeXBlOjpGaWxlU3lzdGVtKSkgeworICAgICAgICAgICAgYXV0byBmaWxlU3lz
dGVtU3RvcmFnZVBhdGggPSB0eXBlU3RvcmFnZVBhdGgoU3RvcmFnZVR5cGU6OkZpbGVTeXN0ZW0p
OworICAgICAgICAgICAgaWYgKGF1dG8gZmlsZXMgPSBGaWxlU3lzdGVtOjpsaXN0RGlyZWN0b3J5
KGZpbGVTeXN0ZW1TdG9yYWdlUGF0aCk7ICFmaWxlcy5pc0VtcHR5KCkpCisgICAgICAgICAgICAg
ICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5cGU6OkZpbGVTeXN0ZW0pOwogICAgICAgICB9CiAK
LSAgICAgICAgaWYgKHR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9yYWdl
KSAmJiAhcmVzdWx0LmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9yYWdlKSkgewor
ICAgICAgICBpZiAodHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpMb2NhbFN0b3JhZ2Up
KSB7CiAgICAgICAgICAgICBpZiAoRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhyZXNvbHZlZExvY2Fs
U3RvcmFnZVBhdGgoKSkpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5
cGU6OkxvY2FsU3RvcmFnZSk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodHlwZXMuY29udGFp
bnMoV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVkREJEYXRhYmFzZXMpICYmICFyZXN1bHQuY29udGFp
bnMoV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVkREJEYXRhYmFzZXMpKSB7CisgICAgICAgIGlmICh0
eXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6OkluZGV4ZWREQkRhdGFiYXNlcykpIHsKICAg
ICAgICAgICAgIGlmIChhdXRvIGRhdGFiYXNlcyA9IEZpbGVTeXN0ZW06Omxpc3REaXJlY3Rvcnko
cmVzb2x2ZWRJREJTdG9yYWdlUGF0aCgpKTsgIWRhdGFiYXNlcy5pc0VtcHR5KCkpCiAgICAgICAg
ICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5cGU6OkluZGV4ZWREQkRhdGFiYXNlcyk7
CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv
ZwppbmRleCBmMjY0MDJlMDg4Y2VmZGZhZTE4YmY3YjU4ZWRjYTk1YjE0YmJkOTQ2Li40YTcxNDlh
NmI2Mzg4MDUyYWFhNGVkMDZjNjg4MTI5NDQyMTEyY2NjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu
Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMTkg
IFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmV0Y2hpbmcgd2Vi
c2l0ZSBkYXRhIG1heSBnZXQgd3JvbmcgcmVjb3JkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdl
bmVyYWwgc3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIzNjkwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRl
RGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06CisgICAgICAgIChURVNUKToKKwogMjAyMi0wMi0xOSAg
U2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBTZXQgY3VzdG9tIGdl
bmVyYWwgc3RvcmFnZSBkaXJlY3RvcnkgZm9yIGN1c3RvbSBXZWJzaXRlRGF0YVN0b3JlIGluIFRl
c3RDb250cm9sbGVyCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp
dENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB
UEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4
IDBkNzM5MzNmOTZjZmJhZjBlOGY4ZWYyNjhmMzJjNzUyODQ2NDA5NGMuLjA2Y2Y3MWM3M2ZmMGZm
ZmNiYzZmY2UyMGM2MWU1YjFlODkyMTQxNWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB
UEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCisrKyBi
L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1
c3RvbVBhdGhzLm1tCkBAIC0xMDcwLDQgKzEwNzAsMTIgQEAgVEVTVChXZWJLaXQsIERlbGV0ZURh
dGFBZnRlckVuYWJsaW5nR2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkpCiAgICAgLy8gRW5zdXJlIGFw
cGxlLmNvbSBkYXRhIGlzIG5vdCBqdXN0IG1vdmVkIGJ1dCBhY3R1YWxseSBkZWxldGVkLgogICAg
IEVYUEVDVF9GQUxTRShbZmlsZU1hbmFnZXIgZmlsZUV4aXN0c0F0UGF0aDphcHBsZUdlbmVyYWxM
b2NhbFN0b3JhZ2VGaWxlLnBhdGhdKTsKICAgICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZp
bGVFeGlzdHNBdFBhdGg6YXBwbGVHZW5lcmFsSW5kZXhlZERCRGF0YWJhc2VGaWxlLnBhdGhdKTsK
KworICAgIC8vIEVuc3VyZSBkYXRhIHJlY29yZHMgZG8gbm90IGV4aXN0IGFmdGVyIGRlbGV0aW9u
LgorICAgIGRvbmUgPSBmYWxzZTsKKyAgICBbd2Vic2l0ZURhdGFTdG9yZSBmZXRjaERhdGFSZWNv
cmRzT2ZUeXBlczpkYXRhVHlwZXMgY29tcGxldGlvbkhhbmRsZXI6XihOU0FycmF5PFdLV2Vic2l0
ZURhdGFSZWNvcmQgKj4gKnJlY29yZHMpIHsKKyAgICAgICAgRVhQRUNUX0VRKHJlY29yZHMuY291
bnQsIDB1KTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQ
STo6VXRpbDo6cnVuKCZkb25lKTsKIH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452712</attachid>
            <date>2022-02-20 23:09:17 -0800</date>
            <delta_ts>2022-02-20 23:09:55 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-236905-20220220230911.patch</filename>
            <type>text/plain</type>
            <size>6124</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2YWJkZDQ4ZGYzZmZhZmM3
ZDU0MmYxODY2MjA1ZTdkNmM2MTIyNDcuLmM0OTdlMmQ1ZDk0YTgzYzAxM2I2ZTY2NzBkMzRkMTQ3
Yzc4YWRmZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjItMDItMjAgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmV0Y2hpbmcgd2Vic2l0ZSBkYXRh
IG1heSBnZXQgd3JvbmcgcmVjb3JkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3Rv
cmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzNjkwNQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAg
ICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFRvIGRlY2lkZSBpZiBhbiBv
cmlnaW4gaGFzIGRhdGEsIHdlIG5lZWQgdG8gbm90IG9ubHkgY2hlY2sgaWYgaXRzIGRpcmVjdG9y
eSBleGlzdHMgYnV0IGFsc28gaWYgdGhlIGRpcmVjdG9yeSBpcyAKKyAgICAgICAgZW1wdHkuCisK
KyAgICAgICAgTW9kaWZpZWQgZXhpc3RpbmcgdGVzdCB0byBhZGQgdGVzdCBjb3ZlcmFnZS4KKwor
ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3Bw
OgorICAgICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6
cmVzb2x2ZWRMb2NhbFN0b3JhZ2VQYXRoKToKKyAgICAgICAgKFdlYktpdDo6T3JpZ2luU3RvcmFn
ZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OnJlc29sdmVkSURCU3RvcmFnZVBhdGgpOiBkaXJlY3Rv
cnkgc2hvdWxkIGJlIGNyZWF0ZWQgYmVmb3JlIG1vdmluZworICAgICAgICBmaWxlcy4KKyAgICAg
ICAgKFdlYktpdDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OmZldGNoRGF0
YVR5cGVzSW5MaXN0RnJvbURpc2spOiBnaXZlbiB0aGF0IEluZGV4ZWREQiBhbmQgCisgICAgICAg
IExvY2FsU3RvcmFnZSBjYW4gaGF2ZSBjdXN0b20gcGF0aHMsIHdlIG1heSBqdXN0IGNoZWNrIGRh
dGEgYnkgdHlwZS4KKwogMjAyMi0wMi0xOSAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAK
ICAgICAgICAgVHVybiBXZWJHTCBpbiBHUFUgUHJvY2VzcyBvbiBieSBkZWZhdWx0CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1h
bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0
b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA0MWUzMThjMDk3ZjkzZDI0ZWFkN2MwYmM5ZGNiMTEzNDRk
OTA1OTdmLi5iZGRmNmJlY2MzMTczNWNmNTk4ZDE4YTZmYjFlNzlkNzIzMzdhMGQyIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1h
bmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9Pcmln
aW5TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTI1OCw3ICsyNTgsNyBAQCBwdWJsaWM6CiAgICAgICAg
ICAgICBGaWxlU3lzdGVtOjpleGNsdWRlRnJvbUJhY2t1cChsb2NhbFN0b3JhZ2VEaXJlY3Rvcnkp
OwogCiAgICAgICAgICAgICBhdXRvIGxvY2FsU3RvcmFnZVBhdGggPSBMb2NhbFN0b3JhZ2VNYW5h
Z2VyOjpsb2NhbFN0b3JhZ2VGaWxlUGF0aChsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwotICAgICAg
ICAgICAgaWYgKCFtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpICYmICFGaWxlU3lz
dGVtOjpmaWxlRXhpc3RzKGxvY2FsU3RvcmFnZVBhdGgpKQorICAgICAgICAgICAgaWYgKCFtX2N1
c3RvbUxvY2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpICYmICFGaWxlU3lzdGVtOjpmaWxlRXhpc3Rz
KGxvY2FsU3RvcmFnZVBhdGgpICYmIEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobV9jdXN0b21Mb2Nh
bFN0b3JhZ2VQYXRoKSkKICAgICAgICAgICAgICAgICBXZWJDb3JlOjpTUUxpdGVGaWxlU3lzdGVt
Ojptb3ZlRGF0YWJhc2VGaWxlKG1fY3VzdG9tTG9jYWxTdG9yYWdlUGF0aCwgbG9jYWxTdG9yYWdl
UGF0aCk7CiAKICAgICAgICAgICAgIG1fcmVzb2x2ZWRMb2NhbFN0b3JhZ2VQYXRoID0gbG9jYWxT
dG9yYWdlUGF0aDsKQEAgLTI4MCw5ICsyODAsOSBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX3Jl
c29sdmVkSURCU3RvcmFnZVBhdGggPSBtX2N1c3RvbUlEQlN0b3JhZ2VQYXRoOwogICAgICAgICB9
IGVsc2UgewogICAgICAgICAgICAgYXV0byBpZGJTdG9yYWdlUGF0aCA9IHR5cGVTdG9yYWdlUGF0
aChTdG9yYWdlVHlwZTo6SW5kZXhlZERCKTsKLSAgICAgICAgICAgIGlmICghbV9jdXN0b21JREJT
dG9yYWdlUGF0aC5pc0VtcHR5KCkgJiYgIUZpbGVTeXN0ZW06OmZpbGVFeGlzdHMoaWRiU3RvcmFn
ZVBhdGgpKSB7Ci0gICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6bW92ZUZpbGUobV9jdXN0b21J
REJTdG9yYWdlUGF0aCwgaWRiU3RvcmFnZVBhdGgpOworICAgICAgICAgICAgaWYgKCFtX2N1c3Rv
bUlEQlN0b3JhZ2VQYXRoLmlzRW1wdHkoKSAmJiAhRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhpZGJT
dG9yYWdlUGF0aCkgJiYgRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhtX2N1c3RvbUlEQlN0b3JhZ2VQ
YXRoKSkgewogICAgICAgICAgICAgICAgIEZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3Rvcmllcyhp
ZGJTdG9yYWdlUGF0aCk7CisgICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6bW92ZUZpbGUobV9j
dXN0b21JREJTdG9yYWdlUGF0aCwgaWRiU3RvcmFnZVBhdGgpOwogICAgICAgICAgICAgfQogCiAg
ICAgICAgICAgICBtX3Jlc29sdmVkSURCU3RvcmFnZVBhdGggPSBpZGJTdG9yYWdlUGF0aDsKQEAg
LTMxNywxNyArMzE3LDE4IEBAIHByaXZhdGU6CiAgICAgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlw
ZT4gZmV0Y2hEYXRhVHlwZXNJbkxpc3RGcm9tRGlzayhPcHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBl
PiB0eXBlcykKICAgICB7CiAgICAgICAgIE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IHJlc3Vs
dDsKLSAgICAgICAgZm9yIChhdXRvJiBzdG9yYWdlVHlwZSA6IEZpbGVTeXN0ZW06Omxpc3REaXJl
Y3RvcnkobV9yb290UGF0aCkpIHsKLSAgICAgICAgICAgIGlmIChhdXRvIHR5cGUgPSB0b1dlYnNp
dGVEYXRhVHlwZShzdG9yYWdlVHlwZSk7IHR5cGUgJiYgdHlwZXMuY29udGFpbnMoKnR5cGUpKQot
ICAgICAgICAgICAgICAgIHJlc3VsdC5hZGQoKnR5cGUpOworICAgICAgICBpZiAodHlwZXMuY29u
dGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpGaWxlU3lzdGVtKSkgeworICAgICAgICAgICAgYXV0byBm
aWxlU3lzdGVtU3RvcmFnZVBhdGggPSB0eXBlU3RvcmFnZVBhdGgoU3RvcmFnZVR5cGU6OkZpbGVT
eXN0ZW0pOworICAgICAgICAgICAgaWYgKGF1dG8gZmlsZXMgPSBGaWxlU3lzdGVtOjpsaXN0RGly
ZWN0b3J5KGZpbGVTeXN0ZW1TdG9yYWdlUGF0aCk7ICFmaWxlcy5pc0VtcHR5KCkpCisgICAgICAg
ICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5cGU6OkZpbGVTeXN0ZW0pOwogICAgICAg
ICB9CiAKLSAgICAgICAgaWYgKHR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxT
dG9yYWdlKSAmJiAhcmVzdWx0LmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9yYWdl
KSkgeworICAgICAgICBpZiAodHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpMb2NhbFN0
b3JhZ2UpKSB7CiAgICAgICAgICAgICBpZiAoRmlsZVN5c3RlbTo6ZmlsZUV4aXN0cyhyZXNvbHZl
ZExvY2FsU3RvcmFnZVBhdGgoKSkpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRl
RGF0YVR5cGU6OkxvY2FsU3RvcmFnZSk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAodHlwZXMu
Y29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVkREJEYXRhYmFzZXMpICYmICFyZXN1bHQu
Y29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVkREJEYXRhYmFzZXMpKSB7CisgICAgICAg
IGlmICh0eXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6OkluZGV4ZWREQkRhdGFiYXNlcykp
IHsKICAgICAgICAgICAgIGlmIChhdXRvIGRhdGFiYXNlcyA9IEZpbGVTeXN0ZW06Omxpc3REaXJl
Y3RvcnkocmVzb2x2ZWRJREJTdG9yYWdlUGF0aCgpKTsgIWRhdGFiYXNlcy5pc0VtcHR5KCkpCiAg
ICAgICAgICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5cGU6OkluZGV4ZWREQkRhdGFi
YXNlcyk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No
YW5nZUxvZwppbmRleCA1MDFiZTBlNmM0NjYwZDQ4ZDJiNWUwZDhkMjA3MDgxMzEzYTA5NmVmLi5i
MWRjOWQxZjlkNWU1OWI2NWQ3NWM3ZDNhOGJiYzI3ZWY4ZGQ5NDkzIDEwMDY0NAotLS0gYS9Ub29s
cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjIt
MDItMjAgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmV0Y2hp
bmcgd2Vic2l0ZSBkYXRhIG1heSBnZXQgd3JvbmcgcmVjb3JkIGFmdGVyIG1pZ3JhdGluZyBkYXRh
IHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkwNQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlz
IER1bWV6LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJz
aXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06CisgICAgICAgIChURVNUKToKKwogMjAyMi0wMi0y
MCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBPcmlnaW4gZmls
ZSBtYXkgbm90IGJlIGNyZWF0ZWQgYWZ0ZXIgbWlncmF0aW5nIGRhdGEgdG8gZ2VuZXJhbCBzdG9y
YWdlIGRpcmVjdG9yeQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL
aXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0gYi9Ub29scy9UZXN0V2ViS2l0
QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQppbmRl
eCBlM2QwMGMxNDY3MTI4YTllMjRiNWRkYTdjOGE0NjUwMGExZjk2NjJmLi5iZjhlODg3YWIxOTBh
YzdmYTYzMDMwODIwMzg5MzY3NGZiMjE5MDY2IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0
QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQorKysg
Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVD
dXN0b21QYXRocy5tbQpAQCAtMTA4Miw0ICsxMDgyLDEyIEBAIFRFU1QoV2ViS2l0LCBEZWxldGVE
YXRhQWZ0ZXJFbmFibGluZ0dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KQogICAgIC8vIEVuc3VyZSBh
cHBsZS5jb20gZGF0YSBpcyBub3QganVzdCBtb3ZlZCBidXQgYWN0dWFsbHkgZGVsZXRlZC4KICAg
ICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6YXBwbGVHZW5lcmFs
TG9jYWxTdG9yYWdlRmlsZS5wYXRoXSk7CiAgICAgRVhQRUNUX0ZBTFNFKFtmaWxlTWFuYWdlciBm
aWxlRXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbEluZGV4ZWREQkRhdGFiYXNlRmlsZS5wYXRoXSk7
CisKKyAgICAvLyBFbnN1cmUgZGF0YSByZWNvcmRzIGRvIG5vdCBleGlzdCBhZnRlciBkZWxldGlv
bi4KKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYnNpdGVEYXRhU3RvcmUgZmV0Y2hEYXRhUmVj
b3Jkc09mVHlwZXM6ZGF0YVR5cGVzIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNBcnJheTxXS1dlYnNp
dGVEYXRhUmVjb3JkICo+ICpyZWNvcmRzKSB7CisgICAgICAgIEVYUEVDVF9FUShyZWNvcmRzLmNv
dW50LCAwdSk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRB
UEk6OlV0aWw6OnJ1bigmZG9uZSk7CiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452713</attachid>
            <date>2022-02-20 23:09:57 -0800</date>
            <delta_ts>2022-02-21 01:24:52 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-236905-20220220230952.patch</filename>
            <type>text/plain</type>
            <size>6088</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2YWJkZDQ4ZGYzZmZhZmM3
ZDU0MmYxODY2MjA1ZTdkNmM2MTIyNDcuLmNhYTZjYTNjNmUzOGU2MzY5NzZmNmIwYzAwYzUyZTY1
OTQxNjg0MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDItMjAgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRmV0Y2hpbmcgd2Vic2l0ZSBkYXRh
IG1heSBnZXQgd3JvbmcgcmVjb3JkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3Rv
cmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTIzNjkwNQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAg
ICAgIFRvIGRlY2lkZSBpZiBhbiBvcmlnaW4gaGFzIGRhdGEsIHdlIG5lZWQgdG8gbm90IG9ubHkg
Y2hlY2sgaWYgaXRzIGRpcmVjdG9yeSBleGlzdHMgYnV0IGFsc28gaWYgdGhlIGRpcmVjdG9yeSBp
cyAKKyAgICAgICAgZW1wdHkuCisKKyAgICAgICAgTW9kaWZpZWQgZXhpc3RpbmcgdGVzdCB0byBh
ZGQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3Jp
Z2luU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFu
YWdlcjo6U3RvcmFnZUJ1Y2tldDo6cmVzb2x2ZWRMb2NhbFN0b3JhZ2VQYXRoKToKKyAgICAgICAg
KFdlYktpdDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OnJlc29sdmVkSURC
U3RvcmFnZVBhdGgpOiBkaXJlY3Rvcnkgc2hvdWxkIGJlIGNyZWF0ZWQgYmVmb3JlIG1vdmluZwor
ICAgICAgICBmaWxlcy4KKyAgICAgICAgKFdlYktpdDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0
b3JhZ2VCdWNrZXQ6OmZldGNoRGF0YVR5cGVzSW5MaXN0RnJvbURpc2spOiBnaXZlbiB0aGF0IElu
ZGV4ZWREQiBhbmQgCisgICAgICAgIExvY2FsU3RvcmFnZSBjYW4gaGF2ZSBjdXN0b20gcGF0aHMs
IHdlIG1heSBqdXN0IGNoZWNrIGRhdGEgYnkgdHlwZS4KKwogMjAyMi0wMi0xOSAgSm9uIExlZSAg
PGpvbmxlZUBhcHBsZS5jb20+CiAKICAgICAgICAgVHVybiBXZWJHTCBpbiBHUFUgUHJvY2VzcyBv
biBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0
b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA0MWUzMThjMDk3Zjkz
ZDI0ZWFkN2MwYmM5ZGNiMTEzNDRkOTA1OTdmLi5iZGRmNmJlY2MzMTczNWNmNTk4ZDE4YTZmYjFl
NzlkNzIzMzdhMGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0
b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y
a1Byb2Nlc3Mvc3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTI1OCw3ICsyNTgs
NyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBGaWxlU3lzdGVtOjpleGNsdWRlRnJvbUJhY2t1cChs
b2NhbFN0b3JhZ2VEaXJlY3RvcnkpOwogCiAgICAgICAgICAgICBhdXRvIGxvY2FsU3RvcmFnZVBh
dGggPSBMb2NhbFN0b3JhZ2VNYW5hZ2VyOjpsb2NhbFN0b3JhZ2VGaWxlUGF0aChsb2NhbFN0b3Jh
Z2VEaXJlY3RvcnkpOwotICAgICAgICAgICAgaWYgKCFtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGgu
aXNFbXB0eSgpICYmICFGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKGxvY2FsU3RvcmFnZVBhdGgpKQor
ICAgICAgICAgICAgaWYgKCFtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpICYmICFG
aWxlU3lzdGVtOjpmaWxlRXhpc3RzKGxvY2FsU3RvcmFnZVBhdGgpICYmIEZpbGVTeXN0ZW06OmZp
bGVFeGlzdHMobV9jdXN0b21Mb2NhbFN0b3JhZ2VQYXRoKSkKICAgICAgICAgICAgICAgICBXZWJD
b3JlOjpTUUxpdGVGaWxlU3lzdGVtOjptb3ZlRGF0YWJhc2VGaWxlKG1fY3VzdG9tTG9jYWxTdG9y
YWdlUGF0aCwgbG9jYWxTdG9yYWdlUGF0aCk7CiAKICAgICAgICAgICAgIG1fcmVzb2x2ZWRMb2Nh
bFN0b3JhZ2VQYXRoID0gbG9jYWxTdG9yYWdlUGF0aDsKQEAgLTI4MCw5ICsyODAsOSBAQCBwdWJs
aWM6CiAgICAgICAgICAgICBtX3Jlc29sdmVkSURCU3RvcmFnZVBhdGggPSBtX2N1c3RvbUlEQlN0
b3JhZ2VQYXRoOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgYXV0byBpZGJTdG9yYWdl
UGF0aCA9IHR5cGVTdG9yYWdlUGF0aChTdG9yYWdlVHlwZTo6SW5kZXhlZERCKTsKLSAgICAgICAg
ICAgIGlmICghbV9jdXN0b21JREJTdG9yYWdlUGF0aC5pc0VtcHR5KCkgJiYgIUZpbGVTeXN0ZW06
OmZpbGVFeGlzdHMoaWRiU3RvcmFnZVBhdGgpKSB7Ci0gICAgICAgICAgICAgICAgRmlsZVN5c3Rl
bTo6bW92ZUZpbGUobV9jdXN0b21JREJTdG9yYWdlUGF0aCwgaWRiU3RvcmFnZVBhdGgpOworICAg
ICAgICAgICAgaWYgKCFtX2N1c3RvbUlEQlN0b3JhZ2VQYXRoLmlzRW1wdHkoKSAmJiAhRmlsZVN5
c3RlbTo6ZmlsZUV4aXN0cyhpZGJTdG9yYWdlUGF0aCkgJiYgRmlsZVN5c3RlbTo6ZmlsZUV4aXN0
cyhtX2N1c3RvbUlEQlN0b3JhZ2VQYXRoKSkgewogICAgICAgICAgICAgICAgIEZpbGVTeXN0ZW06
Om1ha2VBbGxEaXJlY3RvcmllcyhpZGJTdG9yYWdlUGF0aCk7CisgICAgICAgICAgICAgICAgRmls
ZVN5c3RlbTo6bW92ZUZpbGUobV9jdXN0b21JREJTdG9yYWdlUGF0aCwgaWRiU3RvcmFnZVBhdGgp
OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBtX3Jlc29sdmVkSURCU3RvcmFnZVBhdGgg
PSBpZGJTdG9yYWdlUGF0aDsKQEAgLTMxNywxNyArMzE3LDE4IEBAIHByaXZhdGU6CiAgICAgT3B0
aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZmV0Y2hEYXRhVHlwZXNJbkxpc3RGcm9tRGlzayhPcHRp
b25TZXQ8V2Vic2l0ZURhdGFUeXBlPiB0eXBlcykKICAgICB7CiAgICAgICAgIE9wdGlvblNldDxX
ZWJzaXRlRGF0YVR5cGU+IHJlc3VsdDsKLSAgICAgICAgZm9yIChhdXRvJiBzdG9yYWdlVHlwZSA6
IEZpbGVTeXN0ZW06Omxpc3REaXJlY3RvcnkobV9yb290UGF0aCkpIHsKLSAgICAgICAgICAgIGlm
IChhdXRvIHR5cGUgPSB0b1dlYnNpdGVEYXRhVHlwZShzdG9yYWdlVHlwZSk7IHR5cGUgJiYgdHlw
ZXMuY29udGFpbnMoKnR5cGUpKQotICAgICAgICAgICAgICAgIHJlc3VsdC5hZGQoKnR5cGUpOwor
ICAgICAgICBpZiAodHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpGaWxlU3lzdGVtKSkg
eworICAgICAgICAgICAgYXV0byBmaWxlU3lzdGVtU3RvcmFnZVBhdGggPSB0eXBlU3RvcmFnZVBh
dGgoU3RvcmFnZVR5cGU6OkZpbGVTeXN0ZW0pOworICAgICAgICAgICAgaWYgKGF1dG8gZmlsZXMg
PSBGaWxlU3lzdGVtOjpsaXN0RGlyZWN0b3J5KGZpbGVTeXN0ZW1TdG9yYWdlUGF0aCk7ICFmaWxl
cy5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5cGU6
OkZpbGVTeXN0ZW0pOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHR5cGVzLmNvbnRhaW5zKFdl
YnNpdGVEYXRhVHlwZTo6TG9jYWxTdG9yYWdlKSAmJiAhcmVzdWx0LmNvbnRhaW5zKFdlYnNpdGVE
YXRhVHlwZTo6TG9jYWxTdG9yYWdlKSkgeworICAgICAgICBpZiAodHlwZXMuY29udGFpbnMoV2Vi
c2l0ZURhdGFUeXBlOjpMb2NhbFN0b3JhZ2UpKSB7CiAgICAgICAgICAgICBpZiAoRmlsZVN5c3Rl
bTo6ZmlsZUV4aXN0cyhyZXNvbHZlZExvY2FsU3RvcmFnZVBhdGgoKSkpCiAgICAgICAgICAgICAg
ICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0YVR5cGU6OkxvY2FsU3RvcmFnZSk7CiAgICAgICAgIH0K
IAotICAgICAgICBpZiAodHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVkREJE
YXRhYmFzZXMpICYmICFyZXN1bHQuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpJbmRleGVkREJE
YXRhYmFzZXMpKSB7CisgICAgICAgIGlmICh0eXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6
OkluZGV4ZWREQkRhdGFiYXNlcykpIHsKICAgICAgICAgICAgIGlmIChhdXRvIGRhdGFiYXNlcyA9
IEZpbGVTeXN0ZW06Omxpc3REaXJlY3RvcnkocmVzb2x2ZWRJREJTdG9yYWdlUGF0aCgpKTsgIWRh
dGFiYXNlcy5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmFkZChXZWJzaXRlRGF0
YVR5cGU6OkluZGV4ZWREQkRhdGFiYXNlcyk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xz
L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MDFiZTBlNmM0NjYwZDQ4ZDJiNWUw
ZDhkMjA3MDgxMzEzYTA5NmVmLi5iMWRjOWQxZjlkNWU1OWI2NWQ3NWM3ZDNhOGJiYzI3ZWY4ZGQ5
NDkzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA
IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMjAgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5j
b20+CisKKyAgICAgICAgRmV0Y2hpbmcgd2Vic2l0ZSBkYXRhIG1heSBnZXQgd3JvbmcgcmVjb3Jk
IGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3RvcnkKKyAgICAg
ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkwNQorCisgICAg
ICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U
ZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06CisgICAgICAg
IChURVNUKToKKwogMjAyMi0wMi0yMCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4K
IAogICAgICAgICBPcmlnaW4gZmlsZSBtYXkgbm90IGJlIGNyZWF0ZWQgYWZ0ZXIgbWlncmF0aW5n
IGRhdGEgdG8gZ2VuZXJhbCBzdG9yYWdlIGRpcmVjdG9yeQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz
dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMu
bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3Rv
cmVDdXN0b21QYXRocy5tbQppbmRleCBlM2QwMGMxNDY3MTI4YTllMjRiNWRkYTdjOGE0NjUwMGEx
Zjk2NjJmLi5iZjhlODg3YWIxOTBhYzdmYTYzMDMwODIwMzg5MzY3NGZiMjE5MDY2IDEwMDY0NAot
LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3Rv
cmVDdXN0b21QYXRocy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv
Y29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQpAQCAtMTA4Miw0ICsxMDgyLDEyIEBA
IFRFU1QoV2ViS2l0LCBEZWxldGVEYXRhQWZ0ZXJFbmFibGluZ0dlbmVyYWxTdG9yYWdlRGlyZWN0
b3J5KQogICAgIC8vIEVuc3VyZSBhcHBsZS5jb20gZGF0YSBpcyBub3QganVzdCBtb3ZlZCBidXQg
YWN0dWFsbHkgZGVsZXRlZC4KICAgICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlz
dHNBdFBhdGg6YXBwbGVHZW5lcmFsTG9jYWxTdG9yYWdlRmlsZS5wYXRoXSk7CiAgICAgRVhQRUNU
X0ZBTFNFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbEluZGV4ZWRE
QkRhdGFiYXNlRmlsZS5wYXRoXSk7CisKKyAgICAvLyBFbnN1cmUgZGF0YSByZWNvcmRzIGRvIG5v
dCBleGlzdCBhZnRlciBkZWxldGlvbi4KKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYnNpdGVE
YXRhU3RvcmUgZmV0Y2hEYXRhUmVjb3Jkc09mVHlwZXM6ZGF0YVR5cGVzIGNvbXBsZXRpb25IYW5k
bGVyOl4oTlNBcnJheTxXS1dlYnNpdGVEYXRhUmVjb3JkICo+ICpyZWNvcmRzKSB7CisgICAgICAg
IEVYUEVDVF9FUShyZWNvcmRzLmNvdW50LCAwdSk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAg
IH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CiB9Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>