<?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>232985</bug_id>
          
          <creation_ts>2021-11-10 23:58:17 -0800</creation_ts>
          <short_desc>Set default general storage directory to websiteDataDirectory</short_desc>
          <delta_ts>2021-11-12 15:12:20 -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>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="Sihui Liu">sihui_liu</reporter>
          <assigned_to name="Sihui Liu">sihui_liu</assigned_to>
          <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1813935</commentid>
    <comment_count>0</comment_count>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2021-11-10 23:58:17 -0800</bug_when>
    <thetext>...</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814058</commentid>
    <comment_count>1</comment_count>
      <attachid>443955</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2021-11-11 09:11:38 -0800</bug_when>
    <thetext>Created attachment 443955
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814348</commentid>
    <comment_count>2</comment_count>
      <attachid>444043</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2021-11-11 21:51:11 -0800</bug_when>
    <thetext>Created attachment 444043
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814532</commentid>
    <comment_count>3</comment_count>
      <attachid>444084</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2021-11-12 11:23:48 -0800</bug_when>
    <thetext>Created attachment 444084
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814621</commentid>
    <comment_count>4</comment_count>
      <attachid>444084</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-11-12 13:47:40 -0800</bug_when>
    <thetext>Comment on attachment 444084
Patch

r=me

I think for most storage types we&apos;ll need to do migration more incrementally; but this storage type has not been used much, so one-shot seems fine.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814635</commentid>
    <comment_count>5</comment_count>
      <attachid>444111</attachid>
    <who name="Sihui Liu">sihui_liu</who>
    <bug_when>2021-11-12 14:41:01 -0800</bug_when>
    <thetext>Created attachment 444111
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814645</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-11-12 15:11:50 -0800</bug_when>
    <thetext>Committed r285746 (244205@main): &lt;https://commits.webkit.org/244205@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 444111.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1814646</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-11-12 15:12:20 -0800</bug_when>
    <thetext>&lt;rdar://problem/85359301&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>443955</attachid>
            <date>2021-11-11 09:11:38 -0800</date>
            <delta_ts>2021-11-11 21:51:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232985-20211111091137.patch</filename>
            <type>text/plain</type>
            <size>3077</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1MjZiZWI0YTI0MjlhMjk3
NzdmNGJkZGQ3NTA4ZDY1YWNhOGQ0MjMuLjllZTI0NmVkMThhZWUzMWViMWM1ZDkwNmMyYzkwM2Q5
YjBlNWUwN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMTEtMTEgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgU2V0IGRlZmF1bHQgZ2VuZXJhbCBz
dG9yYWdlIGRpcmVjdG9yeSB0byB3ZWJzaXRlRGF0YURpcmVjdG9yeQorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg1CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEv
Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRl
RGF0YVN0b3JlOjpkZWZhdWx0R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkpOgorICAgICAgICAoV2Vi
S2l0OjpXZWJzaXRlRGF0YVN0b3JlOjp3ZWJzaXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXBy
ZXNlbnRhdGlvbik6CisKIDIwMjEtMTEtMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv
bT4KIAogICAgICAgICBBZGQgYmFzaWMgc3VwcG9ydCBmb3IgbGF1bmNoaW5nIENhcHRpdmVQb3J0
YWxNb2RlIFdlYlByb2Nlc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCmlu
ZGV4IDcwZTNjMTdkMTM3MWIxOTM3ODVmZGNlZjJiN2ZhMzc2NDIxZTYwMWIuLjZmMWQ4YTdjYmJk
YWJlOTI2ZjhiODQ0MTRhMzJiNTE0ODJhZWVkYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQorKysg
Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0
b3JlQ29jb2EubW0KQEAgLTI3OCw3ICsyNzgsMjcgQEAgU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6
OmRlZmF1bHRDYWNoZVN0b3JhZ2VEaXJlY3RvcnkoKQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9y
ZTo6ZGVmYXVsdEdlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KCkKIHsKLSAgICByZXR1cm4gY2FjaGVE
aXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oIlN0b3JhZ2UiKTsKKyAgICBhdXRvIGRp
cmVjdG9yeSA9IHdlYnNpdGVEYXRhRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGVt
cHR5U3RyaW5nKCkpOworICAgIAorICAgIC8vIE1vdmUgZmlsZXMgZnJvbSBvbGQgZGlyZWNvdHkg
dG8gbmV3IGRpcmVjdG9yeS4gCisgICAgYXV0byBvbGREaXJlY3RvcnkgPSBjYWNoZURpcmVjdG9y
eUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiU3RvcmFnZSIsIFNob3VsZENyZWF0ZURpcmVjdG9y
eTo6Tm8pOworICAgIE5TRmlsZU1hbmFnZXIgKmZpbGVNYW5hZ2VyID0gW05TRmlsZU1hbmFnZXIg
ZGVmYXVsdE1hbmFnZXJdOworICAgIE5TQXJyYXkgKmZpbGVzID0gW2ZpbGVNYW5hZ2VyIGNvbnRl
bnRzT2ZEaXJlY3RvcnlBdFBhdGg6b2xkRGlyZWN0b3J5IGVycm9yOjBdOworICAgIGlmIChmaWxl
cykgeworICAgICAgICBOU1VJbnRlZ2VyIGNvdW50ID0gW2ZpbGVzIGNvdW50XTsKKyAgICAgICAg
Zm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBpIDwgY291bnQ7ICsraSkgeworICAgICAgICAgICAgTlNT
dHJpbmcgKmZpbGVOYW1lID0gW2ZpbGVzIG9iamVjdEF0SW5kZXg6aV07CisgICAgICAgICAgICBp
ZiAoIVtmaWxlTmFtZSBsZW5ndGhdKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAg
ICAgICAgICBOU1N0cmluZyAqcGF0aCA9IFtkaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQYXRo
Q29tcG9uZW50OmZpbGVOYW1lXTsKKyAgICAgICAgICAgIE5TU3RyaW5nICpvbGRQYXRoID0gW29s
ZERpcmVjdG9yeSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6ZmlsZU5hbWVdOworICAg
ICAgICAgICAgW2ZpbGVNYW5hZ2VyIG1vdmVJdGVtQXRQYXRoOm9sZFBhdGggdG9QYXRoOnBhdGgg
ZXJyb3I6bmlsXTsKKyAgICAgICAgfQorICAgIH0KKyAgICBbZmlsZU1hbmFnZXIgcmVtb3ZlSXRl
bUF0UGF0aDpvbGREaXJlY3RvcnkgZXJyb3I6bmlsXTsKKworICAgIHJldHVybiBkaXJlY3Rvcnk7
CiB9CiAKIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0
b3J5KCkKQEAgLTQyMiw2ICs0NDIsOSBAQCBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6d2Vic2l0
ZURhdGFEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oY29uc3QgU3RyaQogICAgICAg
ICB3ZWJzaXRlRGF0YVVSTC5nZXQoKSA9IFt1cmwgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50
OkAiV2Vic2l0ZURhdGEiIGlzRGlyZWN0b3J5OllFU107CiAgICAgfSk7CiAKKyAgICBpZiAoZGly
ZWN0b3J5TmFtZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiB3ZWJzaXRlRGF0YVVSTC5nZXQo
KS5nZXQoKS5hYnNvbHV0ZVVSTC5wYXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbjsKKwogICAg
IE5TVVJMICp1cmwgPSBbd2Vic2l0ZURhdGFVUkwuZ2V0KCkgVVJMQnlBcHBlbmRpbmdQYXRoQ29t
cG9uZW50OmRpcmVjdG9yeU5hbWUgaXNEaXJlY3Rvcnk6WUVTXTsKICAgICBpZiAoIVtbTlNGaWxl
TWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY3JlYXRlRGlyZWN0b3J5QXRVUkw6dXJsIHdpdGhJbnRl
cm1lZGlhdGVEaXJlY3RvcmllczpZRVMgYXR0cmlidXRlczpuaWwgZXJyb3I6bnVsbHB0cl0pCiAg
ICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBkaXJlY3RvcnkgJUAiLCB1cmwpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444043</attachid>
            <date>2021-11-11 21:51:11 -0800</date>
            <delta_ts>2021-11-12 11:23:47 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232985-20211111215110.patch</filename>
            <type>text/plain</type>
            <size>16124</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk1MjZiZWI0YTI0MjlhMjk3
NzdmNGJkZGQ3NTA4ZDY1YWNhOGQ0MjMuLjJiYTQ2NGY2MzU1YzExNmYyZDMzYzc5MTM3ZDYyZmYy
NmM5OTY3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMTEgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgU2V0IGRlZmF1bHQgZ2VuZXJhbCBz
dG9yYWdlIGRpcmVjdG9yeSB0byB3ZWJzaXRlRGF0YURpcmVjdG9yeQorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg1CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IEFQSSB0ZXN0OiBGaWxlU3lzdGVt
QWNjZXNzLk1pZ3JhdGVUb05ld1N0b3JhZ2VEaXJlY3RvcnkKKworICAgICAgICAqIFVJUHJvY2Vz
cy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDogQ29ycmVjdCBh
IGRlZmluaXRpb24gaGVyZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2Ev
V2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0
b3JlOjpkZWZhdWx0R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkpOgorCiAyMDIxLTExLTEwICBDaHJp
cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGJhc2ljIHN1cHBvcnQg
Zm9yIGxhdW5jaGluZyBDYXB0aXZlUG9ydGFsTW9kZSBXZWJQcm9jZXNzZXMKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29u
ZmlndXJhdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNp
dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKaW5kZXggOTdmZTViYTIzYWNjYjk3OWY4NzNlNGFk
NmYwNDY2ZmY2ZjczOTA2ZS4uOTg4YWI5Yzg5N2UzMTk1MDdlNGIxMzdlOWFlMjMyOWIzOTVhNWRk
OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNp
dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
QVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKQEAgLTgyLDcgKzgy
LDcgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKDEwLjEzKSwgaW9zKDExLjApKQogCiBAcHJv
cGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TVVJMICphbHRlcm5hdGl2ZVNlcnZp
Y2VzU3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zKDExLjApLCBpb3MoMTQu
MCkpOwogQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU1VSTCAqc3RhbmRh
bG9uZUFwcGxpY2F0aW9uVVJMIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTEuMCksIGlvcygxNC4w
KSk7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TVVJMICpzdG9yYWdl
RGlyZWN0b3J5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1Nf
VEJBKSk7CitAcHJvcGVydHkgKG5vbmF0b21pYywgbnVsbGFibGUsIGNvcHkpIE5TVVJMICpnZW5l
cmFsU3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBp
b3MoV0tfSU9TX1RCQSkpOwogCiAvLyBUZXN0aW5nIG9ubHkuCiBAcHJvcGVydHkgKG5vbmF0b21p
YykgQk9PTCBhbGxMb2Fkc0Jsb2NrZWRCeURldmljZU1hbmFnZW1lbnRSZXN0cmljdGlvbnNGb3JU
ZXN0aW5nIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTAuMTUpLCBpb3MoMTMuMCkpOwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh
dGFTdG9yZUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29j
b2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IDcwZTNjMTdkMTM3MWIxOTM3ODVmZGNl
ZjJiN2ZhMzc2NDIxZTYwMWIuLjBjY2I2NjJiYTFiMzk3M2U0M2Q2Zjc1YzIxNGQ1ZTc1YzRmOWFl
ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29h
L1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTI3OCw3ICsyNzgs
MjggQEAgU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRDYWNoZVN0b3JhZ2VEaXJlY3Rv
cnkoKQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdEdlbmVyYWxTdG9yYWdlRGly
ZWN0b3J5KCkKIHsKLSAgICByZXR1cm4gY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50
YXRpb24oIlN0b3JhZ2UiKTsKKyAgICBhdXRvIGRpcmVjdG9yeSA9IHdlYnNpdGVEYXRhRGlyZWN0
b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKCJEZWZhdWx0Iik7CisKKyAgICBzdGF0aWMgZGlz
cGF0Y2hfb25jZV90IG9uY2VUb2tlbjsKKyAgICBkaXNwYXRjaF9vbmNlKCZvbmNlVG9rZW4sIF57
CisgICAgICAgIC8vIFRoaXMgaXMgdGhlIG9sZCBzdG9yYWdlIGRpcmVjdG9yeSwgYW5kIHRoZXJl
IG1pZ2h0IGJlIGZpbGVzIGxlZnQgaGVyZS4KKyAgICAgICAgYXV0byBvbGREaXJlY3RvcnkgPSBj
YWNoZURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiU3RvcmFnZSIsIFNob3VsZENy
ZWF0ZURpcmVjdG9yeTo6Tm8pOworICAgICAgICBOU0ZpbGVNYW5hZ2VyICpmaWxlTWFuYWdlciA9
IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKKyAgICAgICAgTlNBcnJheSAqZmlsZXMg
PSBbZmlsZU1hbmFnZXIgY29udGVudHNPZkRpcmVjdG9yeUF0UGF0aDpvbGREaXJlY3RvcnkgZXJy
b3I6MF07CisgICAgICAgIGlmIChmaWxlcykgeworICAgICAgICAgICAgZm9yIChOU1N0cmluZyAq
ZmlsZU5hbWUgaW4gZmlsZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAoIVtmaWxlTmFtZSBsZW5n
dGhdKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgICAgIE5T
U3RyaW5nICpwYXRoID0gW2RpcmVjdG9yeSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6
ZmlsZU5hbWVdOworICAgICAgICAgICAgICAgIE5TU3RyaW5nICpvbGRQYXRoID0gW29sZERpcmVj
dG9yeSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6ZmlsZU5hbWVdOworICAgICAgICAg
ICAgICAgIFtmaWxlTWFuYWdlciBtb3ZlSXRlbUF0UGF0aDpvbGRQYXRoIHRvUGF0aDpwYXRoIGVy
cm9yOm5pbF07CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgW2ZpbGVNYW5hZ2Vy
IHJlbW92ZUl0ZW1BdFBhdGg6b2xkRGlyZWN0b3J5IGVycm9yOm5pbF07CisgICAgfSk7CisKKyAg
ICByZXR1cm4gZGlyZWN0b3J5OwogfQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVs
dE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U
b29scy9DaGFuZ2VMb2cKaW5kZXggNGUxNWMxOTlhMDE3NTg0ZjE2NDEyNWY2NWJjZTA3NGVkODM4
YjU0Yy4uYmQ3OGExNDk3ODA5ZTVjNGUzYTU0ZjIzMWU0OTI1OWE5OGMxZDY4OCAxMDA2NDQKLS0t
IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA
CisyMDIxLTExLTExICBTaWh1aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAg
IFNldCBkZWZhdWx0IGdlbmVyYWwgc3RvcmFnZSBkaXJlY3RvcnkgdG8gd2Vic2l0ZURhdGFEaXJl
Y3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz
Mjk4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog
VGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6Cisg
ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9GaWxlU3lzdGVtQWNjZXNz
Lm1tOgorCiAyMDIxLTExLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg
ICAgICAgQWRkIGJhc2ljIHN1cHBvcnQgZm9yIGxhdW5jaGluZyBDYXB0aXZlUG9ydGFsTW9kZSBX
ZWJQcm9jZXNzZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQ
SS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2Vi
S2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggODMwODBjM2IxNWZiMDY3YmU0
MjAxODdkYjVhYzE5MGM0ZTg3YjUxNC4uMTNmNDZiMjg2ZGQ2ZTUzZjhhNGYzNDY5MmEzMzFmNTg1
N2E5NDVjNSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhj
b2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2Vi
S2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTczNSw2ICs3MzUsOCBAQAogCQk5
MzYwMjcwNjI1QTNDRjc2MDAzNjc2NzAgLyogc3BlZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbCBp
biBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzYw
MjcwNTI1QTNCMjhFMDAzNjc2NzAgLyogc3BlZWNocmVjb2duaXRpb24tYmFzaWMuaHRtbCAqLzsg
fTsKIAkJOTM2MTAwMjkxNERDOTVBNzAwNjEzNzlEIC8qIGxvdHMtb2YtaWZyYW1lcy5odG1sIGlu
IENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNjEw
MDI4MTREQzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMuaHRtbCAqLzsgfTsKIAkJOTM2
MjVEMjcxQ0Q5NzQxQzAwNkRDMUYxIC8qIGxhcmdlLXZpZGVvLXdpdGhvdXQtYXVkaW8uaHRtbCBp
biBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzYy
NUQyNjFDRDk3M0FGMDA2REMxRjEgLyogbGFyZ2UtdmlkZW8td2l0aG91dC1hdWRpby5odG1sICov
OyB9OworCQk5MzYyRjI1MDI3M0RFNUY2MDAzMjNDOUIgLyogZmlsZS1zeXN0ZW0tYWNjZXNzLXNh
bHQudHh0IGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl
ZiA9IDkzNjJGMjRGMjczREU1RTUwMDMyM0M5QiAvKiBmaWxlLXN5c3RlbS1hY2Nlc3Mtc2FsdC50
eHQgKi87IH07CisJCTkzNjJGMjUxMjczREU1RjYwMDMyM0M5QiAvKiBmaWxlLXN5c3RlbS1hY2Nl
c3MudHh0IGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl
ZiA9IDkzNjJGMjRFMjczREU1RTUwMDMyM0M5QiAvKiBmaWxlLXN5c3RlbS1hY2Nlc3MudHh0ICov
OyB9OwogCQk5MzY4QTI1RTIyOUVGQjQ3MDBBODI5Q0EgLyogbG9jYWwtc3RvcmFnZS1wcm9jZXNz
LXN1c3BlbmRzLTEuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp
bGU7IGZpbGVSZWYgPSA5MzY4QTI1RDIyOUVGQjNBMDBBODI5Q0EgLyogbG9jYWwtc3RvcmFnZS1w
cm9jZXNzLXN1c3BlbmRzLTEuaHRtbCAqLzsgfTsKIAkJOTM2OEEyNUYyMjlFRkI0NzAwQTgyOUNB
IC8qIGxvY2FsLXN0b3JhZ2UtcHJvY2Vzcy1zdXNwZW5kcy0yLmh0bWwgaW4gQ29weSBSZXNvdXJj
ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM2OEEyNUMyMjlFRkIzQTAw
QTgyOUNBIC8qIGxvY2FsLXN0b3JhZ2UtcHJvY2Vzcy1zdXNwZW5kcy0yLmh0bWwgKi87IH07CiAJ
CTkzNkY3MjgwMUNEN0Q5RUMwMDY4QTBGQiAvKiBsYXJnZS12aWRlby13aXRoLWF1ZGlvLmh0bWwg
aW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM2
RjcyN0UxQ0Q3RDlEMDAwNjhBMEZCIC8qIGxhcmdlLXZpZGVvLXdpdGgtYXVkaW8uaHRtbCAqLzsg
fTsKQEAgLTEwNzUsMTEgKzEwNzcsOSBAQAogCQlGNEMyQUIyMjFERDZEOTVFMDBFMDZENUIgLyog
ZW5vcm1vdXMtdmlkZW8td2l0aC1zb3VuZC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lz
YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0QzJBQjIxMURENkQ5NDEwMEUwNkQ1QiAvKiBl
bm9ybW91cy12aWRlby13aXRoLXNvdW5kLmh0bWwgKi87IH07CiAJCUY0Qzg3OTdGMjA1OUQ4RDMw
MDlDRDAwQiAvKiBTY3JvbGxWaWV3SW5zZXRUZXN0cy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9
IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0Qzg3OTdFMjA1OUQ4RDMwMDlDRDAwQiAvKiBTY3Jv
bGxWaWV3SW5zZXRUZXN0cy5tbSAqLzsgfTsKIAkJRjRDRDc0QzYyMEZEQUNGQTAwREUzNzk0IC8q
IHRleHQtd2l0aC1hc3luYy1zY3JpcHQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2Eg
PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNENENzRDNTIwRkRBQ0Y1MDBERTM3OTQgLyogdGV4
dC13aXRoLWFzeW5jLXNjcmlwdC5odG1sICovOyB9OwotCQlGNENENzRDOTIwRkRCNDk2MDBERTM3
OTQgLyogVGVzdFVSTFNjaGVtZUhhbmRsZXIubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC
dWlsZEZpbGU7IGZpbGVSZWYgPSBGNENENzRDODIwRkRCNDk2MDBERTM3OTQgLyogVGVzdFVSTFNj
aGVtZUhhbmRsZXIubW0gKi87IH07CiAJCUY0Q0YzMjgwMjM2NjU1MjIwMEQzQUQwNyAvKiBFbnRl
cktleUhpbnRUZXN0cy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls
ZVJlZiA9IEY0Q0YzMjdGMjM2NjU1MjIwMEQzQUQwNyAvKiBFbnRlcktleUhpbnRUZXN0cy5tbSAq
LzsgfTsKIAkJRjRDRkNEREEyNDlGQzlFNDAwNTI3NDgyIC8qIFNwYWNlT25seS5vdGYgaW4gQ29w
eSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDRkNERDgy
NDlGQzlEOTAwNTI3NDgyIC8qIFNwYWNlT25seS5vdGYgKi87IH07CiAJCUY0RDA2MDA4MjczNEEx
QUIwMDhGQTY3QSAvKiBzaW1wbGUtZWRpdG9yLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7
aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjREMDYwMDcyNzM0QTA4QzAwOEZBNjdBIC8q
IHNpbXBsZS1lZGl0b3IuaHRtbCAqLzsgfTsKLQkJRjREMjk4NkUyMEZFRTczNzAwOTJENjM2IC8q
IFJ1blNjcmlwdEFmdGVyRG9jdW1lbnRMb2FkLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY
QnVpbGRGaWxlOyBmaWxlUmVmID0gRjREMjk4NkQyMEZFRTczNzAwOTJENjM2IC8qIFJ1blNjcmlw
dEFmdGVyRG9jdW1lbnRMb2FkLm1tICovOyB9OwogCQlGNEQ0RjNCNjFFNEUyQkNCMDBCQjI3Njcg
LyogRHJhZ0FuZERyb3BTaW11bGF0b3JJT1MubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC
dWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQ0RjNCNDFFNEUyQkNCMDBCQjI3NjcgLyogRHJhZ0FuZERy
b3BTaW11bGF0b3JJT1MubW0gKi87IH07CiAJCUY0RDRGM0I5MUU0RTM2RTQwMEJCMjc2NyAvKiBE
cmFnQW5kRHJvcFRlc3RzSU9TLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gRjRENEYzQjcxRTRFMzZFNDAwQkIyNzY3IC8qIERyYWdBbmREcm9wVGVzdHNJ
T1MubW0gKi87IH07CiAJCUY0RDVENjk1MjVBRjhCRTQwMDIwNTI4MCAvKiBEaXNhYmxlQXV0b21h
dGljU3BlbGxpbmdDb3JyZWN0aW9uLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG
aWxlOyBmaWxlUmVmID0gRjRENUQ2OTQyNUFGOEJFNDAwMjA1MjgwIC8qIERpc2FibGVBdXRvbWF0
aWNTcGVsbGluZ0NvcnJlY3Rpb24ubW0gKi87IH07CkBAIC0xMzA4LDYgKzEzMDgsOCBAQAogCQkJ
CUM1RTFBRkZFMTZCMjIxRjEwMDZDQzFGMiAvKiBleGVjQ29weS5odG1sIGluIENvcHkgUmVzb3Vy
Y2VzICovLAogCQkJCTcyODNBOUQyMjJGQjFFMDYwMEIyMUM3RCAvKiBleGlmLW9yaWVudGF0aW9u
LTgtbGxvLmpwZyBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlDREEyOUIyQjIwRkQzNTg0MDBG
MTVDRUQgLyogRXhpdEZ1bGxzY3JlZW5PbkVudGVyUGlQLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMg
Ki8sCisJCQkJOTM2MkYyNTAyNzNERTVGNjAwMzIzQzlCIC8qIGZpbGUtc3lzdGVtLWFjY2Vzcy1z
YWx0LnR4dCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQk5MzYyRjI1MTI3M0RFNUY2MDAzMjND
OUIgLyogZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlG
NDFBQjlBMzFFRjQ2OTZCMDA4M0ZBMDggLyogZmlsZS11cGxvYWRpbmcuaHRtbCBpbiBDb3B5IFJl
c291cmNlcyAqLywKIAkJCQlCQzJEMDA2NDEyQUEwNENFMDBFNzMyQTMgLyogZmlsZS13aXRoLWFu
Y2hvci5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTQ5RDJFNUMyMjczMUUzQkMwMEJD
Q0FFRCAvKiBmaWxlLXdpdGgtaWZyYW1lLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCkBAIC0y
NDUyLDYgKzI0NTQsOCBAQAogCQk5MzYwMjcwNTI1QTNCMjhFMDAzNjc2NzAgLyogc3BlZWNocmVj
b2duaXRpb24tYmFzaWMuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j
b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJzcGVlY2hy
ZWNvZ25pdGlvbi1iYXNpYy5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM2
MTAwMjgxNERDOTU3QjAwNjEzNzlEIC8qIGxvdHMtb2YtaWZyYW1lcy5odG1sICovID0ge2lzYSA9
IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g
dGV4dC5odG1sOyBwYXRoID0gImxvdHMtb2YtaWZyYW1lcy5odG1sIjsgc291cmNlVHJlZSA9ICI8
Z3JvdXA+IjsgfTsKIAkJOTM2MjVEMjYxQ0Q5NzNBRjAwNkRDMUYxIC8qIGxhcmdlLXZpZGVvLXdp
dGhvdXQtYXVkaW8uaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp
bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJsYXJnZS12aWRl
by13aXRob3V0LWF1ZGlvLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk5MzYy
RjI0RTI3M0RFNUU1MDAzMjNDOUIgLyogZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCAqLyA9IHtpc2Eg
PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9
IHRleHQ7IHBhdGggPSAiZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCI7IHNvdXJjZVRyZWUgPSAiPGdy
b3VwPiI7IH07CisJCTkzNjJGMjRGMjczREU1RTUwMDMyM0M5QiAvKiBmaWxlLXN5c3RlbS1hY2Nl
c3Mtc2FsdC50eHQgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gImZpbGUtc3lzdGVtLWFjY2Vzcy1z
YWx0LnR4dCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzNjhBMjVDMjI5RUZCM0Ew
MEE4MjlDQSAvKiBsb2NhbC1zdG9yYWdlLXByb2Nlc3Mtc3VzcGVuZHMtMi5odG1sICovID0ge2lz
YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl
ID0gdGV4dC5odG1sOyBwYXRoID0gImxvY2FsLXN0b3JhZ2UtcHJvY2Vzcy1zdXNwZW5kcy0yLmh0
bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzY4QTI1RDIyOUVGQjNBMDBBODI5
Q0EgLyogbG9jYWwtc3RvcmFnZS1wcm9jZXNzLXN1c3BlbmRzLTEuaHRtbCAqLyA9IHtpc2EgPSBQ
QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRl
eHQuaHRtbDsgcGF0aCA9ICJsb2NhbC1zdG9yYWdlLXByb2Nlc3Mtc3VzcGVuZHMtMS5odG1sIjsg
c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM2RjcyN0UxQ0Q3RDlEMDAwNjhBMEZCIC8q
IGxhcmdlLXZpZGVvLXdpdGgtYXVkaW8uaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl
OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9
ICJsYXJnZS12aWRlby13aXRoLWF1ZGlvLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9
OwpAQCAtNDAwMCw2ICs0MDA0LDggQEAKIAkJCQlGNDA3RkUzODFGMUQwREU2MDAxN0NGMjUgLyog
ZW5vcm1vdXMuc3ZnICovLAogCQkJCTcyODNBOUQxMjJGQjFEOTcwMEIyMUM3RCAvKiBleGlmLW9y
aWVudGF0aW9uLTgtbGxvLmpwZyAqLywKIAkJCQlDREEyOUIyQTIwRkQzNDRFMDBGMTVDRUQgLyog
RXhpdEZ1bGxzY3JlZW5PbkVudGVyUGlQLmh0bWwgKi8sCisJCQkJOTM2MkYyNEYyNzNERTVFNTAw
MzIzQzlCIC8qIGZpbGUtc3lzdGVtLWFjY2Vzcy1zYWx0LnR4dCAqLywKKwkJCQk5MzYyRjI0RTI3
M0RFNUU1MDAzMjNDOUIgLyogZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCAqLywKIAkJCQlGNDFBQjk5
QjFFRjQ2OTJDMDA4M0ZBMDggLyogZmlsZS11cGxvYWRpbmcuaHRtbCAqLywKIAkJCQk0OUQyRTVD
MTI3MzFFMzc0MDBCQ0NBRUQgLyogZmlsZS13aXRoLWlmcmFtZS5odG1sICovLAogCQkJCUExN0VB
QzU0MjA4MzA1NkUwMDg0QjQxQiAvKiBmaW5kLnBkZiAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlsZVN5c3RlbUFjY2Vzcy5tbSBiL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlsZVN5c3RlbUFjY2Vzcy5tbQppbmRl
eCAzNWI0YWM5MWU0MTgyNzRmNDgyYWU5YWQwOTdhY2FkODY4ZjRiMjkyLi4xYmIwOWJjNmRjMGNh
ZWEzMjQ1YWJlMjRkMmUyMGY5ZTE0YjhjYWY2IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0
QVBJL1Rlc3RzL1dlYktpdENvY29hL0ZpbGVTeXN0ZW1BY2Nlc3MubW0KKysrIGIvVG9vbHMvVGVz
dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9GaWxlU3lzdGVtQWNjZXNzLm1tCkBAIC05OSw3
ICs5OSw2IEBAIFRFU1QoRmlsZVN5c3RlbUFjY2VzcywgUHJvY2Vzc0NyYXNoRHVyaW5nV3JpdGUp
CiAgICAgfV07CiAgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVI
YW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIndlYmtpdCJdOwogCi0gICAgLy8gbG9hZCBmaXJz
dCB3ZWIgdmlldyAmIHN0YXJ0IHRlc3QKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tX
ZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDApIGNv
bmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIFt3ZWJWaWV3IGxvYWRIVE1M
U3RyaW5nOm1haW5GcmFtZVN0cmluZyBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAid2Vi
a2l0Oi8vd2Via2l0Lm9yZyJdXTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2Vp
dmVkU2NyaXB0TWVzc2FnZSk7CkBAIC0xMzEsNCArMTMwLDcxIEBAIFRFU1QoRmlsZVN5c3RlbUFj
Y2VzcywgUHJvY2Vzc0NyYXNoRHVyaW5nV3JpdGUpCiAgICAgRVhQRUNUX1dLX1NUUkVRKEAic3Vj
Y2Vzczogd3JpdGUgMTAgYnl0ZXMiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogfQogCitz
dGF0aWMgTlNTdHJpbmcgKmJhc2ljU3RyaW5nID0gQCI8c2NyaXB0PiBcCisgICAgYXN5bmMgZnVu
Y3Rpb24gb3BlbigpIFwKKyAgICB7IFwKKyAgICAgICAgdHJ5IHsgXAorICAgICAgICAgICAgdmFy
IHJvb3RIYW5kbGUgPSBhd2FpdCBuYXZpZ2F0b3Iuc3RvcmFnZS5nZXREaXJlY3RvcnkoKTsgXAor
ICAgICAgICAgICAgdmFyIGZpbGVIYW5kbGUgPSBhd2FpdCByb290SGFuZGxlLmdldEZpbGVIYW5k
bGUoJ2ZpbGUtc3lzdGVtLWFjY2Vzcy50eHQnLCB7ICdjcmVhdGUnIDogZmFsc2UgfSk7IFwKKyAg
ICAgICAgICAgIHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RN
ZXNzYWdlKCdmaWxlIGlzIG9wZW5lZCcpOyBcCisgICAgICAgIH0gY2F0Y2ggKGVycikgeyBcCisg
ICAgICAgICAgICB3aW5kb3cud2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0
TWVzc2FnZSgnZXJyb3I6ICcgKyBlcnIubmFtZSArICcgLSAnICsgZXJyLm1lc3NhZ2UpOyBcCisg
ICAgICAgIH0gXAorICAgIH0gXAorICAgIG9wZW4oKTsgXAorICAgIDwvc2NyaXB0PiI7CisKK1RF
U1QoRmlsZVN5c3RlbUFjY2VzcywgTWlncmF0ZVRvTmV3U3RvcmFnZURpcmVjdG9yeSkKK3sKKyAg
ICBOU1N0cmluZyAqaGFzaGVkT3JpZ2luID0gQCJScHZhX2xWR0hqb2pSbXhJN2VoOTJVcGRaVnZk
SDBPQ2lzMk1OQ00tbkRvIjsKKyAgICBOU1N0cmluZyAqc3RvcmFnZVR5cGUgPSBAIkZpbGVTeXN0
ZW0iOworICAgIE5TU3RyaW5nICpmaWxlTmFtZSA9IEAiZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCI7
CisgICAgCisgICAgTlNGaWxlTWFuYWdlciAqZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBk
ZWZhdWx0TWFuYWdlcl07CisKKyAgICAvLyBUaGlzIGlzIG9sZCB2YWx1ZSByZXR1cm5lZCBieSBX
ZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkoKS4KKyAgICAv
LyBDb3B5IGJha2VkIHN0b3JhZ2UgZmlsZXMgdG8gdGhpcyBkaXJlY3RvcnkuCisgICAgTlNTdHJp
bmcgKm9sZFN0b3JhZ2VEaXJlY3RvcnkgPSBbTlNIb21lRGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBl
bmRpbmdQYXRoQ29tcG9uZW50OkAiTGlicmFyeS9DYWNoZXMvY29tLmFwcGxlLldlYktpdC5UZXN0
V2ViS2l0QVBJL1dlYktpdC9TdG9yYWdlLyJdOworICAgIFtmaWxlTWFuYWdlciByZW1vdmVJdGVt
QXRQYXRoOm9sZFN0b3JhZ2VEaXJlY3RvcnkgZXJyb3I6bmlsXTsKKyAgICBFWFBFQ1RfRkFMU0Uo
W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm9sZFN0b3Jh
Z2VEaXJlY3RvcnldKTsKKyAgICAKKyAgICBOU1N0cmluZyAqb2xkRmlsZVN5c3RlbURpcmVjdG9y
eSA9IFtOU1N0cmluZyBwYXRoV2l0aENvbXBvbmVudHM6QFtvbGRTdG9yYWdlRGlyZWN0b3J5LCBo
YXNoZWRPcmlnaW4sIGhhc2hlZE9yaWdpbiwgc3RvcmFnZVR5cGVdXTsKKyAgICBbZmlsZU1hbmFn
ZXIgY3JlYXRlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpvbGRGaWxlU3lz
dGVtRGlyZWN0b3J5XSB3aXRoSW50ZXJtZWRpYXRlRGlyZWN0b3JpZXM6WUVTIGF0dHJpYnV0ZXM6
bmlsIGVycm9yOm5pbF07CisgICAgTlNTdHJpbmcgKnJlc291cmNlRmlsZVBhdGggPSBbW05TQnVu
ZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiZmlsZS1zeXN0ZW0tYWNjZXNzIiB3aXRo
RXh0ZW5zaW9uOkAidHh0IiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJd
LnBhdGg7CisgICAgTlNTdHJpbmcgKm9sZEZpbGVQYXRoID0gW29sZEZpbGVTeXN0ZW1EaXJlY3Rv
cnkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmZpbGVOYW1lXTsKKyAgICBbZmlsZU1h
bmFnZXIgY29weUl0ZW1BdFBhdGg6cmVzb3VyY2VGaWxlUGF0aCB0b1BhdGg6b2xkRmlsZVBhdGgg
ZXJyb3I6bmlsXTsKKyAgICBFWFBFQ1RfVFJVRShbZmlsZU1hbmFnZXIgZmlsZUV4aXN0c0F0UGF0
aDpvbGRGaWxlUGF0aF0pOworCisgICAgTlNTdHJpbmcgKnJlc291cmNlU2FsdFBhdGggPSBbW05T
QnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiZmlsZS1zeXN0ZW0tYWNjZXNzLXNh
bHQiIHdpdGhFeHRlbnNpb246QCJ0eHQiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVz
b3VyY2VzIl0ucGF0aDsKKyAgICBOU1N0cmluZyAqb2xkU2FsdFBhdGggPSBbb2xkU3RvcmFnZURp
cmVjdG9yeSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJzYWx0Il07CisgICAgW2Zp
bGVNYW5hZ2VyIGNvcHlJdGVtQXRQYXRoOnJlc291cmNlU2FsdFBhdGggdG9QYXRoOm9sZFNhbHRQ
YXRoIGVycm9yOm5pbF07CisgICAgRVhQRUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRN
YW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm9sZFNhbHRQYXRoXSk7CisKKyAgICAvLyBUaGlzIGlz
IGN1cnJlbnQgdmFsdWUgcmV0dXJuZWQgYnkgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdEdlbmVy
YWxTdG9yYWdlRGlyZWN0b3J5KCkuCisgICAgTlNTdHJpbmcgKm5ld1N0b3JhZ2VEaXJlY3Rvcnkg
PSBbTlNIb21lRGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTGli
cmFyeS9XZWJLaXQvY29tLmFwcGxlLldlYktpdC5UZXN0V2ViS2l0QVBJL1dlYnNpdGVEYXRhL0Rl
ZmF1bHQvIl07CisgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6bmV3U3RvcmFnZURp
cmVjdG9yeSBlcnJvcjpuaWxdOworICAgIE5TU3RyaW5nICpuZXdGaWxlUGF0aCA9IFtOU1N0cmlu
ZyBwYXRoV2l0aENvbXBvbmVudHM6QFtuZXdTdG9yYWdlRGlyZWN0b3J5LCBoYXNoZWRPcmlnaW4s
IGhhc2hlZE9yaWdpbiwgc3RvcmFnZVR5cGUsIGZpbGVOYW1lXV07CisgICAgRVhQRUNUX0ZBTFNF
KFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOm5ld0ZpbGVQYXRoXSk7CisKKyAgICAvLyBJ
bnZva2luZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0R2VuZXJhbFN0b3JhZ2VEaXJlY3Rvcnko
KSB0byBtb3ZlIHRyaWdnZXIgbWlncmF0aW9uLgorICAgIE5TU3RyaW5nICpjdXJyZW50U3RvcmFn
ZURpcmVjdG9yeSA9IFtbW1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZhdWx0RGF0YVN0b3JlXSBfY29u
ZmlndXJhdGlvbl0gZ2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnldLnBhdGg7CisgICAgRVhQRUNUX1dL
X1NUUkVRKG5ld1N0b3JhZ2VEaXJlY3RvcnksIGN1cnJlbnRTdG9yYWdlRGlyZWN0b3J5KTsKKyAg
ICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3Rz
QXRQYXRoOm9sZEZpbGVQYXRoXSk7CisgICAgRVhQRUNUX1RSVUUoW1tOU0ZpbGVNYW5hZ2VyIGRl
ZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm5ld0ZpbGVQYXRoXSk7CisKKyAgICAvLyBF
bnN1cmUgZmlsZSBjYW4gYmUgb3BlbmVkIGFmdGVyIG1pZ3JhdGlvbjogdGVzdCBwYWdlIG9ubHkg
b3BlbnMgdGhlIGZpbGUgaWYgaXQgZXhpc3RzLgorICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMo
W1tGaWxlU3lzdGVtQWNjZXNzTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBhdXRv
IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10g
aW5pdF0pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNj
cmlwdE1lc3NhZ2VIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgbmFtZTpAInRlc3RIYW5kbGVyIl07Cisg
ICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXTsKKyAgICBw
cmVmZXJlbmNlcy5fZmlsZVN5c3RlbUFjY2Vzc0VuYWJsZWQgPSBZRVM7CisgICAgcHJlZmVyZW5j
ZXMuX3N0b3JhZ2VBUElFbmFibGVkID0gWUVTOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO
UyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwg
NjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBbd2ViVmlldyBs
b2FkSFRNTFN0cmluZzpiYXNpY1N0cmluZyBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAi
aHR0cHM6Ly93ZWJraXQub3JnIl1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVj
ZWl2ZWRTY3JpcHRNZXNzYWdlKTsKKyAgICByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsK
KyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJmaWxlIGlzIG9wZW5lZCIsIFtsYXN0U2NyaXB0TWVzc2Fn
ZSBib2R5XSk7Cit9CisKICNlbmRpZiAvLyBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444084</attachid>
            <date>2021-11-12 11:23:48 -0800</date>
            <delta_ts>2021-11-12 14:40:58 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232985-20211112112347.patch</filename>
            <type>text/plain</type>
            <size>15629</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4NmQzM2JhZTlkZjY0ZmI5
MmM0OGVlNzQwNWM0MWM4MTkxMjhkNWUuLmEwMGFiMzA2ZDU3NzhjMzMxZDUwNWI5OTFhZjMwYTlk
Mjg2NzczM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMTIgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgU2V0IGRlZmF1bHQgZ2VuZXJhbCBz
dG9yYWdlIGRpcmVjdG9yeSB0byB3ZWJzaXRlRGF0YURpcmVjdG9yeQorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg1CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmV3IEFQSSB0ZXN0OiBGaWxlU3lzdGVt
QWNjZXNzLk1pZ3JhdGVUb05ld1N0b3JhZ2VEaXJlY3RvcnkKKworICAgICAgICAqIFVJUHJvY2Vz
cy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAg
KiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgor
ICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0R2VuZXJhbFN0b3JhZ2VE
aXJlY3RvcnkpOgorCiAyMDIxLTExLTEyICBQZXIgQXJuZSBWb2xsYW4gPHB2b2xsYW5AYXBwbGUu
Y29tPgogCiAgICAgICAgIFtpT1NdW0dQVV0gUmVtb3ZlIGFjY2VzcyB0byBJT0tpdCBjbGFzc2Vz
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0
ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D
b2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCmluZGV4IDk3ZmU1YmEyM2Fj
Y2I5NzlmODczZTRhZDZmMDQ2NmZmNmY3MzkwNmUuLjk4OGFiOWM4OTdlMzE5NTA3ZTRiMTM3ZTlh
ZTIzMjliMzk1YTVkZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D
b2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5o
CkBAIC04Miw3ICs4Miw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMyksIGlvcygx
MS4wKSkKIAogQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU1VSTCAqYWx0
ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygx
MS4wKSwgaW9zKDE0LjApKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkg
TlNVUkwgKnN0YW5kYWxvbmVBcHBsaWNhdGlvblVSTCBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEx
LjApLCBpb3MoMTQuMCkpOwotQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBO
U1VSTCAqc3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp
LCBpb3MoV0tfSU9TX1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5
KSBOU1VSTCAqZ2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX
S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIAogLy8gVGVzdGluZyBvbmx5LgogQHByb3Bl
cnR5IChub25hdG9taWMpIEJPT0wgYWxsTG9hZHNCbG9ja2VkQnlEZXZpY2VNYW5hZ2VtZW50UmVz
dHJpY3Rpb25zRm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9zKDEz
LjApKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0Nv
Y29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl
YnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQppbmRleCA3MGUzYzE3ZDEz
NzFiMTkzNzg1ZmRjZWYyYjdmYTM3NjQyMWU2MDFiLi4wY2NiNjYyYmExYjM5NzNlNDNkNmY3NWMy
MTRkNWU3NWM0ZjlhZWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJz
aXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCkBA
IC0yNzgsNyArMjc4LDI4IEBAIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0Q2FjaGVT
dG9yYWdlRGlyZWN0b3J5KCkKIAogU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRHZW5l
cmFsU3RvcmFnZURpcmVjdG9yeSgpCiB7Ci0gICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5RmlsZVN5
c3RlbVJlcHJlc2VudGF0aW9uKCJTdG9yYWdlIik7CisgICAgYXV0byBkaXJlY3RvcnkgPSB3ZWJz
aXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiRGVmYXVsdCIpOworCisg
ICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CisgICAgZGlzcGF0Y2hfb25jZSgm
b25jZVRva2VuLCBeeworICAgICAgICAvLyBUaGlzIGlzIHRoZSBvbGQgc3RvcmFnZSBkaXJlY3Rv
cnksIGFuZCB0aGVyZSBtaWdodCBiZSBmaWxlcyBsZWZ0IGhlcmUuCisgICAgICAgIGF1dG8gb2xk
RGlyZWN0b3J5ID0gY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oIlN0b3Jh
Z2UiLCBTaG91bGRDcmVhdGVEaXJlY3Rvcnk6Ok5vKTsKKyAgICAgICAgTlNGaWxlTWFuYWdlciAq
ZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl07CisgICAgICAgIE5T
QXJyYXkgKmZpbGVzID0gW2ZpbGVNYW5hZ2VyIGNvbnRlbnRzT2ZEaXJlY3RvcnlBdFBhdGg6b2xk
RGlyZWN0b3J5IGVycm9yOjBdOworICAgICAgICBpZiAoZmlsZXMpIHsKKyAgICAgICAgICAgIGZv
ciAoTlNTdHJpbmcgKmZpbGVOYW1lIGluIGZpbGVzKSB7CisgICAgICAgICAgICAgICAgaWYgKCFb
ZmlsZU5hbWUgbGVuZ3RoXSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAg
ICAgICAgICAgICBOU1N0cmluZyAqcGF0aCA9IFtkaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQ
YXRoQ29tcG9uZW50OmZpbGVOYW1lXTsKKyAgICAgICAgICAgICAgICBOU1N0cmluZyAqb2xkUGF0
aCA9IFtvbGREaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmZpbGVOYW1l
XTsKKyAgICAgICAgICAgICAgICBbZmlsZU1hbmFnZXIgbW92ZUl0ZW1BdFBhdGg6b2xkUGF0aCB0
b1BhdGg6cGF0aCBlcnJvcjpuaWxdOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAg
IFtmaWxlTWFuYWdlciByZW1vdmVJdGVtQXRQYXRoOm9sZERpcmVjdG9yeSBlcnJvcjpuaWxdOwor
ICAgIH0pOworCisgICAgcmV0dXJuIGRpcmVjdG9yeTsKIH0KIAogU3RyaW5nIFdlYnNpdGVEYXRh
U3RvcmU6OmRlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoKQpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDg0OGZhM2ZiMDY0NmYwZTA1ZjhhYzE5
Mjg0NTZkMDExMjUyZjRmZWQuLmUwMGIzNWVmZTJhYWY3MmY1M2JiZWE0MzQ1ODY0MzE5OWMzMGIz
YTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNCBAQAorMjAyMS0xMS0xMiAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNv
bT4KKworICAgICAgICBTZXQgZGVmYXVsdCBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0b3J5IHRvIHdl
YnNpdGVEYXRhRGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzI5ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVj
dC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmls
ZVN5c3RlbUFjY2Vzcy5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv
Y29hL2ZpbGUtc3lzdGVtLWFjY2Vzcy5zYWx0OiBBZGRlZC4KKwogMjAyMS0xMS0xMiAgQ2hyaXMg
RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdCBpcyB1bmFibGUgdG8g
cmVjb3ZlciBpZiBhIFdlYlByb2Nlc3MgZ2V0cyB0ZXJtaW5hdGVkIHdoaWxlIGl0IGlzIGxhdW5j
aGluZwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2Rl
cHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEku
eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA4MzA4MGMzYjE1ZmIwNjdiZTQyMDE4N2Ri
NWFjMTkwYzRlODdiNTE0Li5jY2IzYTZmNzljYzI4MzlmZWQ5ODk3N2VhOGI1OGNiYjRmMjg2ZjI0
IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9q
L3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEku
eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzMyLDYgKzczMiw3IEBACiAJCTkzNTc4NkND
MjBGNkEyNzAwMDAwQ0RGQyAvKiBJbmRleGVkREIuc3FsaXRlMy13YWwgaW4gQ29weSBSZXNvdXJj
ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM0RkE1QzUyMEY2OUZFRDAw
NDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXdhbCAqLzsgfTsKIAkJOTM1Nzg2Q0QyMEY2QTI5
MTAwMDBDREZDIC8qIEluZGV4ZWREQi5zcWxpdGUzIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lz
YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEZBNUM3MjBGNjlGRUUwMDQwREMxQiAvKiBJ
bmRleGVkREIuc3FsaXRlMyAqLzsgfTsKIAkJOTM1Nzg2Q0UyMEY2QTJBMTAwMDBDREZDIC8qIElu
ZGV4ZWREQi5zcWxpdGUzLXNobSBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA5MzRGQTVDNjIwRjY5RkVEMDA0MERDMUIgLyogSW5kZXhlZERCLnNx
bGl0ZTMtc2htICovOyB9OworCQk5MzU4QzMzQzI3M0VEMDdCMDBGM0IzOEMgLyogZmlsZS1zeXN0
ZW0tYWNjZXNzLnNhbHQgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gOTM1OEMzM0IyNzNFRDA2QTAwRjNCMzhDIC8qIGZpbGUtc3lzdGVtLWFjY2Vz
cy5zYWx0ICovOyB9OwogCQk5MzYwMjcwNjI1QTNDRjc2MDAzNjc2NzAgLyogc3BlZWNocmVjb2du
aXRpb24tYmFzaWMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp
bGU7IGZpbGVSZWYgPSA5MzYwMjcwNTI1QTNCMjhFMDAzNjc2NzAgLyogc3BlZWNocmVjb2duaXRp
b24tYmFzaWMuaHRtbCAqLzsgfTsKIAkJOTM2MTAwMjkxNERDOTVBNzAwNjEzNzlEIC8qIGxvdHMt
b2YtaWZyYW1lcy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls
ZTsgZmlsZVJlZiA9IDkzNjEwMDI4MTREQzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMu
aHRtbCAqLzsgfTsKIAkJOTM2MjVEMjcxQ0Q5NzQxQzAwNkRDMUYxIC8qIGxhcmdlLXZpZGVvLXdp
dGhvdXQtYXVkaW8uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp
bGU7IGZpbGVSZWYgPSA5MzYyNUQyNjFDRDk3M0FGMDA2REMxRjEgLyogbGFyZ2UtdmlkZW8td2l0
aG91dC1hdWRpby5odG1sICovOyB9OwpAQCAtMTA3NSwxMSArMTA3Niw5IEBACiAJCUY0QzJBQjIy
MURENkQ5NUUwMEUwNkQ1QiAvKiBlbm9ybW91cy12aWRlby13aXRoLXNvdW5kLmh0bWwgaW4gQ29w
eSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDMkFCMjEx
REQ2RDk0MTAwRTA2RDVCIC8qIGVub3Jtb3VzLXZpZGVvLXdpdGgtc291bmQuaHRtbCAqLzsgfTsK
IAkJRjRDODc5N0YyMDU5RDhEMzAwOUNEMDBCIC8qIFNjcm9sbFZpZXdJbnNldFRlc3RzLm1tIGlu
IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDODc5N0UyMDU5
RDhEMzAwOUNEMDBCIC8qIFNjcm9sbFZpZXdJbnNldFRlc3RzLm1tICovOyB9OwogCQlGNENENzRD
NjIwRkRBQ0ZBMDBERTM3OTQgLyogdGV4dC13aXRoLWFzeW5jLXNjcmlwdC5odG1sIGluIENvcHkg
UmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0Q0Q3NEM1MjBG
REFDRjUwMERFMzc5NCAvKiB0ZXh0LXdpdGgtYXN5bmMtc2NyaXB0Lmh0bWwgKi87IH07Ci0JCUY0
Q0Q3NEM5MjBGREI0OTYwMERFMzc5NCAvKiBUZXN0VVJMU2NoZW1lSGFuZGxlci5tbSBpbiBTb3Vy
Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0Q0Q3NEM4MjBGREI0OTYw
MERFMzc5NCAvKiBUZXN0VVJMU2NoZW1lSGFuZGxlci5tbSAqLzsgfTsKIAkJRjRDRjMyODAyMzY2
NTUyMjAwRDNBRDA3IC8qIEVudGVyS2V5SGludFRlc3RzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNh
ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDRjMyN0YyMzY2NTUyMjAwRDNBRDA3IC8qIEVu
dGVyS2V5SGludFRlc3RzLm1tICovOyB9OwogCQlGNENGQ0REQTI0OUZDOUU0MDA1Mjc0ODIgLyog
U3BhY2VPbmx5Lm90ZiBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7
IGZpbGVSZWYgPSBGNENGQ0REODI0OUZDOUQ5MDA1Mjc0ODIgLyogU3BhY2VPbmx5Lm90ZiAqLzsg
fTsKIAkJRjREMDYwMDgyNzM0QTFBQjAwOEZBNjdBIC8qIHNpbXBsZS1lZGl0b3IuaHRtbCBpbiBD
b3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQwNjAw
NzI3MzRBMDhDMDA4RkE2N0EgLyogc2ltcGxlLWVkaXRvci5odG1sICovOyB9OwotCQlGNEQyOTg2
RTIwRkVFNzM3MDA5MkQ2MzYgLyogUnVuU2NyaXB0QWZ0ZXJEb2N1bWVudExvYWQubW0gaW4gU291
cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQyOTg2RDIwRkVFNzM3
MDA5MkQ2MzYgLyogUnVuU2NyaXB0QWZ0ZXJEb2N1bWVudExvYWQubW0gKi87IH07CiAJCUY0RDRG
M0I2MUU0RTJCQ0IwMEJCMjc2NyAvKiBEcmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbSBpbiBTb3Vy
Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0RDRGM0I0MUU0RTJCQ0Iw
MEJCMjc2NyAvKiBEcmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbSAqLzsgfTsKIAkJRjRENEYzQjkx
RTRFMzZFNDAwQkIyNzY3IC8qIERyYWdBbmREcm9wVGVzdHNJT1MubW0gaW4gU291cmNlcyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQ0RjNCNzFFNEUzNkU0MDBCQjI3Njcg
LyogRHJhZ0FuZERyb3BUZXN0c0lPUy5tbSAqLzsgfTsKIAkJRjRENUQ2OTUyNUFGOEJFNDAwMjA1
MjgwIC8qIERpc2FibGVBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rpb24ubW0gaW4gU291cmNlcyAq
LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQ1RDY5NDI1QUY4QkU0MDAyMDUy
ODAgLyogRGlzYWJsZUF1dG9tYXRpY1NwZWxsaW5nQ29ycmVjdGlvbi5tbSAqLzsgfTsKQEAgLTEz
MDgsNiArMTMwNyw3IEBACiAJCQkJQzVFMUFGRkUxNkIyMjFGMTAwNkNDMUYyIC8qIGV4ZWNDb3B5
Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJNzI4M0E5RDIyMkZCMUUwNjAwQjIxQzdE
IC8qIGV4aWYtb3JpZW50YXRpb24tOC1sbG8uanBnIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJ
CUNEQTI5QjJCMjBGRDM1ODQwMEYxNUNFRCAvKiBFeGl0RnVsbHNjcmVlbk9uRW50ZXJQaVAuaHRt
bCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQk5MzU4QzMzQzI3M0VEMDdCMDBGM0IzOEMgLyog
ZmlsZS1zeXN0ZW0tYWNjZXNzLnNhbHQgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJRjQxQUI5
QTMxRUY0Njk2QjAwODNGQTA4IC8qIGZpbGUtdXBsb2FkaW5nLmh0bWwgaW4gQ29weSBSZXNvdXJj
ZXMgKi8sCiAJCQkJQkMyRDAwNjQxMkFBMDRDRTAwRTczMkEzIC8qIGZpbGUtd2l0aC1hbmNob3Iu
aHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk0OUQyRTVDMjI3MzFFM0JDMDBCQ0NBRUQg
LyogZmlsZS13aXRoLWlmcmFtZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMjQ0OSw2
ICsyNDQ5LDcgQEAKIAkJOTM0RkE1QzYyMEY2OUZFRDAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxp
dGUzLXNobSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9
IGZpbGU7IHBhdGggPSAiSW5kZXhlZERCLnNxbGl0ZTMtc2htIjsgc291cmNlVHJlZSA9ICI8Z3Jv
dXA+IjsgfTsKIAkJOTM0RkE1QzcyMEY2OUZFRTAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUz
ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsg
cGF0aCA9IEluZGV4ZWREQi5zcWxpdGUzOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5
MzU3NUM1NTFEMzAzNjZFMDAwRDYwNEQgLyogZm9jdXMtaW5wdXRzLmh0bWwgKi8gPSB7aXNhID0g
UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0
ZXh0Lmh0bWw7IHBhdGggPSAiZm9jdXMtaW5wdXRzLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91
cD4iOyB9OworCQk5MzU4QzMzQjI3M0VEMDZBMDBGM0IzOEMgLyogZmlsZS1zeXN0ZW0tYWNjZXNz
LnNhbHQgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBm
aWxlOyBwYXRoID0gImZpbGUtc3lzdGVtLWFjY2Vzcy5zYWx0Ijsgc291cmNlVHJlZSA9ICI8Z3Jv
dXA+IjsgfTsKIAkJOTM2MDI3MDUyNUEzQjI4RTAwMzY3NjcwIC8qIHNwZWVjaHJlY29nbml0aW9u
LWJhc2ljLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAic3BlZWNocmVjb2duaXRp
b24tYmFzaWMuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzNjEwMDI4MTRE
Qzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxl
UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRt
bDsgcGF0aCA9ICJsb3RzLW9mLWlmcmFtZXMuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7
IH07CiAJCTkzNjI1RDI2MUNEOTczQUYwMDZEQzFGMSAvKiBsYXJnZS12aWRlby13aXRob3V0LWF1
ZGlvLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg
bGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAibGFyZ2UtdmlkZW8td2l0aG91
dC1hdWRpby5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQwMDAsNiArNDAw
MSw3IEBACiAJCQkJRjQwN0ZFMzgxRjFEMERFNjAwMTdDRjI1IC8qIGVub3Jtb3VzLnN2ZyAqLywK
IAkJCQk3MjgzQTlEMTIyRkIxRDk3MDBCMjFDN0QgLyogZXhpZi1vcmllbnRhdGlvbi04LWxsby5q
cGcgKi8sCiAJCQkJQ0RBMjlCMkEyMEZEMzQ0RTAwRjE1Q0VEIC8qIEV4aXRGdWxsc2NyZWVuT25F
bnRlclBpUC5odG1sICovLAorCQkJCTkzNThDMzNCMjczRUQwNkEwMEYzQjM4QyAvKiBmaWxlLXN5
c3RlbS1hY2Nlc3Muc2FsdCAqLywKIAkJCQlGNDFBQjk5QjFFRjQ2OTJDMDA4M0ZBMDggLyogZmls
ZS11cGxvYWRpbmcuaHRtbCAqLywKIAkJCQk0OUQyRTVDMTI3MzFFMzc0MDBCQ0NBRUQgLyogZmls
ZS13aXRoLWlmcmFtZS5odG1sICovLAogCQkJCUExN0VBQzU0MjA4MzA1NkUwMDg0QjQxQiAvKiBm
aW5kLnBkZiAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0
Q29jb2EvRmlsZVN5c3RlbUFjY2Vzcy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi
S2l0Q29jb2EvRmlsZVN5c3RlbUFjY2Vzcy5tbQppbmRleCAzNWI0YWM5MWU0MTgyNzRmNDgyYWU5
YWQwOTdhY2FkODY4ZjRiMjkyLi4xNjYzM2VhMDE0NDczNzZkZjY2YjkxYzcwNjViYmIyYzZmNzBh
Mzk5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Zp
bGVTeXN0ZW1BY2Nlc3MubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD
b2NvYS9GaWxlU3lzdGVtQWNjZXNzLm1tCkBAIC05OSw3ICs5OSw2IEBAIFRFU1QoRmlsZVN5c3Rl
bUFjY2VzcywgUHJvY2Vzc0NyYXNoRHVyaW5nV3JpdGUpCiAgICAgfV07CiAgICAgW2NvbmZpZ3Vy
YXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVSTFNjaGVt
ZTpAIndlYmtpdCJdOwogCi0gICAgLy8gbG9hZCBmaXJzdCB3ZWIgdmlldyAmIHN0YXJ0IHRlc3QK
ICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy
YW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlv
bi5nZXQoKV0pOwogICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOm1haW5GcmFtZVN0cmluZyBi
YXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAid2Via2l0Oi8vd2Via2l0Lm9yZyJdXTsKICAg
ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CkBAIC0x
MzEsNCArMTMwLDcwIEBAIFRFU1QoRmlsZVN5c3RlbUFjY2VzcywgUHJvY2Vzc0NyYXNoRHVyaW5n
V3JpdGUpCiAgICAgRVhQRUNUX1dLX1NUUkVRKEAic3VjY2Vzczogd3JpdGUgMTAgYnl0ZXMiLCBb
bGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogfQogCitzdGF0aWMgTlNTdHJpbmcgKmJhc2ljU3Ry
aW5nID0gQCI8c2NyaXB0PiBcCisgICAgYXN5bmMgZnVuY3Rpb24gb3BlbigpIFwKKyAgICB7IFwK
KyAgICAgICAgdHJ5IHsgXAorICAgICAgICAgICAgdmFyIHJvb3RIYW5kbGUgPSBhd2FpdCBuYXZp
Z2F0b3Iuc3RvcmFnZS5nZXREaXJlY3RvcnkoKTsgXAorICAgICAgICAgICAgdmFyIGZpbGVIYW5k
bGUgPSBhd2FpdCByb290SGFuZGxlLmdldEZpbGVIYW5kbGUoJ2ZpbGUtc3lzdGVtLWFjY2Vzcy50
eHQnLCB7ICdjcmVhdGUnIDogZmFsc2UgfSk7IFwKKyAgICAgICAgICAgIHdpbmRvdy53ZWJraXQu
bWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdmaWxlIGlzIG9wZW5lZCcp
OyBcCisgICAgICAgIH0gY2F0Y2ggKGVycikgeyBcCisgICAgICAgICAgICB3aW5kb3cud2Via2l0
Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgnZXJyb3I6ICcgKyBlcnIu
bmFtZSArICcgLSAnICsgZXJyLm1lc3NhZ2UpOyBcCisgICAgICAgIH0gXAorICAgIH0gXAorICAg
IG9wZW4oKTsgXAorICAgIDwvc2NyaXB0PiI7CisKK1RFU1QoRmlsZVN5c3RlbUFjY2VzcywgTWln
cmF0ZVRvTmV3U3RvcmFnZURpcmVjdG9yeSkKK3sKKyAgICBOU1N0cmluZyAqaGFzaGVkT3JpZ2lu
ID0gQCJScHZhX2xWR0hqb2pSbXhJN2VoOTJVcGRaVnZkSDBPQ2lzMk1OQ00tbkRvIjsKKyAgICBO
U1N0cmluZyAqc3RvcmFnZVR5cGUgPSBAIkZpbGVTeXN0ZW0iOworICAgIE5TU3RyaW5nICpmaWxl
TmFtZSA9IEAiZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCI7CisgICAgCisgICAgTlNGaWxlTWFuYWdl
ciAqZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl07CisKKyAgICAv
LyBUaGlzIGlzIG9sZCB2YWx1ZSByZXR1cm5lZCBieSBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0
R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkoKS4KKyAgICAvLyBDb3B5IGJha2VkIHN0b3JhZ2UgZmls
ZXMgdG8gdGhpcyBkaXJlY3RvcnkuCisgICAgTlNTdHJpbmcgKm9sZFN0b3JhZ2VEaXJlY3Rvcnkg
PSBbTlNIb21lRGlyZWN0b3J5KCkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTGli
cmFyeS9DYWNoZXMvY29tLmFwcGxlLldlYktpdC5UZXN0V2ViS2l0QVBJL1dlYktpdC9TdG9yYWdl
LyJdOworICAgIFtmaWxlTWFuYWdlciByZW1vdmVJdGVtQXRQYXRoOm9sZFN0b3JhZ2VEaXJlY3Rv
cnkgZXJyb3I6bmlsXTsKKyAgICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRN
YW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm9sZFN0b3JhZ2VEaXJlY3RvcnldKTsKKyAgICAKKyAg
ICBOU1N0cmluZyAqb2xkRmlsZVN5c3RlbURpcmVjdG9yeSA9IFtOU1N0cmluZyBwYXRoV2l0aENv
bXBvbmVudHM6QFtvbGRTdG9yYWdlRGlyZWN0b3J5LCBoYXNoZWRPcmlnaW4sIGhhc2hlZE9yaWdp
biwgc3RvcmFnZVR5cGVdXTsKKyAgICBbZmlsZU1hbmFnZXIgY3JlYXRlRGlyZWN0b3J5QXRVUkw6
W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpvbGRGaWxlU3lzdGVtRGlyZWN0b3J5XSB3aXRoSW50ZXJt
ZWRpYXRlRGlyZWN0b3JpZXM6WUVTIGF0dHJpYnV0ZXM6bmlsIGVycm9yOm5pbF07CisgICAgTlNT
dHJpbmcgKm9sZEZpbGVQYXRoID0gW29sZEZpbGVTeXN0ZW1EaXJlY3Rvcnkgc3RyaW5nQnlBcHBl
bmRpbmdQYXRoQ29tcG9uZW50OmZpbGVOYW1lXTsKKyAgICBbZmlsZU1hbmFnZXIgY3JlYXRlRmls
ZUF0UGF0aDpvbGRGaWxlUGF0aCBjb250ZW50czpuaWwgYXR0cmlidXRlczpuaWxdOworICAgIEVY
UEVDVF9UUlVFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOm9sZEZpbGVQYXRoXSk7CisK
KyAgICBOU1N0cmluZyAqcmVzb3VyY2VTYWx0UGF0aCA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0g
VVJMRm9yUmVzb3VyY2U6QCJmaWxlLXN5c3RlbS1hY2Nlc3MiIHdpdGhFeHRlbnNpb246QCJzYWx0
IiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdLnBhdGg7CisgICAgTlNT
dHJpbmcgKm9sZFNhbHRQYXRoID0gW29sZFN0b3JhZ2VEaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRp
bmdQYXRoQ29tcG9uZW50OkAic2FsdCJdOworICAgIFtmaWxlTWFuYWdlciBjb3B5SXRlbUF0UGF0
aDpyZXNvdXJjZVNhbHRQYXRoIHRvUGF0aDpvbGRTYWx0UGF0aCBlcnJvcjpuaWxdOworICAgIEVY
UEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0
aDpvbGRTYWx0UGF0aF0pOworCisgICAgLy8gVGhpcyBpcyBjdXJyZW50IHZhbHVlIHJldHVybmVk
IGJ5IFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSgpLgor
ICAgIE5TU3RyaW5nICpuZXdTdG9yYWdlRGlyZWN0b3J5ID0gW05TSG9tZURpcmVjdG9yeSgpIHN0
cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkxpYnJhcnkvV2ViS2l0L2NvbS5hcHBsZS5X
ZWJLaXQuVGVzdFdlYktpdEFQSS9XZWJzaXRlRGF0YS9EZWZhdWx0LyJdOworICAgIFtmaWxlTWFu
YWdlciByZW1vdmVJdGVtQXRQYXRoOm5ld1N0b3JhZ2VEaXJlY3RvcnkgZXJyb3I6bmlsXTsKKyAg
ICBOU1N0cmluZyAqbmV3RmlsZVBhdGggPSBbTlNTdHJpbmcgcGF0aFdpdGhDb21wb25lbnRzOkBb
bmV3U3RvcmFnZURpcmVjdG9yeSwgaGFzaGVkT3JpZ2luLCBoYXNoZWRPcmlnaW4sIHN0b3JhZ2VU
eXBlLCBmaWxlTmFtZV1dOworICAgIEVYUEVDVF9GQUxTRShbZmlsZU1hbmFnZXIgZmlsZUV4aXN0
c0F0UGF0aDpuZXdGaWxlUGF0aF0pOworCisgICAgLy8gSW52b2tpbmcgV2Vic2l0ZURhdGFTdG9y
ZTo6ZGVmYXVsdEdlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KCkgdG8gbW92ZSB0cmlnZ2VyIG1pZ3Jh
dGlvbi4KKyAgICBOU1N0cmluZyAqY3VycmVudFN0b3JhZ2VEaXJlY3RvcnkgPSBbW1tXS1dlYnNp
dGVEYXRhU3RvcmUgZGVmYXVsdERhdGFTdG9yZV0gX2NvbmZpZ3VyYXRpb25dIGdlbmVyYWxTdG9y
YWdlRGlyZWN0b3J5XS5wYXRoOworICAgIEVYUEVDVF9XS19TVFJFUShuZXdTdG9yYWdlRGlyZWN0
b3J5LCBjdXJyZW50U3RvcmFnZURpcmVjdG9yeSk7CisgICAgRVhQRUNUX0ZBTFNFKFtbTlNGaWxl
TWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpvbGRGaWxlUGF0aF0pOwor
ICAgIEVYUEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0
c0F0UGF0aDpuZXdGaWxlUGF0aF0pOworCisgICAgLy8gRW5zdXJlIGZpbGUgY2FuIGJlIG9wZW5l
ZCBhZnRlciBtaWdyYXRpb246IHRlc3QgcGFnZSBvbmx5IG9wZW5zIHRoZSBmaWxlIGlmIGl0IGV4
aXN0cy4KKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbRmlsZVN5c3RlbUFjY2Vzc01lc3Nh
Z2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHRO
UyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbW2NvbmZpZ3Vy
YXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpoYW5k
bGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworICAgIGF1dG8gcHJlZmVyZW5jZXMgPSBb
Y29uZmlndXJhdGlvbiBwcmVmZXJlbmNlc107CisgICAgcHJlZmVyZW5jZXMuX2ZpbGVTeXN0ZW1B
Y2Nlc3NFbmFibGVkID0gWUVTOworICAgIHByZWZlcmVuY2VzLl9zdG9yYWdlQVBJRW5hYmxlZCA9
IFlFUzsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu
aXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25m
aWd1cmF0aW9uLmdldCgpXSk7CisgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6YmFzaWNTdHJp
bmcgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8vd2Via2l0Lm9yZyJdXTsK
KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7Cisg
ICAgcmVjZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAi
ZmlsZSBpcyBvcGVuZWQiLCBbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOworfQorCiAjZW5kaWYg
Ly8gVVNFKEFQUExFX0lOVEVSTkFMX1NESykKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB
UEkvVGVzdHMvV2ViS2l0Q29jb2EvZmlsZS1zeXN0ZW0tYWNjZXNzLnNhbHQgYi9Ub29scy9UZXN0
V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL2ZpbGUtc3lzdGVtLWFjY2Vzcy5zYWx0Cm5ldyBm
aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAuLmFkZjM1NzE3YzFjNDhmN2I4NTA5NTFiZmE5M2I5YmI4ODU4ZjEzZDYKLS0tIC9kZXYv
bnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL2ZpbGUtc3lz
dGVtLWFjY2Vzcy5zYWx0CkBAIC0wLDAgKzEgQEAKK1mS+XUUCTMkClwgTm8gbmV3bGluZSBhdCBl
bmQgb2YgZmlsZQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>444111</attachid>
            <date>2021-11-12 14:41:01 -0800</date>
            <delta_ts>2021-11-12 15:11:50 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-232985-20211112144100.patch</filename>
            <type>text/plain</type>
            <size>15613</size>
            <attacher name="Sihui Liu">sihui_liu</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM4NmQzM2JhZTlkZjY0ZmI5
MmM0OGVlNzQwNWM0MWM4MTkxMjhkNWUuLmE3YTg5ZDA3OGE0NDdlMTMzNjE3ZTgzODIyMWIzN2Uz
YTE5NjlkN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMTIgIFNpaHVpIExp
dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgU2V0IGRlZmF1bHQgZ2VuZXJhbCBz
dG9yYWdlIGRpcmVjdG9yeSB0byB3ZWJzaXRlRGF0YURpcmVjdG9yeQorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyOTg1CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgTmV3IEFQSSB0ZXN0OiBGaWxlU3lzdGVt
QWNjZXNzLk1pZ3JhdGVUb05ld1N0b3JhZ2VEaXJlY3RvcnkKKworICAgICAgICAqIFVJUHJvY2Vz
cy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAg
KiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tOgor
ICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0R2VuZXJhbFN0b3JhZ2VE
aXJlY3RvcnkpOgorCiAyMDIxLTExLTEyICBQZXIgQXJuZSBWb2xsYW4gPHB2b2xsYW5AYXBwbGUu
Y29tPgogCiAgICAgICAgIFtpT1NdW0dQVV0gUmVtb3ZlIGFjY2VzcyB0byBJT0tpdCBjbGFzc2Vz
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0
ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D
b2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCmluZGV4IDk3ZmU1YmEyM2Fj
Y2I5NzlmODczZTRhZDZmMDQ2NmZmNmY3MzkwNmUuLjk4OGFiOWM4OTdlMzE5NTA3ZTRiMTM3ZTlh
ZTIzMjliMzk1YTVkZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D
b2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5o
CkBAIC04Miw3ICs4Miw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMyksIGlvcygx
MS4wKSkKIAogQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBOU1VSTCAqYWx0
ZXJuYXRpdmVTZXJ2aWNlc1N0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygx
MS4wKSwgaW9zKDE0LjApKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBudWxsYWJsZSwgY29weSkg
TlNVUkwgKnN0YW5kYWxvbmVBcHBsaWNhdGlvblVSTCBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEx
LjApLCBpb3MoMTQuMCkpOwotQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5KSBO
U1VSTCAqc3RvcmFnZURpcmVjdG9yeSBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp
LCBpb3MoV0tfSU9TX1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIG51bGxhYmxlLCBjb3B5
KSBOU1VSTCAqZ2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhX
S19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIAogLy8gVGVzdGluZyBvbmx5LgogQHByb3Bl
cnR5IChub25hdG9taWMpIEJPT0wgYWxsTG9hZHNCbG9ja2VkQnlEZXZpY2VNYW5hZ2VtZW50UmVz
dHJpY3Rpb25zRm9yVGVzdGluZyBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9zKDEz
LjApKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0Nv
Y29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl
YnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQppbmRleCA3MGUzYzE3ZDEz
NzFiMTkzNzg1ZmRjZWYyYjdmYTM3NjQyMWU2MDFiLi4wY2NiNjYyYmExYjM5NzNlNDNkNmY3NWMy
MTRkNWU3NWM0ZjlhZWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJz
aXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCkBA
IC0yNzgsNyArMjc4LDI4IEBAIFN0cmluZyBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0Q2FjaGVT
dG9yYWdlRGlyZWN0b3J5KCkKIAogU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRHZW5l
cmFsU3RvcmFnZURpcmVjdG9yeSgpCiB7Ci0gICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5RmlsZVN5
c3RlbVJlcHJlc2VudGF0aW9uKCJTdG9yYWdlIik7CisgICAgYXV0byBkaXJlY3RvcnkgPSB3ZWJz
aXRlRGF0YURpcmVjdG9yeUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbigiRGVmYXVsdCIpOworCisg
ICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CisgICAgZGlzcGF0Y2hfb25jZSgm
b25jZVRva2VuLCBeeworICAgICAgICAvLyBUaGlzIGlzIHRoZSBvbGQgc3RvcmFnZSBkaXJlY3Rv
cnksIGFuZCB0aGVyZSBtaWdodCBiZSBmaWxlcyBsZWZ0IGhlcmUuCisgICAgICAgIGF1dG8gb2xk
RGlyZWN0b3J5ID0gY2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oIlN0b3Jh
Z2UiLCBTaG91bGRDcmVhdGVEaXJlY3Rvcnk6Ok5vKTsKKyAgICAgICAgTlNGaWxlTWFuYWdlciAq
ZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl07CisgICAgICAgIE5T
QXJyYXkgKmZpbGVzID0gW2ZpbGVNYW5hZ2VyIGNvbnRlbnRzT2ZEaXJlY3RvcnlBdFBhdGg6b2xk
RGlyZWN0b3J5IGVycm9yOjBdOworICAgICAgICBpZiAoZmlsZXMpIHsKKyAgICAgICAgICAgIGZv
ciAoTlNTdHJpbmcgKmZpbGVOYW1lIGluIGZpbGVzKSB7CisgICAgICAgICAgICAgICAgaWYgKCFb
ZmlsZU5hbWUgbGVuZ3RoXSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAg
ICAgICAgICAgICBOU1N0cmluZyAqcGF0aCA9IFtkaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQ
YXRoQ29tcG9uZW50OmZpbGVOYW1lXTsKKyAgICAgICAgICAgICAgICBOU1N0cmluZyAqb2xkUGF0
aCA9IFtvbGREaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmZpbGVOYW1l
XTsKKyAgICAgICAgICAgICAgICBbZmlsZU1hbmFnZXIgbW92ZUl0ZW1BdFBhdGg6b2xkUGF0aCB0
b1BhdGg6cGF0aCBlcnJvcjpuaWxdOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAg
IFtmaWxlTWFuYWdlciByZW1vdmVJdGVtQXRQYXRoOm9sZERpcmVjdG9yeSBlcnJvcjpuaWxdOwor
ICAgIH0pOworCisgICAgcmV0dXJuIGRpcmVjdG9yeTsKIH0KIAogU3RyaW5nIFdlYnNpdGVEYXRh
U3RvcmU6OmRlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoKQpkaWZmIC0tZ2l0IGEvVG9vbHMv
Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDg0OGZhM2ZiMDY0NmYwZTA1ZjhhYzE5
Mjg0NTZkMDExMjUyZjRmZWQuLjIwMDdlNDFkNzcxYjkwNTUxNWFkYTAyMDc1N2E5MWU4ODY2ZTE3
NzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNCBAQAorMjAyMS0xMS0xMiAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNv
bT4KKworICAgICAgICBTZXQgZGVmYXVsdCBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0b3J5IHRvIHdl
YnNpdGVEYXRhRGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMzI5ODUKKworICAgICAgICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4K
KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVj
dC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmls
ZVN5c3RlbUFjY2Vzcy5tbToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv
Y29hL2ZpbGUtc3lzdGVtLWFjY2Vzcy5zYWx0OiBBZGRlZC4KKwogMjAyMS0xMS0xMiAgQ2hyaXMg
RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdCBpcyB1bmFibGUgdG8g
cmVjb3ZlciBpZiBhIFdlYlByb2Nlc3MgZ2V0cyB0ZXJtaW5hdGVkIHdoaWxlIGl0IGlzIGxhdW5j
aGluZwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2Rl
cHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEku
eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA4MzA4MGMzYjE1ZmIwNjdiZTQyMDE4N2Ri
NWFjMTkwYzRlODdiNTE0Li5jY2IzYTZmNzljYzI4MzlmZWQ5ODk3N2VhOGI1OGNiYjRmMjg2ZjI0
IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9q
L3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEku
eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzMyLDYgKzczMiw3IEBACiAJCTkzNTc4NkND
MjBGNkEyNzAwMDAwQ0RGQyAvKiBJbmRleGVkREIuc3FsaXRlMy13YWwgaW4gQ29weSBSZXNvdXJj
ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM0RkE1QzUyMEY2OUZFRDAw
NDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXdhbCAqLzsgfTsKIAkJOTM1Nzg2Q0QyMEY2QTI5
MTAwMDBDREZDIC8qIEluZGV4ZWREQi5zcWxpdGUzIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lz
YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEZBNUM3MjBGNjlGRUUwMDQwREMxQiAvKiBJ
bmRleGVkREIuc3FsaXRlMyAqLzsgfTsKIAkJOTM1Nzg2Q0UyMEY2QTJBMTAwMDBDREZDIC8qIElu
ZGV4ZWREQi5zcWxpdGUzLXNobSBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA5MzRGQTVDNjIwRjY5RkVEMDA0MERDMUIgLyogSW5kZXhlZERCLnNx
bGl0ZTMtc2htICovOyB9OworCQk5MzU4QzMzQzI3M0VEMDdCMDBGM0IzOEMgLyogZmlsZS1zeXN0
ZW0tYWNjZXNzLnNhbHQgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl
OyBmaWxlUmVmID0gOTM1OEMzM0IyNzNFRDA2QTAwRjNCMzhDIC8qIGZpbGUtc3lzdGVtLWFjY2Vz
cy5zYWx0ICovOyB9OwogCQk5MzYwMjcwNjI1QTNDRjc2MDAzNjc2NzAgLyogc3BlZWNocmVjb2du
aXRpb24tYmFzaWMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp
bGU7IGZpbGVSZWYgPSA5MzYwMjcwNTI1QTNCMjhFMDAzNjc2NzAgLyogc3BlZWNocmVjb2duaXRp
b24tYmFzaWMuaHRtbCAqLzsgfTsKIAkJOTM2MTAwMjkxNERDOTVBNzAwNjEzNzlEIC8qIGxvdHMt
b2YtaWZyYW1lcy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls
ZTsgZmlsZVJlZiA9IDkzNjEwMDI4MTREQzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMu
aHRtbCAqLzsgfTsKIAkJOTM2MjVEMjcxQ0Q5NzQxQzAwNkRDMUYxIC8qIGxhcmdlLXZpZGVvLXdp
dGhvdXQtYXVkaW8uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp
bGU7IGZpbGVSZWYgPSA5MzYyNUQyNjFDRDk3M0FGMDA2REMxRjEgLyogbGFyZ2UtdmlkZW8td2l0
aG91dC1hdWRpby5odG1sICovOyB9OwpAQCAtMTA3NSwxMSArMTA3Niw5IEBACiAJCUY0QzJBQjIy
MURENkQ5NUUwMEUwNkQ1QiAvKiBlbm9ybW91cy12aWRlby13aXRoLXNvdW5kLmh0bWwgaW4gQ29w
eSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDMkFCMjEx
REQ2RDk0MTAwRTA2RDVCIC8qIGVub3Jtb3VzLXZpZGVvLXdpdGgtc291bmQuaHRtbCAqLzsgfTsK
IAkJRjRDODc5N0YyMDU5RDhEMzAwOUNEMDBCIC8qIFNjcm9sbFZpZXdJbnNldFRlc3RzLm1tIGlu
IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDODc5N0UyMDU5
RDhEMzAwOUNEMDBCIC8qIFNjcm9sbFZpZXdJbnNldFRlc3RzLm1tICovOyB9OwogCQlGNENENzRD
NjIwRkRBQ0ZBMDBERTM3OTQgLyogdGV4dC13aXRoLWFzeW5jLXNjcmlwdC5odG1sIGluIENvcHkg
UmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0Q0Q3NEM1MjBG
REFDRjUwMERFMzc5NCAvKiB0ZXh0LXdpdGgtYXN5bmMtc2NyaXB0Lmh0bWwgKi87IH07Ci0JCUY0
Q0Q3NEM5MjBGREI0OTYwMERFMzc5NCAvKiBUZXN0VVJMU2NoZW1lSGFuZGxlci5tbSBpbiBTb3Vy
Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0Q0Q3NEM4MjBGREI0OTYw
MERFMzc5NCAvKiBUZXN0VVJMU2NoZW1lSGFuZGxlci5tbSAqLzsgfTsKIAkJRjRDRjMyODAyMzY2
NTUyMjAwRDNBRDA3IC8qIEVudGVyS2V5SGludFRlc3RzLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNh
ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjRDRjMyN0YyMzY2NTUyMjAwRDNBRDA3IC8qIEVu
dGVyS2V5SGludFRlc3RzLm1tICovOyB9OwogCQlGNENGQ0REQTI0OUZDOUU0MDA1Mjc0ODIgLyog
U3BhY2VPbmx5Lm90ZiBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7
IGZpbGVSZWYgPSBGNENGQ0REODI0OUZDOUQ5MDA1Mjc0ODIgLyogU3BhY2VPbmx5Lm90ZiAqLzsg
fTsKIAkJRjREMDYwMDgyNzM0QTFBQjAwOEZBNjdBIC8qIHNpbXBsZS1lZGl0b3IuaHRtbCBpbiBD
b3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQwNjAw
NzI3MzRBMDhDMDA4RkE2N0EgLyogc2ltcGxlLWVkaXRvci5odG1sICovOyB9OwotCQlGNEQyOTg2
RTIwRkVFNzM3MDA5MkQ2MzYgLyogUnVuU2NyaXB0QWZ0ZXJEb2N1bWVudExvYWQubW0gaW4gU291
cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQyOTg2RDIwRkVFNzM3
MDA5MkQ2MzYgLyogUnVuU2NyaXB0QWZ0ZXJEb2N1bWVudExvYWQubW0gKi87IH07CiAJCUY0RDRG
M0I2MUU0RTJCQ0IwMEJCMjc2NyAvKiBEcmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbSBpbiBTb3Vy
Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY0RDRGM0I0MUU0RTJCQ0Iw
MEJCMjc2NyAvKiBEcmFnQW5kRHJvcFNpbXVsYXRvcklPUy5tbSAqLzsgfTsKIAkJRjRENEYzQjkx
RTRFMzZFNDAwQkIyNzY3IC8qIERyYWdBbmREcm9wVGVzdHNJT1MubW0gaW4gU291cmNlcyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQ0RjNCNzFFNEUzNkU0MDBCQjI3Njcg
LyogRHJhZ0FuZERyb3BUZXN0c0lPUy5tbSAqLzsgfTsKIAkJRjRENUQ2OTUyNUFGOEJFNDAwMjA1
MjgwIC8qIERpc2FibGVBdXRvbWF0aWNTcGVsbGluZ0NvcnJlY3Rpb24ubW0gaW4gU291cmNlcyAq
LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNEQ1RDY5NDI1QUY4QkU0MDAyMDUy
ODAgLyogRGlzYWJsZUF1dG9tYXRpY1NwZWxsaW5nQ29ycmVjdGlvbi5tbSAqLzsgfTsKQEAgLTEz
MDgsNiArMTMwNyw3IEBACiAJCQkJQzVFMUFGRkUxNkIyMjFGMTAwNkNDMUYyIC8qIGV4ZWNDb3B5
Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJNzI4M0E5RDIyMkZCMUUwNjAwQjIxQzdE
IC8qIGV4aWYtb3JpZW50YXRpb24tOC1sbG8uanBnIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJ
CUNEQTI5QjJCMjBGRDM1ODQwMEYxNUNFRCAvKiBFeGl0RnVsbHNjcmVlbk9uRW50ZXJQaVAuaHRt
bCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQk5MzU4QzMzQzI3M0VEMDdCMDBGM0IzOEMgLyog
ZmlsZS1zeXN0ZW0tYWNjZXNzLnNhbHQgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJRjQxQUI5
QTMxRUY0Njk2QjAwODNGQTA4IC8qIGZpbGUtdXBsb2FkaW5nLmh0bWwgaW4gQ29weSBSZXNvdXJj
ZXMgKi8sCiAJCQkJQkMyRDAwNjQxMkFBMDRDRTAwRTczMkEzIC8qIGZpbGUtd2l0aC1hbmNob3Iu
aHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk0OUQyRTVDMjI3MzFFM0JDMDBCQ0NBRUQg
LyogZmlsZS13aXRoLWlmcmFtZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtMjQ0OSw2
ICsyNDQ5LDcgQEAKIAkJOTM0RkE1QzYyMEY2OUZFRDAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxp
dGUzLXNobSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9
IGZpbGU7IHBhdGggPSAiSW5kZXhlZERCLnNxbGl0ZTMtc2htIjsgc291cmNlVHJlZSA9ICI8Z3Jv
dXA+IjsgfTsKIAkJOTM0RkE1QzcyMEY2OUZFRTAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUz
ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsg
cGF0aCA9IEluZGV4ZWREQi5zcWxpdGUzOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5
MzU3NUM1NTFEMzAzNjZFMDAwRDYwNEQgLyogZm9jdXMtaW5wdXRzLmh0bWwgKi8gPSB7aXNhID0g
UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0
ZXh0Lmh0bWw7IHBhdGggPSAiZm9jdXMtaW5wdXRzLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91
cD4iOyB9OworCQk5MzU4QzMzQjI3M0VEMDZBMDBGM0IzOEMgLyogZmlsZS1zeXN0ZW0tYWNjZXNz
LnNhbHQgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBm
aWxlOyBwYXRoID0gImZpbGUtc3lzdGVtLWFjY2Vzcy5zYWx0Ijsgc291cmNlVHJlZSA9ICI8Z3Jv
dXA+IjsgfTsKIAkJOTM2MDI3MDUyNUEzQjI4RTAwMzY3NjcwIC8qIHNwZWVjaHJlY29nbml0aW9u
LWJhc2ljLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g
NDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAic3BlZWNocmVjb2duaXRp
b24tYmFzaWMuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzNjEwMDI4MTRE
Qzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxl
UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRt
bDsgcGF0aCA9ICJsb3RzLW9mLWlmcmFtZXMuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7
IH07CiAJCTkzNjI1RDI2MUNEOTczQUYwMDZEQzFGMSAvKiBsYXJnZS12aWRlby13aXRob3V0LWF1
ZGlvLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg
bGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAibGFyZ2UtdmlkZW8td2l0aG91
dC1hdWRpby5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQwMDAsNiArNDAw
MSw3IEBACiAJCQkJRjQwN0ZFMzgxRjFEMERFNjAwMTdDRjI1IC8qIGVub3Jtb3VzLnN2ZyAqLywK
IAkJCQk3MjgzQTlEMTIyRkIxRDk3MDBCMjFDN0QgLyogZXhpZi1vcmllbnRhdGlvbi04LWxsby5q
cGcgKi8sCiAJCQkJQ0RBMjlCMkEyMEZEMzQ0RTAwRjE1Q0VEIC8qIEV4aXRGdWxsc2NyZWVuT25F
bnRlclBpUC5odG1sICovLAorCQkJCTkzNThDMzNCMjczRUQwNkEwMEYzQjM4QyAvKiBmaWxlLXN5
c3RlbS1hY2Nlc3Muc2FsdCAqLywKIAkJCQlGNDFBQjk5QjFFRjQ2OTJDMDA4M0ZBMDggLyogZmls
ZS11cGxvYWRpbmcuaHRtbCAqLywKIAkJCQk0OUQyRTVDMTI3MzFFMzc0MDBCQ0NBRUQgLyogZmls
ZS13aXRoLWlmcmFtZS5odG1sICovLAogCQkJCUExN0VBQzU0MjA4MzA1NkUwMDg0QjQxQiAvKiBm
aW5kLnBkZiAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0
Q29jb2EvRmlsZVN5c3RlbUFjY2Vzcy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi
S2l0Q29jb2EvRmlsZVN5c3RlbUFjY2Vzcy5tbQppbmRleCAzNWI0YWM5MWU0MTgyNzRmNDgyYWU5
YWQwOTdhY2FkODY4ZjRiMjkyLi41MmFiOWNlMjhiNzU2MGRhOTBlYTEzZTg5Mjg4ZDE3MjlhNDEw
ZWJlIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Zp
bGVTeXN0ZW1BY2Nlc3MubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD
b2NvYS9GaWxlU3lzdGVtQWNjZXNzLm1tCkBAIC05OSw3ICs5OSw2IEBAIFRFU1QoRmlsZVN5c3Rl
bUFjY2VzcywgUHJvY2Vzc0NyYXNoRHVyaW5nV3JpdGUpCiAgICAgfV07CiAgICAgW2NvbmZpZ3Vy
YXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVSTFNjaGVt
ZTpAIndlYmtpdCJdOwogCi0gICAgLy8gbG9hZCBmaXJzdCB3ZWIgdmlldyAmIHN0YXJ0IHRlc3QK
ICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy
YW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlv
bi5nZXQoKV0pOwogICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOm1haW5GcmFtZVN0cmluZyBi
YXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAid2Via2l0Oi8vd2Via2l0Lm9yZyJdXTsKICAg
ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CkBAIC0x
MzEsNCArMTMwLDcwIEBAIFRFU1QoRmlsZVN5c3RlbUFjY2VzcywgUHJvY2Vzc0NyYXNoRHVyaW5n
V3JpdGUpCiAgICAgRVhQRUNUX1dLX1NUUkVRKEAic3VjY2Vzczogd3JpdGUgMTAgYnl0ZXMiLCBb
bGFzdFNjcmlwdE1lc3NhZ2UgYm9keV0pOwogfQogCitzdGF0aWMgTlNTdHJpbmcgKmJhc2ljU3Ry
aW5nID0gQCI8c2NyaXB0PiBcCisgICAgYXN5bmMgZnVuY3Rpb24gb3BlbigpIFwKKyAgICB7IFwK
KyAgICAgICAgdHJ5IHsgXAorICAgICAgICAgICAgdmFyIHJvb3RIYW5kbGUgPSBhd2FpdCBuYXZp
Z2F0b3Iuc3RvcmFnZS5nZXREaXJlY3RvcnkoKTsgXAorICAgICAgICAgICAgdmFyIGZpbGVIYW5k
bGUgPSBhd2FpdCByb290SGFuZGxlLmdldEZpbGVIYW5kbGUoJ2ZpbGUtc3lzdGVtLWFjY2Vzcy50
eHQnLCB7ICdjcmVhdGUnIDogZmFsc2UgfSk7IFwKKyAgICAgICAgICAgIHdpbmRvdy53ZWJraXQu
bWVzc2FnZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKCdmaWxlIGlzIG9wZW5lZCcp
OyBcCisgICAgICAgIH0gY2F0Y2ggKGVycikgeyBcCisgICAgICAgICAgICB3aW5kb3cud2Via2l0
Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgnZXJyb3I6ICcgKyBlcnIu
bmFtZSArICcgLSAnICsgZXJyLm1lc3NhZ2UpOyBcCisgICAgICAgIH0gXAorICAgIH0gXAorICAg
IG9wZW4oKTsgXAorICAgIDwvc2NyaXB0PiI7CisKK1RFU1QoRmlsZVN5c3RlbUFjY2VzcywgTWln
cmF0ZVRvTmV3U3RvcmFnZURpcmVjdG9yeSkKK3sKKyAgICBOU1N0cmluZyAqaGFzaGVkT3JpZ2lu
ID0gQCJScHZhX2xWR0hqb2pSbXhJN2VoOTJVcGRaVnZkSDBPQ2lzMk1OQ00tbkRvIjsKKyAgICBO
U1N0cmluZyAqc3RvcmFnZVR5cGUgPSBAIkZpbGVTeXN0ZW0iOworICAgIE5TU3RyaW5nICpmaWxl
TmFtZSA9IEAiZmlsZS1zeXN0ZW0tYWNjZXNzLnR4dCI7CisgICAgCisgICAgTlNGaWxlTWFuYWdl
ciAqZmlsZU1hbmFnZXIgPSBbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl07CisKKyAgICAv
LyBUaGlzIGlzIG9sZCB2YWx1ZSByZXR1cm5lZCBieSBXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0
R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkoKS4KKyAgICBOU1N0cmluZyAqb2xkU3RvcmFnZURpcmVj
dG9yeSA9IFtOU0hvbWVEaXJlY3RvcnkoKSBzdHJpbmdCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6
QCJMaWJyYXJ5L0NhY2hlcy9jb20uYXBwbGUuV2ViS2l0LlRlc3RXZWJLaXRBUEkvV2ViS2l0L1N0
b3JhZ2UvIl07CisgICAgW2ZpbGVNYW5hZ2VyIHJlbW92ZUl0ZW1BdFBhdGg6b2xkU3RvcmFnZURp
cmVjdG9yeSBlcnJvcjpuaWxdOworICAgIEVYUEVDVF9GQUxTRShbW05TRmlsZU1hbmFnZXIgZGVm
YXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6b2xkU3RvcmFnZURpcmVjdG9yeV0pOworICAg
IAorICAgIC8vIENvcHkgYmFrZWQgZmlsZXMgdG8gb2xkIGRpcmVjdG9yeS4KKyAgICBOU1N0cmlu
ZyAqb2xkRmlsZVN5c3RlbURpcmVjdG9yeSA9IFtOU1N0cmluZyBwYXRoV2l0aENvbXBvbmVudHM6
QFtvbGRTdG9yYWdlRGlyZWN0b3J5LCBoYXNoZWRPcmlnaW4sIGhhc2hlZE9yaWdpbiwgc3RvcmFn
ZVR5cGVdXTsKKyAgICBbZmlsZU1hbmFnZXIgY3JlYXRlRGlyZWN0b3J5QXRVUkw6W05TVVJMIGZp
bGVVUkxXaXRoUGF0aDpvbGRGaWxlU3lzdGVtRGlyZWN0b3J5XSB3aXRoSW50ZXJtZWRpYXRlRGly
ZWN0b3JpZXM6WUVTIGF0dHJpYnV0ZXM6bmlsIGVycm9yOm5pbF07CisgICAgTlNTdHJpbmcgKm9s
ZEZpbGVQYXRoID0gW29sZEZpbGVTeXN0ZW1EaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQYXRo
Q29tcG9uZW50OmZpbGVOYW1lXTsKKyAgICBbZmlsZU1hbmFnZXIgY3JlYXRlRmlsZUF0UGF0aDpv
bGRGaWxlUGF0aCBjb250ZW50czpuaWwgYXR0cmlidXRlczpuaWxdOworICAgIEVYUEVDVF9UUlVF
KFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOm9sZEZpbGVQYXRoXSk7CisKKyAgICBOU1N0
cmluZyAqcmVzb3VyY2VTYWx0UGF0aCA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVz
b3VyY2U6QCJmaWxlLXN5c3RlbS1hY2Nlc3MiIHdpdGhFeHRlbnNpb246QCJzYWx0IiBzdWJkaXJl
Y3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdLnBhdGg7CisgICAgTlNTdHJpbmcgKm9s
ZFNhbHRQYXRoID0gW29sZFN0b3JhZ2VEaXJlY3Rvcnkgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29t
cG9uZW50OkAic2FsdCJdOworICAgIFtmaWxlTWFuYWdlciBjb3B5SXRlbUF0UGF0aDpyZXNvdXJj
ZVNhbHRQYXRoIHRvUGF0aDpvbGRTYWx0UGF0aCBlcnJvcjpuaWxdOworICAgIEVYUEVDVF9UUlVF
KFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpvbGRTYWx0
UGF0aF0pOworCisgICAgLy8gVGhpcyBpcyBjdXJyZW50IHZhbHVlIHJldHVybmVkIGJ5IFdlYnNp
dGVEYXRhU3RvcmU6OmRlZmF1bHRHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSgpLgorICAgIE5TU3Ry
aW5nICpuZXdTdG9yYWdlRGlyZWN0b3J5ID0gW05TSG9tZURpcmVjdG9yeSgpIHN0cmluZ0J5QXBw
ZW5kaW5nUGF0aENvbXBvbmVudDpAIkxpYnJhcnkvV2ViS2l0L2NvbS5hcHBsZS5XZWJLaXQuVGVz
dFdlYktpdEFQSS9XZWJzaXRlRGF0YS9EZWZhdWx0LyJdOworICAgIFtmaWxlTWFuYWdlciByZW1v
dmVJdGVtQXRQYXRoOm5ld1N0b3JhZ2VEaXJlY3RvcnkgZXJyb3I6bmlsXTsKKyAgICBOU1N0cmlu
ZyAqbmV3RmlsZVBhdGggPSBbTlNTdHJpbmcgcGF0aFdpdGhDb21wb25lbnRzOkBbbmV3U3RvcmFn
ZURpcmVjdG9yeSwgaGFzaGVkT3JpZ2luLCBoYXNoZWRPcmlnaW4sIHN0b3JhZ2VUeXBlLCBmaWxl
TmFtZV1dOworICAgIEVYUEVDVF9GQUxTRShbZmlsZU1hbmFnZXIgZmlsZUV4aXN0c0F0UGF0aDpu
ZXdGaWxlUGF0aF0pOworCisgICAgLy8gSW52b2tlIFdlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRH
ZW5lcmFsU3RvcmFnZURpcmVjdG9yeSgpIHRvIHRyaWdnZXIgbWlncmF0aW9uLgorICAgIE5TU3Ry
aW5nICpjdXJyZW50U3RvcmFnZURpcmVjdG9yeSA9IFtbW1dLV2Vic2l0ZURhdGFTdG9yZSBkZWZh
dWx0RGF0YVN0b3JlXSBfY29uZmlndXJhdGlvbl0gZ2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnldLnBh
dGg7CisgICAgRVhQRUNUX1dLX1NUUkVRKG5ld1N0b3JhZ2VEaXJlY3RvcnksIGN1cnJlbnRTdG9y
YWdlRGlyZWN0b3J5KTsKKyAgICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRN
YW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm9sZEZpbGVQYXRoXSk7CisgICAgRVhQRUNUX1RSVUUo
W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOm5ld0ZpbGVQ
YXRoXSk7CisKKyAgICAvLyBFbnN1cmUgZmlsZSBjYW4gYmUgb3BlbmVkIGFmdGVyIG1pZ3JhdGlv
bjogdGVzdCBwYWdlIG9ubHkgb3BlbnMgdGhlIGZpbGUgaWYgaXQgZXhpc3RzLgorICAgIGF1dG8g
aGFuZGxlciA9IGFkb3B0TlMoW1tGaWxlU3lzdGVtQWNjZXNzTWVzc2FnZUhhbmRsZXIgYWxsb2Nd
IGluaXRdKTsKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29u
ZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVu
dENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgbmFtZTpA
InRlc3RIYW5kbGVyIl07CisgICAgYXV0byBwcmVmZXJlbmNlcyA9IFtjb25maWd1cmF0aW9uIHBy
ZWZlcmVuY2VzXTsKKyAgICBwcmVmZXJlbmNlcy5fZmlsZVN5c3RlbUFjY2Vzc0VuYWJsZWQgPSBZ
RVM7CisgICAgcHJlZmVyZW5jZXMuX3N0b3JhZ2VBUElFbmFibGVkID0gWUVTOworCisgICAgYXV0
byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1Jl
Y3RNYWtlKDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCld
KTsKKyAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpiYXNpY1N0cmluZyBiYXNlVVJMOltOU1VS
TCBVUkxXaXRoU3RyaW5nOkAiaHR0cHM6Ly93ZWJraXQub3JnIl1dOworICAgIFRlc3RXZWJLaXRB
UEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKKyAgICByZWNlaXZlZFNjcmlw
dE1lc3NhZ2UgPSBmYWxzZTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJmaWxlIGlzIG9wZW5lZCIs
IFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7Cit9CisKICNlbmRpZiAvLyBVU0UoQVBQTEVfSU5U
RVJOQUxfU0RLKQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD
b2NvYS9maWxlLXN5c3RlbS1hY2Nlc3Muc2FsdCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv
V2ViS2l0Q29jb2EvZmlsZS1zeXN0ZW0tYWNjZXNzLnNhbHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK
aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWRmMzU3MTdj
MWM0OGY3Yjg1MDk1MWJmYTkzYjliYjg4NThmMTNkNgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvZmlsZS1zeXN0ZW0tYWNjZXNzLnNhbHQK
QEAgLTAsMCArMSBAQAorWZL5dRQJMyQKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>