<?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>226860</bug_id>
          
          <creation_ts>2021-06-09 17:52:08 -0700</creation_ts>
          <short_desc>Do some hardening in XPCServiceEventHandler()</short_desc>
          <delta_ts>2022-08-15 14:49:28 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>243955</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>benjamin</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>darin</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>ggaren</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1768412</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-09 17:52:08 -0700</bug_when>
    <thetext>Do some hardening in XPCServiceEventHandler() to deal with unexpected values and add some more logging as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768413</commentid>
    <comment_count>1</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-09 17:52:22 -0700</bug_when>
    <thetext>&lt;rdar://66837596&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768414</commentid>
    <comment_count>2</comment_count>
      <attachid>431035</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-09 17:55:53 -0700</bug_when>
    <thetext>Created attachment 431035
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768419</commentid>
    <comment_count>3</comment_count>
      <attachid>431037</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-09 18:17:35 -0700</bug_when>
    <thetext>Created attachment 431037
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768625</commentid>
    <comment_count>4</comment_count>
      <attachid>431037</attachid>
    <who name="Geoffrey Garen">ggaren</who>
    <bug_when>2021-06-10 11:27:20 -0700</bug_when>
    <thetext>Comment on attachment 431037
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1768649</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-10 11:54:38 -0700</bug_when>
    <thetext>Committed r278716 (238684@main): &lt;https://commits.webkit.org/238684@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431037.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431035</attachid>
            <date>2021-06-09 17:55:53 -0700</date>
            <delta_ts>2021-06-09 18:21:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226860-20210609175553.patch</filename>
            <type>text/plain</type>
            <size>11930</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiYjliZTlhNDU2MDI4M2Uw
OWM4OGE1NjY5YThjNTcwODBlNDI1ODEuLmUzMGU0N2NiMjM3ZWUwNzY0NDJhMmQ4MzAyOTUxNjhk
YjE4NDIwMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDYtMDkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEbyBzb21lIGhhcmRlbmluZyBpbiBY
UENTZXJ2aWNlRXZlbnRIYW5kbGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyNjg2MAorICAgICAgICA8cmRhcjovLzY2ODM3NTk2PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIHNvbWUgaGFyZGVu
aW5nIGluIFhQQ1NlcnZpY2VFdmVudEhhbmRsZXIoKSB0byBkZWFsIHdpdGggdW5leHBlY3RlZCB2
YWx1ZXMgYW5kIGFkZAorICAgICAgICBzb21lIG1vcmUgbG9nZ2luZyBhcyB3ZWxsLgorCisgICAg
ICAgICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2
aWNlTWFpbi5tbToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZUV2ZW50SGFuZGxlcik6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLmg6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLm1tOgor
ICAgICAgICAoV2ViS2l0OjpoYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzKToKKwogMjAyMS0wNi0w
OSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24o
cjI3NjY1MykgV2UncmUgZ29pbmcgdG8gZGlzayBtb3JlIG9mdGVuIGZvciBsb2NhbCBzdG9yYWdl
IG9wZXJhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRV
dGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlTWFpbi5tbSBiL1NvdXJjZS9XZWJL
aXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNl
TWFpbi5tbQppbmRleCA0MmYwZDI1N2E2Y2M3MzIzYjVkZmEzNzEwYWZmNmY1OTVkYzMxMWQ2Li44
ZDRiMDg2NWI5NWY3ZWNkMjk5OGQ4MWE0YWM0NmJmNmY5YjQyNDViIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBD
U2VydmljZU1haW4ubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxp
dGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCkBAIC02OSw3MyArNjksODgg
QEAgc3RhdGljIHZvaWQgWFBDU2VydmljZUV2ZW50SGFuZGxlcih4cGNfY29ubmVjdGlvbl90IHBl
ZXIpCiAgICAgeHBjX2Nvbm5lY3Rpb25fc2V0X3RhcmdldF9xdWV1ZShwZWVyLCBkaXNwYXRjaF9n
ZXRfZ2xvYmFsX3F1ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RFRkFVTFQsIDApKTsKICAg
ICB4cGNfY29ubmVjdGlvbl9zZXRfZXZlbnRfaGFuZGxlcihwZWVyLCBeKHhwY19vYmplY3RfdCBl
dmVudCkgewogICAgICAgICB4cGNfdHlwZV90IHR5cGUgPSB4cGNfZ2V0X3R5cGUoZXZlbnQpOwot
ICAgICAgICBpZiAodHlwZSA9PSBYUENfVFlQRV9FUlJPUikgewotICAgICAgICAgICAgaWYgKGV2
ZW50ID09IFhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVkFMSUQgfHwgZXZlbnQgPT0gWFBDX0VSUk9S
X1RFUk1JTkFUSU9OX0lNTUlORU5UKSB7Ci0gICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRkFV
TFQoSVBDLCAiRXhpdGluZzogUmVjZWl2ZWQgWFBDIGV2ZW50IHR5cGU6ICVzIiwgZXZlbnQgPT0g
WFBDX0VSUk9SX0NPTk5FQ1RJT05fSU5WQUxJRCA/ICJYUENfRVJST1JfQ09OTkVDVElPTl9JTlZB
TElEIiA6ICJYUENfRVJST1JfVEVSTUlOQVRJT05fSU1NSU5FTlQiKTsKLSAgICAgICAgICAgICAg
ICAvLyBGSVhNRTogSGFuZGxlIHRoaXMgY2FzZSBtb3JlIGdyYWNlZnVsbHkuCi0gICAgICAgICAg
ICAgICAgW1tOU1J1bkxvb3AgbWFpblJ1bkxvb3BdIHBlcmZvcm1CbG9jazpeewotICAgICAgICAg
ICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7Ci0gICAgICAgICAgICAgICAgfV07Ci0gICAg
ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBhc3NlcnQodHlwZSA9PSBY
UENfVFlQRV9ESUNUSU9OQVJZKTsKLQotICAgICAgICAgICAgaWYgKCFzdHJjbXAoeHBjX2RpY3Rp
b25hcnlfZ2V0X3N0cmluZyhldmVudCwgIm1lc3NhZ2UtbmFtZSIpLCAiYm9vdHN0cmFwIikpIHsK
LSAgICAgICAgICAgICAgICBDRkJ1bmRsZVJlZiB3ZWJLaXRCdW5kbGUgPSBDRkJ1bmRsZUdldEJ1
bmRsZVdpdGhJZGVudGlmaWVyKENGU1RSKCJjb20uYXBwbGUuV2ViS2l0IikpOwotCi0gICAgICAg
ICAgICAgICAgY29uc3QgY2hhciogc2VydmljZU5hbWUgPSB4cGNfZGljdGlvbmFyeV9nZXRfc3Ry
aW5nKGV2ZW50LCAic2VydmljZS1uYW1lIik7Ci0gICAgICAgICAgICAgICAgQ0ZTdHJpbmdSZWYg
ZW50cnlQb2ludEZ1bmN0aW9uTmFtZSA9IG51bGxwdHI7Ci0gICAgICAgICAgICAgICAgaWYgKHN0
cnN0cihzZXJ2aWNlTmFtZSwgImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIpID09IHNlcnZp
Y2VOYW1lKQotICAgICAgICAgICAgICAgICAgICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZT
VFIoU1RSSU5HSVpFX1ZBTFVFX09GKFdFQkNPTlRFTlRfU0VSVklDRV9JTklUSUFMSVpFUikpOwot
ICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoc2VydmljZU5hbWUsICJjb20uYXBwbGUu
V2ViS2l0Lk5ldHdvcmtpbmciKSkKLSAgICAgICAgICAgICAgICAgICAgZW50cnlQb2ludEZ1bmN0
aW9uTmFtZSA9IENGU1RSKFNUUklOR0laRV9WQUxVRV9PRihORVRXT1JLX1NFUlZJQ0VfSU5JVElB
TElaRVIpKTsKLSAgICAgICAgICAgICAgICBlbHNlIGlmICghc3RyY21wKHNlcnZpY2VOYW1lLCAi
Y29tLmFwcGxlLldlYktpdC5QbHVnaW4uNjQiKSkKLSAgICAgICAgICAgICAgICAgICAgZW50cnlQ
b2ludEZ1bmN0aW9uTmFtZSA9IENGU1RSKFNUUklOR0laRV9WQUxVRV9PRihQTFVHSU5fU0VSVklD
RV9JTklUSUFMSVpFUikpOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoc2Vydmlj
ZU5hbWUsICJjb20uYXBwbGUuV2ViS2l0LkdQVSIpKQotICAgICAgICAgICAgICAgICAgICBlbnRy
eVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09GKEdQVV9TRVJWSUNF
X0lOSVRJQUxJWkVSKSk7Ci0gICAgICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChzZXJ2aWNl
TmFtZSwgImNvbS5hcHBsZS5XZWJLaXQuV2ViQXV0aG4iKSkKLSAgICAgICAgICAgICAgICAgICAg
ZW50cnlQb2ludEZ1bmN0aW9uTmFtZSA9IENGU1RSKFNUUklOR0laRV9WQUxVRV9PRihXRUJBVVRI
Tl9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAg
ICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwotCi0gICAgICAgICAgICAg
ICAgdHlwZWRlZiB2b2lkICgqSW5pdGlhbGl6ZXJGdW5jdGlvbikoeHBjX2Nvbm5lY3Rpb25fdCwg
eHBjX29iamVjdF90LCB4cGNfb2JqZWN0X3QpOwotICAgICAgICAgICAgICAgIEluaXRpYWxpemVy
RnVuY3Rpb24gaW5pdGlhbGl6ZXJGdW5jdGlvblB0ciA9IHJlaW50ZXJwcmV0X2Nhc3Q8SW5pdGlh
bGl6ZXJGdW5jdGlvbj4oQ0ZCdW5kbGVHZXRGdW5jdGlvblBvaW50ZXJGb3JOYW1lKHdlYktpdEJ1
bmRsZSwgZW50cnlQb2ludEZ1bmN0aW9uTmFtZSkpOwotICAgICAgICAgICAgICAgIGlmICghaW5p
dGlhbGl6ZXJGdW5jdGlvblB0cikgewotICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19G
QVVMVChJUEMsICJFeGl0aW5nOiBVbmFibGUgdG8gZmluZCBlbnRyeSBwb2ludCBpbiBXZWJLaXQu
ZnJhbWV3b3JrIHdpdGggbmFtZTogJXMiLCBbKF9fYnJpZGdlIE5TU3RyaW5nICopZW50cnlQb2lu
dEZ1bmN0aW9uTmFtZSBVVEY4U3RyaW5nXSk7CisgICAgICAgIGlmICh0eXBlICE9IFhQQ19UWVBF
X0RJQ1RJT05BUlkpIHsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKElQQywgIlhQQ1Nl
cnZpY2VFdmVudEhhbmRsZXI6IFJlY2VpdmVkIHVuZXhwZWN0ZWQgWFBDIGV2ZW50IHR5cGU6ICV7
cHVibGljfXMiLCB4cGNfdHlwZV9nZXRfbmFtZSh0eXBlKSk7CisgICAgICAgICAgICBpZiAodHlw
ZSA9PSBYUENfVFlQRV9FUlJPUikgeworICAgICAgICAgICAgICAgIGlmIChldmVudCA9PSBYUENf
RVJST1JfQ09OTkVDVElPTl9JTlZBTElEIHx8IGV2ZW50ID09IFhQQ19FUlJPUl9URVJNSU5BVElP
Tl9JTU1JTkVOVCkgeworICAgICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihJUEMs
ICJFeGl0aW5nOiBSZWNlaXZlZCBYUEMgZXZlbnQgdHlwZTogJXtwdWJsaWN9cyIsIGV2ZW50ID09
IFhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVkFMSUQgPyAiWFBDX0VSUk9SX0NPTk5FQ1RJT05fSU5W
QUxJRCIgOiAiWFBDX0VSUk9SX1RFUk1JTkFUSU9OX0lNTUlORU5UIik7CisgICAgICAgICAgICAg
ICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhpcyBjYXNlIG1vcmUgZ3JhY2VmdWxseS4KICAgICAg
ICAgICAgICAgICAgICAgW1tOU1J1bkxvb3AgbWFpblJ1bkxvb3BdIHBlcmZvcm1CbG9jazpeewog
ICAgICAgICAgICAgICAgICAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUpOwogICAgICAgICAgICAg
ICAgICAgICB9XTsKICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAg
ICByZXR1cm47CisgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIGF1dG8gcmVwbHkgPSBhZG9w
dE9TT2JqZWN0KHhwY19kaWN0aW9uYXJ5X2NyZWF0ZV9yZXBseShldmVudCkpOwotICAgICAgICAg
ICAgICAgIHhwY19kaWN0aW9uYXJ5X3NldF9zdHJpbmcocmVwbHkuZ2V0KCksICJtZXNzYWdlLW5h
bWUiLCAicHJvY2Vzcy1maW5pc2hlZC1sYXVuY2hpbmciKTsKLSAgICAgICAgICAgICAgICB4cGNf
Y29ubmVjdGlvbl9zZW5kX21lc3NhZ2UoeHBjX2RpY3Rpb25hcnlfZ2V0X3JlbW90ZV9jb25uZWN0
aW9uKGV2ZW50KSwgcmVwbHkuZ2V0KCkpOworICAgICAgICBhdXRvKiBtZXNzYWdlTmFtZSA9IHhw
Y19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsICJtZXNzYWdlLW5hbWUiKTsKKyAgICAgICAg
aWYgKCFtZXNzYWdlTmFtZSkgeworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoSVBDLCAi
WFBDU2VydmljZUV2ZW50SGFuZGxlcjogJ21lc3NhZ2UtbmFtZScgaXMgbm90IHByZXNlbnQgaW4g
dGhlIFhQQyBkaWN0aW9uYXJ5Iik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg
ICAgICAgaWYgKCFzdHJjbXAobWVzc2FnZU5hbWUsICJib290c3RyYXAiKSkgeworICAgICAgICAg
ICAgY29uc3QgY2hhciogc2VydmljZU5hbWUgPSB4cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKGV2
ZW50LCAic2VydmljZS1uYW1lIik7CisgICAgICAgICAgICBpZiAoIXNlcnZpY2VOYW1lKSB7Cisg
ICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoSVBDLCAiWFBDU2VydmljZUV2ZW50SGFu
ZGxlcjogJ3NlcnZpY2UtbmFtZScgaXMgbm90IHByZXNlbnQgaW4gdGhlIFhQQyBkaWN0aW9uYXJ5
Iik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAg
Q0ZTdHJpbmdSZWYgZW50cnlQb2ludEZ1bmN0aW9uTmFtZSA9IG51bGxwdHI7CisgICAgICAgICAg
ICBpZiAoIXN0cm5jbXAoc2VydmljZU5hbWUsICJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQi
LCBzdHJsZW4oImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIpKSkKKyAgICAgICAgICAgICAg
ICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09GKFdFQkNP
TlRFTlRfU0VSVklDRV9JTklUSUFMSVpFUikpOworICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNt
cChzZXJ2aWNlTmFtZSwgImNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyIpKQorICAgICAgICAg
ICAgICAgIGVudHJ5UG9pbnRGdW5jdGlvbk5hbWUgPSBDRlNUUihTVFJJTkdJWkVfVkFMVUVfT0Yo
TkVUV09SS19TRVJWSUNFX0lOSVRJQUxJWkVSKSk7CisgICAgICAgICAgICBlbHNlIGlmICghc3Ry
Y21wKHNlcnZpY2VOYW1lLCAiY29tLmFwcGxlLldlYktpdC5QbHVnaW4uNjQiKSkKKyAgICAgICAg
ICAgICAgICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09G
KFBMVUdJTl9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7CisgICAgICAgICAgICBlbHNlIGlmICghc3Ry
Y21wKHNlcnZpY2VOYW1lLCAiY29tLmFwcGxlLldlYktpdC5HUFUiKSkKKyAgICAgICAgICAgICAg
ICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09GKEdQVV9T
RVJWSUNFX0lOSVRJQUxJWkVSKSk7CisgICAgICAgICAgICBlbHNlIGlmICghc3RyY21wKHNlcnZp
Y2VOYW1lLCAiY29tLmFwcGxlLldlYktpdC5XZWJBdXRobiIpKQorICAgICAgICAgICAgICAgIGVu
dHJ5UG9pbnRGdW5jdGlvbk5hbWUgPSBDRlNUUihTVFJJTkdJWkVfVkFMVUVfT0YoV0VCQVVUSE5f
U0VSVklDRV9JTklUSUFMSVpFUikpOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAg
ICAgUkVMRUFTRV9MT0dfRVJST1IoSVBDLCAiWFBDU2VydmljZUV2ZW50SGFuZGxlcjogVW5leHBl
Y3RlZCAnc2VydmljZS1uYW1lJzogJXtwdWJsaWN9cyIsIHNlcnZpY2VOYW1lKTsKKyAgICAgICAg
ICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBpbnQgZmQg
PSB4cGNfZGljdGlvbmFyeV9kdXBfZmQoZXZlbnQsICJzdGRvdXQiKTsKLSAgICAgICAgICAgICAg
ICBpZiAoZmQgIT0gLTEpCi0gICAgICAgICAgICAgICAgICAgIGR1cDIoZmQsIFNURE9VVF9GSUxF
Tk8pOworICAgICAgICAgICAgQ0ZCdW5kbGVSZWYgd2ViS2l0QnVuZGxlID0gQ0ZCdW5kbGVHZXRC
dW5kbGVXaXRoSWRlbnRpZmllcihDRlNUUigiY29tLmFwcGxlLldlYktpdCIpKTsKKyAgICAgICAg
ICAgIHR5cGVkZWYgdm9pZCAoKkluaXRpYWxpemVyRnVuY3Rpb24pKHhwY19jb25uZWN0aW9uX3Qs
IHhwY19vYmplY3RfdCwgeHBjX29iamVjdF90KTsKKyAgICAgICAgICAgIEluaXRpYWxpemVyRnVu
Y3Rpb24gaW5pdGlhbGl6ZXJGdW5jdGlvblB0ciA9IHJlaW50ZXJwcmV0X2Nhc3Q8SW5pdGlhbGl6
ZXJGdW5jdGlvbj4oQ0ZCdW5kbGVHZXRGdW5jdGlvblBvaW50ZXJGb3JOYW1lKHdlYktpdEJ1bmRs
ZSwgZW50cnlQb2ludEZ1bmN0aW9uTmFtZSkpOworICAgICAgICAgICAgaWYgKCFpbml0aWFsaXpl
ckZ1bmN0aW9uUHRyKSB7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQoSVBDLCAi
RXhpdGluZzogVW5hYmxlIHRvIGZpbmQgZW50cnkgcG9pbnQgaW4gV2ViS2l0LmZyYW1ld29yayB3
aXRoIG5hbWU6ICVzIiwgWyhfX2JyaWRnZSBOU1N0cmluZyAqKWVudHJ5UG9pbnRGdW5jdGlvbk5h
bWUgVVRGOFN0cmluZ10pOworICAgICAgICAgICAgICAgIFtbTlNSdW5Mb29wIG1haW5SdW5Mb29w
XSBwZXJmb3JtQmxvY2s6XnsKKyAgICAgICAgICAgICAgICAgICAgZXhpdChFWElUX0ZBSUxVUkUp
OworICAgICAgICAgICAgICAgIH1dOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg
ICAgIH0KIAotICAgICAgICAgICAgICAgIGZkID0geHBjX2RpY3Rpb25hcnlfZHVwX2ZkKGV2ZW50
LCAic3RkZXJyIik7Ci0gICAgICAgICAgICAgICAgaWYgKGZkICE9IC0xKQotICAgICAgICAgICAg
ICAgICAgICBkdXAyKGZkLCBTVERFUlJfRklMRU5PKTsKKyAgICAgICAgICAgIGF1dG8gcmVwbHkg
PSBhZG9wdE9TT2JqZWN0KHhwY19kaWN0aW9uYXJ5X2NyZWF0ZV9yZXBseShldmVudCkpOworICAg
ICAgICAgICAgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyhyZXBseS5nZXQoKSwgIm1lc3NhZ2Ut
bmFtZSIsICJwcm9jZXNzLWZpbmlzaGVkLWxhdW5jaGluZyIpOworICAgICAgICAgICAgeHBjX2Nv
bm5lY3Rpb25fc2VuZF9tZXNzYWdlKHhwY19kaWN0aW9uYXJ5X2dldF9yZW1vdGVfY29ubmVjdGlv
bihldmVudCksIHJlcGx5LmdldCgpKTsKIAotICAgICAgICAgICAgICAgIFdvcmtRdWV1ZTo6bWFp
bigpLmRpc3BhdGNoU3luYyhbaW5pdGlhbGl6ZXJGdW5jdGlvblB0ciwgZXZlbnQgPSBPU09iamVj
dFB0cjx4cGNfb2JqZWN0X3Q+KGV2ZW50KSwgcmV0YWluZWRQZWVyQ29ubmVjdGlvbl0gewotICAg
ICAgICAgICAgICAgICAgICBpbml0aWFsaXplckZ1bmN0aW9uUHRyKHJldGFpbmVkUGVlckNvbm5l
Y3Rpb24uZ2V0KCksIGV2ZW50LmdldCgpLCBwcmlvcml0eUJvb3N0TWVzc2FnZS5nZXQoKS5nZXQo
KSk7CisgICAgICAgICAgICBpbnQgZmQgPSB4cGNfZGljdGlvbmFyeV9kdXBfZmQoZXZlbnQsICJz
dGRvdXQiKTsKKyAgICAgICAgICAgIGlmIChmZCAhPSAtMSkKKyAgICAgICAgICAgICAgICBkdXAy
KGZkLCBTVERPVVRfRklMRU5PKTsKIAotICAgICAgICAgICAgICAgICAgICBzZXRBcHBsZUxhbmd1
YWdlc1ByZWZlcmVuY2UoKTsKLSAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIGZkID0g
eHBjX2RpY3Rpb25hcnlfZHVwX2ZkKGV2ZW50LCAic3RkZXJyIik7CisgICAgICAgICAgICBpZiAo
ZmQgIT0gLTEpCisgICAgICAgICAgICAgICAgZHVwMihmZCwgU1RERVJSX0ZJTEVOTyk7CiAKLSAg
ICAgICAgICAgICAgICBwcmlvcml0eUJvb3N0TWVzc2FnZS5nZXQoKSA9IG51bGxwdHI7Ci0gICAg
ICAgICAgICB9CisgICAgICAgICAgICBXb3JrUXVldWU6Om1haW4oKS5kaXNwYXRjaFN5bmMoW2lu
aXRpYWxpemVyRnVuY3Rpb25QdHIsIGV2ZW50ID0gT1NPYmplY3RQdHI8eHBjX29iamVjdF90Pihl
dmVudCksIHJldGFpbmVkUGVlckNvbm5lY3Rpb25dIHsKKyAgICAgICAgICAgICAgICBpbml0aWFs
aXplckZ1bmN0aW9uUHRyKHJldGFpbmVkUGVlckNvbm5lY3Rpb24uZ2V0KCksIGV2ZW50LmdldCgp
LCBwcmlvcml0eUJvb3N0TWVzc2FnZS5nZXQoKS5nZXQoKSk7CiAKLSAgICAgICAgICAgIC8vIExl
YWsgYSBib29zdCBvbnRvIHRoZSBOZXR3b3JrUHJvY2Vzcy4KLSAgICAgICAgICAgIGlmICghc3Ry
Y21wKHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsICJtZXNzYWdlLW5hbWUiKSwgInBy
ZS1ib290c3RyYXAiKSkgewotICAgICAgICAgICAgICAgIGFzc2VydCghcHJpb3JpdHlCb29zdE1l
c3NhZ2UuZ2V0KCkpOwotICAgICAgICAgICAgICAgIHByaW9yaXR5Qm9vc3RNZXNzYWdlLmdldCgp
ID0gZXZlbnQ7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgc2V0QXBwbGVMYW5ndWFn
ZXNQcmVmZXJlbmNlKCk7CisgICAgICAgICAgICB9KTsKIAotICAgICAgICAgICAgaGFuZGxlWFBD
RW5kcG9pbnRNZXNzYWdlcyhldmVudCk7CisgICAgICAgICAgICBwcmlvcml0eUJvb3N0TWVzc2Fn
ZS5nZXQoKSA9IG51bGxwdHI7CisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKworICAg
ICAgICAvLyBMZWFrIGEgYm9vc3Qgb250byB0aGUgTmV0d29ya1Byb2Nlc3MuCisgICAgICAgIGlm
ICghc3RyY21wKG1lc3NhZ2VOYW1lLCAicHJlLWJvb3RzdHJhcCIpKSB7CisgICAgICAgICAgICBh
c3NlcnQoIXByaW9yaXR5Qm9vc3RNZXNzYWdlLmdldCgpKTsKKyAgICAgICAgICAgIHByaW9yaXR5
Qm9vc3RNZXNzYWdlLmdldCgpID0gZXZlbnQ7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg
IH0KKworICAgICAgICBoYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzKGV2ZW50LCBtZXNzYWdlTmFt
ZSk7CiAgICAgfSk7CiAKICAgICB4cGNfY29ubmVjdGlvbl9yZXN1bWUocGVlcik7CmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvSGFuZGxlWFBDRW5kcG9pbnRNZXNz
YWdlcy5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0hhbmRsZVhQQ0VuZHBvaW50
TWVzc2FnZXMuaAppbmRleCA2YjEzZmMzY2NlYjQwZDEwNWRlZGQ4YmJhZDBjOWFmZWFkODk1ZDM3
Li44MTE4MTVkM2U5YTZmNTk4NjhhNzlhOGQ3ZDVkZTE5YmJkMzVjYTc4IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvSGFuZGxlWFBDRW5kcG9pbnRNZXNzYWdlcy5o
CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1l
c3NhZ2VzLmgKQEAgLTI5LDYgKzI5LDYgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZvaWQg
aGFuZGxlWFBDRW5kcG9pbnRNZXNzYWdlcyh4cGNfb2JqZWN0X3QgZXZlbnQpOwordm9pZCBoYW5k
bGVYUENFbmRwb2ludE1lc3NhZ2VzKHhwY19vYmplY3RfdCBldmVudCwgY29uc3QgY2hhciogbWVz
c2FnZU5hbWUpOwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j
b2EvSGFuZGxlWFBDRW5kcG9pbnRNZXNzYWdlcy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLm1tCmluZGV4IDU3MjBmZDUwNjYwYWFl
ZmUxYzEzNzc2YzdjMzM4ZTEwZGUyYjVlYTYuLjgxNzg3MWNmZWFhOTExZjQ2N2JhM2Q0MjI3NWM2
OWNlMzI3OGNiMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9I
YW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLm1tCkBAIC0zNCwxNyArMzQsMTMgQEAK
IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZvaWQgaGFuZGxlWFBDRW5kcG9pbnRNZXNzYWdlcyh4
cGNfb2JqZWN0X3QgZXZlbnQpCit2b2lkIGhhbmRsZVhQQ0VuZHBvaW50TWVzc2FnZXMoeHBjX29i
amVjdF90IGV2ZW50LCBjb25zdCBjaGFyKiBtZXNzYWdlTmFtZSkKIHsKLSAgICBpZiAoeHBjX2dl
dF90eXBlKGV2ZW50KSAhPSBYUENfVFlQRV9ESUNUSU9OQVJZKQotICAgICAgICByZXR1cm47Cisg
ICAgQVNTRVJUX1VOVVNFRChldmVudCwgeHBjX2dldF90eXBlKGV2ZW50KSA9PSBYUENfVFlQRV9E
SUNUSU9OQVJZKTsKKyAgICBBU1NFUlRfVU5VU0VEKG1lc3NhZ2VOYW1lLCBtZXNzYWdlTmFtZSk7
CiAKICNpZiBIQVZFKExTREFUQUJBU0VDT05URVhUKQotICAgIFN0cmluZyBtZXNzYWdlTmFtZSA9
IHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsIFhQQ0VuZHBvaW50Ojp4cGNNZXNzYWdl
TmFtZUtleSk7Ci0gICAgaWYgKG1lc3NhZ2VOYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu
OwotCi0gICAgaWYgKG1lc3NhZ2VOYW1lID09IExhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUENDb25z
dGFudHM6OnhwY0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUENFbmRwb2ludE1lc3NhZ2VOYW1lKSB7
CisgICAgaWYgKCFzdHJjbXAobWVzc2FnZU5hbWUsIExhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUEND
b25zdGFudHM6OnhwY0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUENFbmRwb2ludE1lc3NhZ2VOYW1l
KSkgewogICAgICAgICBhdXRvIHhwY0VuZFBvaW50ID0geHBjX2RpY3Rpb25hcnlfZ2V0X3ZhbHVl
KGV2ZW50LCBMYXVuY2hTZXJ2aWNlc0RhdGFiYXNlWFBDQ29uc3RhbnRzOjp4cGNMYXVuY2hTZXJ2
aWNlc0RhdGFiYXNlWFBDRW5kcG9pbnROYW1lS2V5KTsKICAgICAgICAgaWYgKCF4cGNFbmRQb2lu
dCB8fCB4cGNfZ2V0X3R5cGUoeHBjRW5kUG9pbnQpICE9IFhQQ19UWVBFX0VORFBPSU5UKQogICAg
ICAgICAgICAgcmV0dXJuOwo=
</data>
<flag name="commit-queue"
          id="452674"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431037</attachid>
            <date>2021-06-09 18:17:35 -0700</date>
            <delta_ts>2021-06-10 11:54:40 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-226860-20210609181734.patch</filename>
            <type>text/plain</type>
            <size>12703</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiYjliZTlhNDU2MDI4M2Uw
OWM4OGE1NjY5YThjNTcwODBlNDI1ODEuLmUzMGU0N2NiMjM3ZWUwNzY0NDJhMmQ4MzAyOTUxNjhk
YjE4NDIwMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDYtMDkgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEbyBzb21lIGhhcmRlbmluZyBpbiBY
UENTZXJ2aWNlRXZlbnRIYW5kbGVyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv
c2hvd19idWcuY2dpP2lkPTIyNjg2MAorICAgICAgICA8cmRhcjovLzY2ODM3NTk2PgorCisgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIHNvbWUgaGFyZGVu
aW5nIGluIFhQQ1NlcnZpY2VFdmVudEhhbmRsZXIoKSB0byBkZWFsIHdpdGggdW5leHBlY3RlZCB2
YWx1ZXMgYW5kIGFkZAorICAgICAgICBzb21lIG1vcmUgbG9nZ2luZyBhcyB3ZWxsLgorCisgICAg
ICAgICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2
aWNlTWFpbi5tbToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZUV2ZW50SGFuZGxlcik6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLmg6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLm1tOgor
ICAgICAgICAoV2ViS2l0OjpoYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzKToKKwogMjAyMS0wNi0w
OSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24o
cjI3NjY1MykgV2UncmUgZ29pbmcgdG8gZGlzayBtb3JlIG9mdGVuIGZvciBsb2NhbCBzdG9yYWdl
IG9wZXJhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3NwaS9kYXJ3aW4vWFBDU1BJ
LmggYi9Tb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1hQQ1NQSS5oCmluZGV4IDVhMTM1YzZhZGVh
NDI1NWYwZDkwOTVkNDJlMWI3MmNjZDgyODgwOTAuLjJmOTY1YmE3ZmQxMDljY2I4ZmU0YTdlZDg0
NGRiMjJkZTg3OTE4ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3NwaS9kYXJ3aW4vWFBD
U1BJLmgKKysrIGIvU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9YUENTUEkuaApAQCAtMTU0LDYg
KzE1NCw3IEBAIHZvaWQgeHBjX2RpY3Rpb25hcnlfc2V0X3N0cmluZyh4cGNfb2JqZWN0X3QsIGNv
bnN0IGNoYXIqIGtleSwgY29uc3QgY2hhciogc3RyaW5nCiB2b2lkIHhwY19kaWN0aW9uYXJ5X3Nl
dF91aW50NjQoeHBjX29iamVjdF90LCBjb25zdCBjaGFyKiBrZXksIHVpbnQ2NF90IHZhbHVlKTsK
IHZvaWQgeHBjX2RpY3Rpb25hcnlfc2V0X3ZhbHVlKHhwY19vYmplY3RfdCwgY29uc3QgY2hhciog
a2V5LCB4cGNfb2JqZWN0X3QgdmFsdWUpOwogeHBjX3R5cGVfdCB4cGNfZ2V0X3R5cGUoeHBjX29i
amVjdF90KTsKK2NvbnN0IGNoYXIqIHhwY190eXBlX2dldF9uYW1lKHhwY190eXBlX3QpOwogdm9p
ZCB4cGNfbWFpbih4cGNfY29ubmVjdGlvbl9oYW5kbGVyX3QpOwogY29uc3QgY2hhciogeHBjX3N0
cmluZ19nZXRfc3RyaW5nX3B0cih4cGNfb2JqZWN0X3QpOwogb3NfdHJhbnNhY3Rpb25fdCBvc190
cmFuc2FjdGlvbl9jcmVhdGUoY29uc3QgY2hhciAqZGVzY3JpcHRpb24pOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNl
L1hQQ1NlcnZpY2VNYWluLm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxp
dGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCmluZGV4IDQyZjBkMjU3YTZj
YzczMjNiNWRmYTM3MTBhZmY2ZjU5NWRjMzExZDYuLjhkNGIwODY1Yjk1ZjdlY2QyOTk4ZDgxYTRh
YzQ2YmY2ZjliNDI0NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9p
bnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlTWFpbi5tbQorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBD
U2VydmljZU1haW4ubW0KQEAgLTY5LDczICs2OSw4OCBAQCBzdGF0aWMgdm9pZCBYUENTZXJ2aWNl
RXZlbnRIYW5kbGVyKHhwY19jb25uZWN0aW9uX3QgcGVlcikKICAgICB4cGNfY29ubmVjdGlvbl9z
ZXRfdGFyZ2V0X3F1ZXVlKHBlZXIsIGRpc3BhdGNoX2dldF9nbG9iYWxfcXVldWUoRElTUEFUQ0hf
UVVFVUVfUFJJT1JJVFlfREVGQVVMVCwgMCkpOwogICAgIHhwY19jb25uZWN0aW9uX3NldF9ldmVu
dF9oYW5kbGVyKHBlZXIsIF4oeHBjX29iamVjdF90IGV2ZW50KSB7CiAgICAgICAgIHhwY190eXBl
X3QgdHlwZSA9IHhwY19nZXRfdHlwZShldmVudCk7Ci0gICAgICAgIGlmICh0eXBlID09IFhQQ19U
WVBFX0VSUk9SKSB7Ci0gICAgICAgICAgICBpZiAoZXZlbnQgPT0gWFBDX0VSUk9SX0NPTk5FQ1RJ
T05fSU5WQUxJRCB8fCBldmVudCA9PSBYUENfRVJST1JfVEVSTUlOQVRJT05fSU1NSU5FTlQpIHsK
LSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChJUEMsICJFeGl0aW5nOiBSZWNlaXZl
ZCBYUEMgZXZlbnQgdHlwZTogJXMiLCBldmVudCA9PSBYUENfRVJST1JfQ09OTkVDVElPTl9JTlZB
TElEID8gIlhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVkFMSUQiIDogIlhQQ19FUlJPUl9URVJNSU5B
VElPTl9JTU1JTkVOVCIpOwotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgdGhpcyBj
YXNlIG1vcmUgZ3JhY2VmdWxseS4KLSAgICAgICAgICAgICAgICBbW05TUnVuTG9vcCBtYWluUnVu
TG9vcF0gcGVyZm9ybUJsb2NrOl57Ci0gICAgICAgICAgICAgICAgICAgIGV4aXQoRVhJVF9GQUlM
VVJFKTsKLSAgICAgICAgICAgICAgICB9XTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNl
IHsKLSAgICAgICAgICAgIGFzc2VydCh0eXBlID09IFhQQ19UWVBFX0RJQ1RJT05BUlkpOwotCi0g
ICAgICAgICAgICBpZiAoIXN0cmNtcCh4cGNfZGljdGlvbmFyeV9nZXRfc3RyaW5nKGV2ZW50LCAi
bWVzc2FnZS1uYW1lIiksICJib290c3RyYXAiKSkgewotICAgICAgICAgICAgICAgIENGQnVuZGxl
UmVmIHdlYktpdEJ1bmRsZSA9IENGQnVuZGxlR2V0QnVuZGxlV2l0aElkZW50aWZpZXIoQ0ZTVFIo
ImNvbS5hcHBsZS5XZWJLaXQiKSk7Ci0KLSAgICAgICAgICAgICAgICBjb25zdCBjaGFyKiBzZXJ2
aWNlTmFtZSA9IHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsICJzZXJ2aWNlLW5hbWUi
KTsKLSAgICAgICAgICAgICAgICBDRlN0cmluZ1JlZiBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0g
bnVsbHB0cjsKLSAgICAgICAgICAgICAgICBpZiAoc3Ryc3RyKHNlcnZpY2VOYW1lLCAiY29tLmFw
cGxlLldlYktpdC5XZWJDb250ZW50IikgPT0gc2VydmljZU5hbWUpCi0gICAgICAgICAgICAgICAg
ICAgIGVudHJ5UG9pbnRGdW5jdGlvbk5hbWUgPSBDRlNUUihTVFJJTkdJWkVfVkFMVUVfT0YoV0VC
Q09OVEVOVF9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7Ci0gICAgICAgICAgICAgICAgZWxzZSBpZiAo
IXN0cmNtcChzZXJ2aWNlTmFtZSwgImNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyIpKQotICAg
ICAgICAgICAgICAgICAgICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpF
X1ZBTFVFX09GKE5FVFdPUktfU0VSVklDRV9JTklUSUFMSVpFUikpOwotICAgICAgICAgICAgICAg
IGVsc2UgaWYgKCFzdHJjbXAoc2VydmljZU5hbWUsICJjb20uYXBwbGUuV2ViS2l0LlBsdWdpbi42
NCIpKQotICAgICAgICAgICAgICAgICAgICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIo
U1RSSU5HSVpFX1ZBTFVFX09GKFBMVUdJTl9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7Ci0gICAgICAg
ICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChzZXJ2aWNlTmFtZSwgImNvbS5hcHBsZS5XZWJLaXQu
R1BVIikpCi0gICAgICAgICAgICAgICAgICAgIGVudHJ5UG9pbnRGdW5jdGlvbk5hbWUgPSBDRlNU
UihTVFJJTkdJWkVfVkFMVUVfT0YoR1BVX1NFUlZJQ0VfSU5JVElBTElaRVIpKTsKLSAgICAgICAg
ICAgICAgICBlbHNlIGlmICghc3RyY21wKHNlcnZpY2VOYW1lLCAiY29tLmFwcGxlLldlYktpdC5X
ZWJBdXRobiIpKQotICAgICAgICAgICAgICAgICAgICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0g
Q0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09GKFdFQkFVVEhOX1NFUlZJQ0VfSU5JVElBTElaRVIpKTsK
LSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJU
X05PVF9SRUFDSEVEKCk7Ci0KLSAgICAgICAgICAgICAgICB0eXBlZGVmIHZvaWQgKCpJbml0aWFs
aXplckZ1bmN0aW9uKSh4cGNfY29ubmVjdGlvbl90LCB4cGNfb2JqZWN0X3QsIHhwY19vYmplY3Rf
dCk7Ci0gICAgICAgICAgICAgICAgSW5pdGlhbGl6ZXJGdW5jdGlvbiBpbml0aWFsaXplckZ1bmN0
aW9uUHRyID0gcmVpbnRlcnByZXRfY2FzdDxJbml0aWFsaXplckZ1bmN0aW9uPihDRkJ1bmRsZUdl
dEZ1bmN0aW9uUG9pbnRlckZvck5hbWUod2ViS2l0QnVuZGxlLCBlbnRyeVBvaW50RnVuY3Rpb25O
YW1lKSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFpbml0aWFsaXplckZ1bmN0aW9uUHRyKSB7Ci0g
ICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKElQQywgIkV4aXRpbmc6IFVuYWJs
ZSB0byBmaW5kIGVudHJ5IHBvaW50IGluIFdlYktpdC5mcmFtZXdvcmsgd2l0aCBuYW1lOiAlcyIs
IFsoX19icmlkZ2UgTlNTdHJpbmcgKillbnRyeVBvaW50RnVuY3Rpb25OYW1lIFVURjhTdHJpbmdd
KTsKKyAgICAgICAgaWYgKHR5cGUgIT0gWFBDX1RZUEVfRElDVElPTkFSWSkgeworICAgICAgICAg
ICAgUkVMRUFTRV9MT0dfRVJST1IoSVBDLCAiWFBDU2VydmljZUV2ZW50SGFuZGxlcjogUmVjZWl2
ZWQgdW5leHBlY3RlZCBYUEMgZXZlbnQgdHlwZTogJXtwdWJsaWN9cyIsIHhwY190eXBlX2dldF9u
YW1lKHR5cGUpKTsKKyAgICAgICAgICAgIGlmICh0eXBlID09IFhQQ19UWVBFX0VSUk9SKSB7Cisg
ICAgICAgICAgICAgICAgaWYgKGV2ZW50ID09IFhQQ19FUlJPUl9DT05ORUNUSU9OX0lOVkFMSUQg
fHwgZXZlbnQgPT0gWFBDX0VSUk9SX1RFUk1JTkFUSU9OX0lNTUlORU5UKSB7CisgICAgICAgICAg
ICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKElQQywgIkV4aXRpbmc6IFJlY2VpdmVkIFhQQyBl
dmVudCB0eXBlOiAle3B1YmxpY31zIiwgZXZlbnQgPT0gWFBDX0VSUk9SX0NPTk5FQ1RJT05fSU5W
QUxJRCA/ICJYUENfRVJST1JfQ09OTkVDVElPTl9JTlZBTElEIiA6ICJYUENfRVJST1JfVEVSTUlO
QVRJT05fSU1NSU5FTlQiKTsKKyAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSB0
aGlzIGNhc2UgbW9yZSBncmFjZWZ1bGx5LgogICAgICAgICAgICAgICAgICAgICBbW05TUnVuTG9v
cCBtYWluUnVuTG9vcF0gcGVyZm9ybUJsb2NrOl57CiAgICAgICAgICAgICAgICAgICAgICAgICBl
eGl0KEVYSVRfRkFJTFVSRSk7CiAgICAgICAgICAgICAgICAgICAgIH1dOwogICAgICAgICAgICAg
ICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCi0g
ICAgICAgICAgICAgICAgYXV0byByZXBseSA9IGFkb3B0T1NPYmplY3QoeHBjX2RpY3Rpb25hcnlf
Y3JlYXRlX3JlcGx5KGV2ZW50KSk7Ci0gICAgICAgICAgICAgICAgeHBjX2RpY3Rpb25hcnlfc2V0
X3N0cmluZyhyZXBseS5nZXQoKSwgIm1lc3NhZ2UtbmFtZSIsICJwcm9jZXNzLWZpbmlzaGVkLWxh
dW5jaGluZyIpOwotICAgICAgICAgICAgICAgIHhwY19jb25uZWN0aW9uX3NlbmRfbWVzc2FnZSh4
cGNfZGljdGlvbmFyeV9nZXRfcmVtb3RlX2Nvbm5lY3Rpb24oZXZlbnQpLCByZXBseS5nZXQoKSk7
CisgICAgICAgIGF1dG8qIG1lc3NhZ2VOYW1lID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhl
dmVudCwgIm1lc3NhZ2UtbmFtZSIpOworICAgICAgICBpZiAoIW1lc3NhZ2VOYW1lKSB7CisgICAg
ICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihJUEMsICJYUENTZXJ2aWNlRXZlbnRIYW5kbGVyOiAn
bWVzc2FnZS1uYW1lJyBpcyBub3QgcHJlc2VudCBpbiB0aGUgWFBDIGRpY3Rpb25hcnkiKTsKKyAg
ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAoIXN0cmNtcChtZXNzYWdl
TmFtZSwgImJvb3RzdHJhcCIpKSB7CisgICAgICAgICAgICBjb25zdCBjaGFyKiBzZXJ2aWNlTmFt
ZSA9IHhwY19kaWN0aW9uYXJ5X2dldF9zdHJpbmcoZXZlbnQsICJzZXJ2aWNlLW5hbWUiKTsKKyAg
ICAgICAgICAgIGlmICghc2VydmljZU5hbWUpIHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xP
R19FUlJPUihJUEMsICJYUENTZXJ2aWNlRXZlbnRIYW5kbGVyOiAnc2VydmljZS1uYW1lJyBpcyBu
b3QgcHJlc2VudCBpbiB0aGUgWFBDIGRpY3Rpb25hcnkiKTsKKyAgICAgICAgICAgICAgICByZXR1
cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBDRlN0cmluZ1JlZiBlbnRyeVBvaW50RnVu
Y3Rpb25OYW1lID0gbnVsbHB0cjsKKyAgICAgICAgICAgIGlmICghc3RybmNtcChzZXJ2aWNlTmFt
ZSwgImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIsIHN0cmxlbigiY29tLmFwcGxlLldlYktp
dC5XZWJDb250ZW50IikpKQorICAgICAgICAgICAgICAgIGVudHJ5UG9pbnRGdW5jdGlvbk5hbWUg
PSBDRlNUUihTVFJJTkdJWkVfVkFMVUVfT0YoV0VCQ09OVEVOVF9TRVJWSUNFX0lOSVRJQUxJWkVS
KSk7CisgICAgICAgICAgICBlbHNlIGlmICghc3RyY21wKHNlcnZpY2VOYW1lLCAiY29tLmFwcGxl
LldlYktpdC5OZXR3b3JraW5nIikpCisgICAgICAgICAgICAgICAgZW50cnlQb2ludEZ1bmN0aW9u
TmFtZSA9IENGU1RSKFNUUklOR0laRV9WQUxVRV9PRihORVRXT1JLX1NFUlZJQ0VfSU5JVElBTEla
RVIpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoc2VydmljZU5hbWUsICJjb20uYXBw
bGUuV2ViS2l0LlBsdWdpbi42NCIpKQorICAgICAgICAgICAgICAgIGVudHJ5UG9pbnRGdW5jdGlv
bk5hbWUgPSBDRlNUUihTVFJJTkdJWkVfVkFMVUVfT0YoUExVR0lOX1NFUlZJQ0VfSU5JVElBTEla
RVIpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoc2VydmljZU5hbWUsICJjb20uYXBw
bGUuV2ViS2l0LkdQVSIpKQorICAgICAgICAgICAgICAgIGVudHJ5UG9pbnRGdW5jdGlvbk5hbWUg
PSBDRlNUUihTVFJJTkdJWkVfVkFMVUVfT0YoR1BVX1NFUlZJQ0VfSU5JVElBTElaRVIpKTsKKyAg
ICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoc2VydmljZU5hbWUsICJjb20uYXBwbGUuV2ViS2l0
LldlYkF1dGhuIikpCisgICAgICAgICAgICAgICAgZW50cnlQb2ludEZ1bmN0aW9uTmFtZSA9IENG
U1RSKFNUUklOR0laRV9WQUxVRV9PRihXRUJBVVRITl9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7Cisg
ICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihJUEMs
ICJYUENTZXJ2aWNlRXZlbnRIYW5kbGVyOiBVbmV4cGVjdGVkICdzZXJ2aWNlLW5hbWUnOiAle3B1
YmxpY31zIiwgc2VydmljZU5hbWUpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg
ICAgIH0KIAotICAgICAgICAgICAgICAgIGludCBmZCA9IHhwY19kaWN0aW9uYXJ5X2R1cF9mZChl
dmVudCwgInN0ZG91dCIpOwotICAgICAgICAgICAgICAgIGlmIChmZCAhPSAtMSkKLSAgICAgICAg
ICAgICAgICAgICAgZHVwMihmZCwgU1RET1VUX0ZJTEVOTyk7CisgICAgICAgICAgICBDRkJ1bmRs
ZVJlZiB3ZWJLaXRCdW5kbGUgPSBDRkJ1bmRsZUdldEJ1bmRsZVdpdGhJZGVudGlmaWVyKENGU1RS
KCJjb20uYXBwbGUuV2ViS2l0IikpOworICAgICAgICAgICAgdHlwZWRlZiB2b2lkICgqSW5pdGlh
bGl6ZXJGdW5jdGlvbikoeHBjX2Nvbm5lY3Rpb25fdCwgeHBjX29iamVjdF90LCB4cGNfb2JqZWN0
X3QpOworICAgICAgICAgICAgSW5pdGlhbGl6ZXJGdW5jdGlvbiBpbml0aWFsaXplckZ1bmN0aW9u
UHRyID0gcmVpbnRlcnByZXRfY2FzdDxJbml0aWFsaXplckZ1bmN0aW9uPihDRkJ1bmRsZUdldEZ1
bmN0aW9uUG9pbnRlckZvck5hbWUod2ViS2l0QnVuZGxlLCBlbnRyeVBvaW50RnVuY3Rpb25OYW1l
KSk7CisgICAgICAgICAgICBpZiAoIWluaXRpYWxpemVyRnVuY3Rpb25QdHIpIHsKKyAgICAgICAg
ICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChJUEMsICJFeGl0aW5nOiBVbmFibGUgdG8gZmluZCBl
bnRyeSBwb2ludCBpbiBXZWJLaXQuZnJhbWV3b3JrIHdpdGggbmFtZTogJXMiLCBbKF9fYnJpZGdl
IE5TU3RyaW5nICopZW50cnlQb2ludEZ1bmN0aW9uTmFtZSBVVEY4U3RyaW5nXSk7CisgICAgICAg
ICAgICAgICAgW1tOU1J1bkxvb3AgbWFpblJ1bkxvb3BdIHBlcmZvcm1CbG9jazpeeworICAgICAg
ICAgICAgICAgICAgICBleGl0KEVYSVRfRkFJTFVSRSk7CisgICAgICAgICAgICAgICAgfV07Cisg
ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAg
ZmQgPSB4cGNfZGljdGlvbmFyeV9kdXBfZmQoZXZlbnQsICJzdGRlcnIiKTsKLSAgICAgICAgICAg
ICAgICBpZiAoZmQgIT0gLTEpCi0gICAgICAgICAgICAgICAgICAgIGR1cDIoZmQsIFNUREVSUl9G
SUxFTk8pOworICAgICAgICAgICAgYXV0byByZXBseSA9IGFkb3B0T1NPYmplY3QoeHBjX2RpY3Rp
b25hcnlfY3JlYXRlX3JlcGx5KGV2ZW50KSk7CisgICAgICAgICAgICB4cGNfZGljdGlvbmFyeV9z
ZXRfc3RyaW5nKHJlcGx5LmdldCgpLCAibWVzc2FnZS1uYW1lIiwgInByb2Nlc3MtZmluaXNoZWQt
bGF1bmNoaW5nIik7CisgICAgICAgICAgICB4cGNfY29ubmVjdGlvbl9zZW5kX21lc3NhZ2UoeHBj
X2RpY3Rpb25hcnlfZ2V0X3JlbW90ZV9jb25uZWN0aW9uKGV2ZW50KSwgcmVwbHkuZ2V0KCkpOwog
Ci0gICAgICAgICAgICAgICAgV29ya1F1ZXVlOjptYWluKCkuZGlzcGF0Y2hTeW5jKFtpbml0aWFs
aXplckZ1bmN0aW9uUHRyLCBldmVudCA9IE9TT2JqZWN0UHRyPHhwY19vYmplY3RfdD4oZXZlbnQp
LCByZXRhaW5lZFBlZXJDb25uZWN0aW9uXSB7Ci0gICAgICAgICAgICAgICAgICAgIGluaXRpYWxp
emVyRnVuY3Rpb25QdHIocmV0YWluZWRQZWVyQ29ubmVjdGlvbi5nZXQoKSwgZXZlbnQuZ2V0KCks
IHByaW9yaXR5Qm9vc3RNZXNzYWdlLmdldCgpLmdldCgpKTsKKyAgICAgICAgICAgIGludCBmZCA9
IHhwY19kaWN0aW9uYXJ5X2R1cF9mZChldmVudCwgInN0ZG91dCIpOworICAgICAgICAgICAgaWYg
KGZkICE9IC0xKQorICAgICAgICAgICAgICAgIGR1cDIoZmQsIFNURE9VVF9GSUxFTk8pOwogCi0g
ICAgICAgICAgICAgICAgICAgIHNldEFwcGxlTGFuZ3VhZ2VzUHJlZmVyZW5jZSgpOwotICAgICAg
ICAgICAgICAgIH0pOworICAgICAgICAgICAgZmQgPSB4cGNfZGljdGlvbmFyeV9kdXBfZmQoZXZl
bnQsICJzdGRlcnIiKTsKKyAgICAgICAgICAgIGlmIChmZCAhPSAtMSkKKyAgICAgICAgICAgICAg
ICBkdXAyKGZkLCBTVERFUlJfRklMRU5PKTsKIAotICAgICAgICAgICAgICAgIHByaW9yaXR5Qm9v
c3RNZXNzYWdlLmdldCgpID0gbnVsbHB0cjsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFdv
cmtRdWV1ZTo6bWFpbigpLmRpc3BhdGNoU3luYyhbaW5pdGlhbGl6ZXJGdW5jdGlvblB0ciwgZXZl
bnQgPSBPU09iamVjdFB0cjx4cGNfb2JqZWN0X3Q+KGV2ZW50KSwgcmV0YWluZWRQZWVyQ29ubmVj
dGlvbl0geworICAgICAgICAgICAgICAgIGluaXRpYWxpemVyRnVuY3Rpb25QdHIocmV0YWluZWRQ
ZWVyQ29ubmVjdGlvbi5nZXQoKSwgZXZlbnQuZ2V0KCksIHByaW9yaXR5Qm9vc3RNZXNzYWdlLmdl
dCgpLmdldCgpKTsKIAotICAgICAgICAgICAgLy8gTGVhayBhIGJvb3N0IG9udG8gdGhlIE5ldHdv
cmtQcm9jZXNzLgotICAgICAgICAgICAgaWYgKCFzdHJjbXAoeHBjX2RpY3Rpb25hcnlfZ2V0X3N0
cmluZyhldmVudCwgIm1lc3NhZ2UtbmFtZSIpLCAicHJlLWJvb3RzdHJhcCIpKSB7Ci0gICAgICAg
ICAgICAgICAgYXNzZXJ0KCFwcmlvcml0eUJvb3N0TWVzc2FnZS5nZXQoKSk7Ci0gICAgICAgICAg
ICAgICAgcHJpb3JpdHlCb29zdE1lc3NhZ2UuZ2V0KCkgPSBldmVudDsKLSAgICAgICAgICAgIH0K
KyAgICAgICAgICAgICAgICBzZXRBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UoKTsKKyAgICAgICAg
ICAgIH0pOwogCi0gICAgICAgICAgICBoYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzKGV2ZW50KTsK
KyAgICAgICAgICAgIHByaW9yaXR5Qm9vc3RNZXNzYWdlLmdldCgpID0gbnVsbHB0cjsKKyAgICAg
ICAgICAgIHJldHVybjsKICAgICAgICAgfQorCisgICAgICAgIC8vIExlYWsgYSBib29zdCBvbnRv
IHRoZSBOZXR3b3JrUHJvY2Vzcy4KKyAgICAgICAgaWYgKCFzdHJjbXAobWVzc2FnZU5hbWUsICJw
cmUtYm9vdHN0cmFwIikpIHsKKyAgICAgICAgICAgIGFzc2VydCghcHJpb3JpdHlCb29zdE1lc3Nh
Z2UuZ2V0KCkpOworICAgICAgICAgICAgcHJpb3JpdHlCb29zdE1lc3NhZ2UuZ2V0KCkgPSBldmVu
dDsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGhhbmRsZVhQQ0Vu
ZHBvaW50TWVzc2FnZXMoZXZlbnQsIG1lc3NhZ2VOYW1lKTsKICAgICB9KTsKIAogICAgIHhwY19j
b25uZWN0aW9uX3Jlc3VtZShwZWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLmggYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvY29jb2EvSGFuZGxlWFBDRW5kcG9pbnRNZXNzYWdlcy5oCmluZGV4IDZiMTNmYzNj
Y2ViNDBkMTA1ZGVkZDhiYmFkMGM5YWZlYWQ4OTVkMzcuLjgxMTgxNWQzZTlhNmY1OTg2OGE3OWE4
ZDdkNWRlMTliYmQzNWNhNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j
b2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL2NvY29hL0hhbmRsZVhQQ0VuZHBvaW50TWVzc2FnZXMuaApAQCAtMjksNiArMjksNiBA
QAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBoYW5kbGVYUENFbmRwb2ludE1lc3NhZ2Vz
KHhwY19vYmplY3RfdCBldmVudCk7Cit2b2lkIGhhbmRsZVhQQ0VuZHBvaW50TWVzc2FnZXMoeHBj
X29iamVjdF90IGV2ZW50LCBjb25zdCBjaGFyKiBtZXNzYWdlTmFtZSk7CiAKIH0KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9IYW5kbGVYUENFbmRwb2ludE1lc3Nh
Z2VzLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0hhbmRsZVhQQ0VuZHBvaW50
TWVzc2FnZXMubW0KaW5kZXggNTcyMGZkNTA2NjBhYWVmZTFjMTM3NzZjN2MzMzhlMTBkZTJiNWVh
Ni4uODE3ODcxY2ZlYWE5MTFmNDY3YmEzZDQyMjc1YzY5Y2UzMjc4Y2IyMCAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0hhbmRsZVhQQ0VuZHBvaW50TWVzc2FnZXMu
bW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL0hhbmRsZVhQQ0VuZHBvaW50
TWVzc2FnZXMubW0KQEAgLTM0LDE3ICszNCwxMyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot
dm9pZCBoYW5kbGVYUENFbmRwb2ludE1lc3NhZ2VzKHhwY19vYmplY3RfdCBldmVudCkKK3ZvaWQg
aGFuZGxlWFBDRW5kcG9pbnRNZXNzYWdlcyh4cGNfb2JqZWN0X3QgZXZlbnQsIGNvbnN0IGNoYXIq
IG1lc3NhZ2VOYW1lKQogewotICAgIGlmICh4cGNfZ2V0X3R5cGUoZXZlbnQpICE9IFhQQ19UWVBF
X0RJQ1RJT05BUlkpCi0gICAgICAgIHJldHVybjsKKyAgICBBU1NFUlRfVU5VU0VEKGV2ZW50LCB4
cGNfZ2V0X3R5cGUoZXZlbnQpID09IFhQQ19UWVBFX0RJQ1RJT05BUlkpOworICAgIEFTU0VSVF9V
TlVTRUQobWVzc2FnZU5hbWUsIG1lc3NhZ2VOYW1lKTsKIAogI2lmIEhBVkUoTFNEQVRBQkFTRUNP
TlRFWFQpCi0gICAgU3RyaW5nIG1lc3NhZ2VOYW1lID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmlu
ZyhldmVudCwgWFBDRW5kcG9pbnQ6OnhwY01lc3NhZ2VOYW1lS2V5KTsKLSAgICBpZiAobWVzc2Fn
ZU5hbWUuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobWVzc2FnZU5hbWUg
PT0gTGF1bmNoU2VydmljZXNEYXRhYmFzZVhQQ0NvbnN0YW50czo6eHBjTGF1bmNoU2VydmljZXNE
YXRhYmFzZVhQQ0VuZHBvaW50TWVzc2FnZU5hbWUpIHsKKyAgICBpZiAoIXN0cmNtcChtZXNzYWdl
TmFtZSwgTGF1bmNoU2VydmljZXNEYXRhYmFzZVhQQ0NvbnN0YW50czo6eHBjTGF1bmNoU2Vydmlj
ZXNEYXRhYmFzZVhQQ0VuZHBvaW50TWVzc2FnZU5hbWUpKSB7CiAgICAgICAgIGF1dG8geHBjRW5k
UG9pbnQgPSB4cGNfZGljdGlvbmFyeV9nZXRfdmFsdWUoZXZlbnQsIExhdW5jaFNlcnZpY2VzRGF0
YWJhc2VYUENDb25zdGFudHM6OnhwY0xhdW5jaFNlcnZpY2VzRGF0YWJhc2VYUENFbmRwb2ludE5h
bWVLZXkpOwogICAgICAgICBpZiAoIXhwY0VuZFBvaW50IHx8IHhwY19nZXRfdHlwZSh4cGNFbmRQ
b2ludCkgIT0gWFBDX1RZUEVfRU5EUE9JTlQpCiAgICAgICAgICAgICByZXR1cm47Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>