226927 2021-06-11 09:50:48 -0700 Enable WebProcess' release logging in ephemeral sessions 2021-06-11 11:42:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen eric.carlson ggaren kkinnunen webkit-bug-importer youennf oldest_to_newest 1768967 0 cdumez 2021-06-11 09:50:48 -0700 Enable WebProcess' release logging in ephemeral sessions, to facilitate debugging. 1768968 1 431206 cdumez 2021-06-11 09:52:02 -0700 Created attachment 431206 Patch 1769004 2 431206 ggaren 2021-06-11 11:33:38 -0700 Comment on attachment 431206 Patch r=me 1769010 3 ews-feeder 2021-06-11 11:41:11 -0700 Committed r278772 (238731@main): <https://commits.webkit.org/238731@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 431206. 1769011 4 webkit-bug-importer 2021-06-11 11:42:20 -0700 <rdar://problem/79208748> 431206 2021-06-11 09:52:02 -0700 2021-06-11 11:41:12 -0700 Patch bug-226927-20210611095201.patch text/plain 18905 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUyYzhiOTU0MjYzZmI3MWJl NzFlODg4YjUwZGQ4MzA4MDk0ZDZhM2IuLjhiMWM5MDhmMzE4OWU0NDg5ODAyMjlmZDVhYzQ4NTQw MDhlZmZkNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDYtMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBFbmFibGUgV2ViUHJvY2VzcycgcmVs ZWFzZSBsb2dnaW5nIGluIGVwaGVtZXJhbCBzZXNzaW9ucworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2OTI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIFdlYlByb2Nlc3MnIHJlbGVhc2UgbG9n Z2luZyBpbiBlcGhlbWVyYWwgc2Vzc2lvbnMsIHRvIGZhY2lsaWF0ZSBkZWJ1Z2dpbmcuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ cm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3M6Om5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbkNsb3NlZCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3M6OnByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz OjptYXJrQWxsTGF5ZXJzVm9sYXRpbGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpj YW5jZWxNYXJrQWxsTGF5ZXJzVm9sYXRpbGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz OjpmcmVlemVBbGxMYXllclRyZWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6dW5m cmVlemVBbGxMYXllclRyZWVzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cHJvY2Vz c0RpZFJlc3VtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmdyYW50VXNlck1lZGlh RGV2aWNlU2FuZGJveEV4dGVuc2lvbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpy ZXZva2VVc2VyTWVkaWFEZXZpY2VTYW5kYm94RXh0ZW5zaW9ucyk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmlzQWx3YXlz T25Mb2dnaW5nQWxsb3dlZCk6IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9X ZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVwZGF0ZVBy b2Nlc3NOYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6dXBkYXRlQWN0aXZlUGFn ZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjp1cGRhdGVDUFVNb25pdG9yU3RhdGUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpkZXN0cm95UmVuZGVyaW5nUmVzb3VyY2Vz KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6dXBkYXRlRnJlZXplclN0YXR1cyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmNvbnN1bWVBdWRpb0NvbXBvbmVudFJlZ2lzdHJh dGlvbnMpOgorCiAyMDIxLTA2LTExICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25v bWUub3JnPgogCiAgICAgICAgIFtHVEtdIENyYXNoIHdoZW4gZHJhZ2dpbmcgYW4gYWNjb3VudCBu b2RlIGFib3ZlIFdlYlZpZXcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApp bmRleCA3ODgyNzg5NDNhODE3ZjNjNGRlZjRhZDA4ZTY4NWZlM2E2Mzk5MDdlLi4zMzk4NWIxZWRk OGQ2ZmRjNGZjZjM3Yjk1MmMyYmZkMWQ5YjIyZjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlByb2Nlc3MuY3BwCkBAIC0yMTYsMTQgKzIxNiwxNCBAQAogI2luY2x1ZGUgPFdlYkNvcmUv VlA5VXRpbGl0aWVzQ29jb2EuaD4KICNlbmRpZgogCi0jdW5kZWYgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRAorI3VuZGVmIFdFQlBST0NFU1NfUkVMRUFTRV9MT0cKICNkZWZpbmUgUkVMRUFTRV9MT0df U0VTU0lPTl9JRCAobV9zZXNzaW9uSUQgPyBtX3Nlc3Npb25JRC0+dG9VSW50NjQoKSA6IDApCiAj aWYgUkVMRUFTRV9MT0dfRElTQUJMRUQKLSNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChj aGFubmVsLCBmbXQsIC4uLikgVU5VU0VEX1ZBUklBQkxFKHRoaXMpCi0jZGVmaW5lIFJFTEVBU0Vf TE9HX0VSUk9SX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFVOVVNFRF9WQVJJQUJMRSh0 aGlzKQorI2RlZmluZSBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HKGNoYW5uZWwsIGZtdCwgLi4uKSBV TlVTRURfVkFSSUFCTEUodGhpcykKKyNkZWZpbmUgV0VCUFJPQ0VTU19SRUxFQVNFX0xPR19FUlJP UihjaGFubmVsLCBmbXQsIC4uLikgVU5VU0VEX1ZBUklBQkxFKHRoaXMpCiAjZWxzZQotI2RlZmlu ZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19J Rihpc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gW3Nlc3Npb25JRD0l IiBQUkl1NjQgIl0gV2ViUHJvY2Vzczo6IiBmbXQsIHRoaXMsIFJFTEVBU0VfTE9HX1NFU1NJT05f SUQsICMjX19WQV9BUkdTX18pCi0jZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQo Y2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKGlzQWx3YXlzT25Mb2dnaW5n QWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBbc2Vzc2lvbklEPSUiIFBSSXU2NCAiXSBXZWJQcm9j ZXNzOjoiIGZtdCwgdGhpcywgUkVMRUFTRV9MT0dfU0VTU0lPTl9JRCwgIyNfX1ZBX0FSR1NfXykK KyNkZWZpbmUgV0VCUFJPQ0VTU19SRUxFQVNFX0xPRyhjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFT RV9MT0coY2hhbm5lbCwgIiVwIC0gW3Nlc3Npb25JRD0lIiBQUkl1NjQgIl0gV2ViUHJvY2Vzczo6 IiBmbXQsIHRoaXMsIFJFTEVBU0VfTE9HX1NFU1NJT05fSUQsICMjX19WQV9BUkdTX18pCisjZGVm aW5lIFdFQlBST0NFU1NfUkVMRUFTRV9MT0dfRVJST1IoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVB U0VfTE9HX0VSUk9SKGNoYW5uZWwsICIlcCAtIFtzZXNzaW9uSUQ9JSIgUFJJdTY0ICJdIFdlYlBy b2Nlc3M6OiIgZm10LCB0aGlzLCBSRUxFQVNFX0xPR19TRVNTSU9OX0lELCAjI19fVkFfQVJHU19f KQogI2VuZGlmCiAKIC8vIFRoaXMgc2hvdWxkIGJlIGxlc3MgdGhhbiBwbHVnSW5BdXRvU3RhcnRF eHBpcmF0aW9uVGltZVRocmVzaG9sZCBpbiBQbHVnSW5BdXRvU3RhcnRQcm92aWRlci4KQEAgLTQw NCwxMSArNDA0LDExIEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgICAgICAgICAvLyBJ ZiB0aGlzIGlzIGEgcHJvY2VzcyB3ZSBrZWVwIGFyb3VuZCBmb3IgcGVyZm9ybWFuY2UsIGtpbGwg aXQgb24gbWVtb3J5IHByZXNzdXJlIGluc3RlYWQgb2YgdHJ5aW5nIHRvIGZyZWUgdXAgaXRzIG1l bW9yeS4KICAgICAgICAgICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NUeXBlOjpDYWNo ZWRXZWJDb250ZW50IHx8IG1fcHJvY2Vzc1R5cGUgPT0gUHJvY2Vzc1R5cGU6OlByZXdhcm1lZFdl YkNvbnRlbnQgfHwgYXJlQWxsUGFnZXNTdXNwZW5kZWQoKSkgewogICAgICAgICAgICAgICAgIGlm IChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NUeXBlOjpDYWNoZWRXZWJDb250ZW50KQotICAgICAg ICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICJpbml0aWFsaXpl V2ViUHJvY2VzczogQ2FjaGVkIFdlYlByb2Nlc3MgaXMgZXhpdGluZyBkdWUgdG8gbWVtb3J5IHBy ZXNzdXJlIik7CisgICAgICAgICAgICAgICAgICAgIFdFQlBST0NFU1NfUkVMRUFTRV9MT0coUHJv Y2VzcywgImluaXRpYWxpemVXZWJQcm9jZXNzOiBDYWNoZWQgV2ViUHJvY2VzcyBpcyBleGl0aW5n IGR1ZSB0byBtZW1vcnkgcHJlc3N1cmUiKTsKICAgICAgICAgICAgICAgICBlbHNlIGlmIChtX3By b2Nlc3NUeXBlID09IFByb2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KQotICAgICAgICAg ICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICJpbml0aWFsaXplV2Vi UHJvY2VzczogUHJld2FybWVkIFdlYlByb2Nlc3MgaXMgZXhpdGluZyBkdWUgdG8gbWVtb3J5IHBy ZXNzdXJlIik7CisgICAgICAgICAgICAgICAgICAgIFdFQlBST0NFU1NfUkVMRUFTRV9MT0coUHJv Y2VzcywgImluaXRpYWxpemVXZWJQcm9jZXNzOiBQcmV3YXJtZWQgV2ViUHJvY2VzcyBpcyBleGl0 aW5nIGR1ZSB0byBtZW1vcnkgcHJlc3N1cmUiKTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2VzcywgImluaXRpYWxp emVXZWJQcm9jZXNzOiBTdXNwZW5kZWQgV2ViUHJvY2VzcyBpcyBleGl0aW5nIGR1ZSB0byBtZW1v cnkgcHJlc3N1cmUiKTsKKyAgICAgICAgICAgICAgICAgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xP RyhQcm9jZXNzLCAiaW5pdGlhbGl6ZVdlYlByb2Nlc3M6IFN1c3BlbmRlZCBXZWJQcm9jZXNzIGlz IGV4aXRpbmcgZHVlIHRvIG1lbW9yeSBwcmVzc3VyZSIpOwogICAgICAgICAgICAgICAgIHN0b3BS dW5Mb29wKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQpAQCAtNTQ5 LDcgKzU0OSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgICAgIHByZXdhcm1HbG9i YWxseSgpOwogI2VuZGlmCiAKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3MsICJp bml0aWFsaXplV2ViUHJvY2VzczogUHJlc2VudGluZyBwcm9jZXNzUElEPSVkIiwgV2ViQ29yZTo6 cHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKCkpOworICAgIFdFQlBST0NFU1NfUkVMRUFTRV9MT0co UHJvY2VzcywgImluaXRpYWxpemVXZWJQcm9jZXNzOiBQcmVzZW50aW5nIHByb2Nlc3NQSUQ9JWQi LCBXZWJDb3JlOjpwcmVzZW50aW5nQXBwbGljYXRpb25QSUQoKSk7CiB9CiAKIHZvaWQgV2ViUHJv Y2Vzczo6c2V0V2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMoV2ViUHJvY2Vzc0RhdGFTdG9yZVBh cmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQpAQCAtMTE0NSw5ICsxMTQ1LDkgQEAgdm9pZCBXZWJQcm9j ZXNzOjpsb2dEaWFnbm9zdGljTWVzc2FnZUZvck5ldHdvcmtQcm9jZXNzQ3Jhc2goKQogdm9pZCBX ZWJQcm9jZXNzOjpuZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQoTmV0d29ya1Byb2Nlc3ND b25uZWN0aW9uKiBjb25uZWN0aW9uKQogewogI2lmIE9TKERBUldJTikKLSAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKExvYWRpbmcsICJuZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQ6IE5l dHdvcmtQcm9jZXNzICglZCkgY2xvc2VkIGl0cyBjb25uZWN0aW9uIChDcmFzaGVkKSIsIGNvbm5l Y3Rpb24gPyBjb25uZWN0aW9uLT5jb25uZWN0aW9uKCkucmVtb3RlUHJvY2Vzc0lEKCkgOiAwKTsK KyAgICBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HKExvYWRpbmcsICJuZXR3b3JrUHJvY2Vzc0Nvbm5l Y3Rpb25DbG9zZWQ6IE5ldHdvcmtQcm9jZXNzICglZCkgY2xvc2VkIGl0cyBjb25uZWN0aW9uIChD cmFzaGVkKSIsIGNvbm5lY3Rpb24gPyBjb25uZWN0aW9uLT5jb25uZWN0aW9uKCkucmVtb3RlUHJv Y2Vzc0lEKCkgOiAwKTsKICNlbHNlCi0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChMb2FkaW5n LCAibmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uQ2xvc2VkOiBOZXR3b3JrUHJvY2VzcyBjbG9zZWQg aXRzIGNvbm5lY3Rpb24gKENyYXNoZWQpIik7CisgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xPRyhM b2FkaW5nLCAibmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uQ2xvc2VkOiBOZXR3b3JrUHJvY2VzcyBj bG9zZWQgaXRzIGNvbm5lY3Rpb24gKENyYXNoZWQpIik7CiAjZW5kaWYKIAogICAgIEFTU0VSVCht X25ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbik7CkBAIC0xNDY5LDcgKzE0NjksNyBAQCB2b2lkIFdl YlByb2Nlc3M6OnJlc2V0QWxsR2VvbG9jYXRpb25QZXJtaXNzaW9ucygpCiAKIHZvaWQgV2ViUHJv Y2Vzczo6cHJlcGFyZVRvU3VzcGVuZChib29sIGlzU3VzcGVuc2lvbkltbWluZW50LCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRChQcm9jZXNzU3VzcGVuc2lvbiwgInByZXBhcmVUb1N1c3BlbmQ6IGlzU3Vz cGVuc2lvbkltbWluZW50PSVkIiwgaXNTdXNwZW5zaW9uSW1taW5lbnQpOworICAgIFdFQlBST0NF U1NfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJwcmVwYXJlVG9TdXNwZW5kOiBpc1N1 c3BlbnNpb25JbW1pbmVudD0lZCIsIGlzU3VzcGVuc2lvbkltbWluZW50KTsKICAgICBTZXRGb3JT Y29wZTxib29sPiBzdXNwZW5zaW9uU2NvcGUobV9pc1N1c3BlbmRpbmcsIHRydWUpOwogICAgIG1f cHJvY2Vzc0lzU3VzcGVuZGVkID0gdHJ1ZTsKIApAQCAtMTQ3Nyw3ICsxNDc3LDcgQEAgdm9pZCBX ZWJQcm9jZXNzOjpwcmVwYXJlVG9TdXNwZW5kKGJvb2wgaXNTdXNwZW5zaW9uSW1taW5lbnQsIENv bXBsZXRpb25IYW5kbGVyPHYKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlmIChtX3Byb2Nl c3NUeXBlID09IFByb2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KSB7Ci0gICAgICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N1c3BlbnNpb24sICJwcmVwYXJlVG9TdXNwZW5k OiBQcm9jZXNzIGlzIHJlYWR5IHRvIHN1c3BlbmQiKTsKKyAgICAgICAgV0VCUFJPQ0VTU19SRUxF QVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgInByZXBhcmVUb1N1c3BlbmQ6IFByb2Nlc3MgaXMg cmVhZHkgdG8gc3VzcGVuZCIpOwogICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoKTsK ICAgICB9CiAjZW5kaWYKQEAgLTE1MTAsNDkgKzE1MTAsNDkgQEAgdm9pZCBXZWJQcm9jZXNzOjpw cmVwYXJlVG9TdXNwZW5kKGJvb2wgaXNTdXNwZW5zaW9uSW1taW5lbnQsIENvbXBsZXRpb25IYW5k bGVyPHYKICNlbmRpZgogCiAgICAgbWFya0FsbExheWVyc1ZvbGF0aWxlKFt0aGlzLCBjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAg ICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTdXNwZW5zaW9uLCAicHJlcGFyZVRv U3VzcGVuZDogUHJvY2VzcyBpcyByZWFkeSB0byBzdXNwZW5kIik7CisgICAgICAgIFdFQlBST0NF U1NfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJwcmVwYXJlVG9TdXNwZW5kOiBQcm9j ZXNzIGlzIHJlYWR5IHRvIHN1c3BlbmQiKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsK ICAgICB9KTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzOjptYXJrQWxsTGF5ZXJzVm9sYXRpbGUoQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N1c3BlbnNpb24sICJtYXJrQWxsTGF5ZXJzVm9sYXRp bGU6Iik7CisgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIm1h cmtBbGxMYXllcnNWb2xhdGlsZToiKTsKICAgICBhdXRvIGNhbGxiYWNrQWdncmVnYXRvciA9IENh bGxiYWNrQWdncmVnYXRvcjo6Y3JlYXRlKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAg ICBmb3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVzKCkpIHsKICAgICAgICAgcGFnZS0+ bWFya0xheWVyc1ZvbGF0aWxlKFt0aGlzLCBjYWxsYmFja0FnZ3JlZ2F0b3IsIHBhZ2VJRCA9IHBh Z2UtPmlkZW50aWZpZXIoKV0gKGJvb2wgc3VjY2VlZGVkKSB7CiAgICAgICAgICAgICBpZiAoc3Vj Y2VlZGVkKQotICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N1 c3BlbnNpb24sICJtYXJrQWxsTGF5ZXJzVm9sYXRpbGU6IFN1Y2Nlc3NmdWx5IG1hcmtlZCBsYXll cnMgYXMgdm9sYXRpbGUgZm9yIHdlYlBhZ2VJRD0lIiBQUkl1NjQsIHBhZ2VJRC50b1VJbnQ2NCgp KTsKKyAgICAgICAgICAgICAgICBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5z aW9uLCAibWFya0FsbExheWVyc1ZvbGF0aWxlOiBTdWNjZXNzZnVseSBtYXJrZWQgbGF5ZXJzIGFz IHZvbGF0aWxlIGZvciB3ZWJQYWdlSUQ9JSIgUFJJdTY0LCBwYWdlSUQudG9VSW50NjQoKSk7CiAg ICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxM T1dFRChQcm9jZXNzU3VzcGVuc2lvbiwgIm1hcmtBbGxMYXllcnNWb2xhdGlsZTogRmFpbGVkIHRv IG1hcmsgbGF5ZXJzIGFzIHZvbGF0aWxlIGZvciB3ZWJQYWdlSUQ9JSIgUFJJdTY0LCBwYWdlSUQu dG9VSW50NjQoKSk7CisgICAgICAgICAgICAgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xPR19FUlJP UihQcm9jZXNzU3VzcGVuc2lvbiwgIm1hcmtBbGxMYXllcnNWb2xhdGlsZTogRmFpbGVkIHRvIG1h cmsgbGF5ZXJzIGFzIHZvbGF0aWxlIGZvciB3ZWJQYWdlSUQ9JSIgUFJJdTY0LCBwYWdlSUQudG9V SW50NjQoKSk7CiAgICAgICAgIH0pOwogICAgIH0KIH0KIAogdm9pZCBXZWJQcm9jZXNzOjpjYW5j ZWxNYXJrQWxsTGF5ZXJzVm9sYXRpbGUoKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo UHJvY2Vzc1N1c3BlbnNpb24sICJjYW5jZWxNYXJrQWxsTGF5ZXJzVm9sYXRpbGU6Iik7CisgICAg V0VCUFJPQ0VTU19SRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgImNhbmNlbE1hcmtBbGxM YXllcnNWb2xhdGlsZToiKTsKICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVz KCkpCiAgICAgICAgIHBhZ2UtPmNhbmNlbE1hcmtMYXllcnNWb2xhdGlsZSgpOwogfQogCiB2b2lk IFdlYlByb2Nlc3M6OmZyZWV6ZUFsbExheWVyVHJlZXMoKQogewotICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoUHJvY2Vzc1N1c3BlbnNpb24sICJmcmVlemVBbGxMYXllclRyZWVzOiBXZWJQcm9j ZXNzIGlzIGZyZWV6aW5nIGFsbCBsYXllciB0cmVlcyIpOworICAgIFdFQlBST0NFU1NfUkVMRUFT RV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJmcmVlemVBbGxMYXllclRyZWVzOiBXZWJQcm9jZXNz IGlzIGZyZWV6aW5nIGFsbCBsYXllciB0cmVlcyIpOwogICAgIGZvciAoYXV0byYgcGFnZSA6IG1f cGFnZU1hcC52YWx1ZXMoKSkKICAgICAgICAgcGFnZS0+ZnJlZXplTGF5ZXJUcmVlKFdlYlBhZ2U6 OkxheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UHJvY2Vzc1N1c3BlbmRlZCk7CiB9CiAKIHZvaWQgV2Vi UHJvY2Vzczo6dW5mcmVlemVBbGxMYXllclRyZWVzKCkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKFByb2Nlc3NTdXNwZW5zaW9uLCAidW5mcmVlemVBbGxMYXllclRyZWVzOiBXZWJQcm9j ZXNzIGlzIHVuZnJlZXppbmcgYWxsIGxheWVyIHRyZWVzIik7CisgICAgV0VCUFJPQ0VTU19SRUxF QVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgInVuZnJlZXplQWxsTGF5ZXJUcmVlczogV2ViUHJv Y2VzcyBpcyB1bmZyZWV6aW5nIGFsbCBsYXllciB0cmVlcyIpOwogICAgIGZvciAoYXV0byYgcGFn ZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKICAgICAgICAgcGFnZS0+dW5mcmVlemVMYXllclRyZWUo V2ViUGFnZTo6TGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3VzcGVuZGVkKTsKIH0KIAog dm9pZCBXZWJQcm9jZXNzOjpwcm9jZXNzRGlkUmVzdW1lKCkKIHsKLSAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKFByb2Nlc3NTdXNwZW5zaW9uLCAicHJvY2Vzc0RpZFJlc3VtZToiKTsKKyAgICBX RUJQUk9DRVNTX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAicHJvY2Vzc0RpZFJlc3Vt ZToiKTsKIAogICAgIG1fcHJvY2Vzc0lzU3VzcGVuZGVkID0gZmFsc2U7CiAKQEAgLTE5MjAsNyAr MTkyMCw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6Z3JhbnRVc2VyTWVkaWFEZXZpY2VTYW5kYm94RXh0 ZW5zaW9ucyhNZWRpYURldmljZVNhbmRib3hFeHRlbnNpCiAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBleHRlbnNpb25zLnNpemUoKTsgaSsrKSB7CiAgICAgICAgIGNvbnN0IGF1dG8mIGV4dGVu c2lvbiA9IGV4dGVuc2lvbnNbaV07CiAgICAgICAgIGV4dGVuc2lvbi5zZWNvbmQtPmNvbnN1bWUo KTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChXZWJSVEMsICJncmFudFVzZXJNZWRp YURldmljZVNhbmRib3hFeHRlbnNpb25zOiBncmFudGVkIGV4dGVuc2lvbiAlcyIsIGV4dGVuc2lv bi5maXJzdC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xPRyhX ZWJSVEMsICJncmFudFVzZXJNZWRpYURldmljZVNhbmRib3hFeHRlbnNpb25zOiBncmFudGVkIGV4 dGVuc2lvbiAlcyIsIGV4dGVuc2lvbi5maXJzdC51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgbV9t ZWRpYUNhcHR1cmVTYW5kYm94RXh0ZW5zaW9ucy5hZGQoZXh0ZW5zaW9uLmZpcnN0LCBleHRlbnNp b24uc2Vjb25kLmNvcHlSZWYoKSk7CiAgICAgfQogfQpAQCAtMTk1MSw3ICsxOTUxLDcgQEAgdm9p ZCBXZWJQcm9jZXNzOjpyZXZva2VVc2VyTWVkaWFEZXZpY2VTYW5kYm94RXh0ZW5zaW9ucyhjb25z dCBWZWN0b3I8U3RyaW5nPiYgZXgKICAgICAgICAgQVNTRVJUKGV4dGVuc2lvbiB8fCBNb2NrUmVh bHRpbWVNZWRpYVNvdXJjZUNlbnRlcjo6bW9ja1JlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXJFbmFi bGVkKCkpOwogICAgICAgICBpZiAoZXh0ZW5zaW9uKSB7CiAgICAgICAgICAgICBleHRlbnNpb24t PnJldm9rZSgpOwotICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChXZWJSVEMsICJy ZXZva2VVc2VyTWVkaWFEZXZpY2VTYW5kYm94RXh0ZW5zaW9uczogcmV2b2tlZCBleHRlbnNpb24g JXMiLCBleHRlbnNpb25JRC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgIFdFQlBST0NFU1Nf UkVMRUFTRV9MT0coV2ViUlRDLCAicmV2b2tlVXNlck1lZGlhRGV2aWNlU2FuZGJveEV4dGVuc2lv bnM6IHJldm9rZWQgZXh0ZW5zaW9uICVzIiwgZXh0ZW5zaW9uSUQudXRmOCgpLmRhdGEoKSk7CiAg ICAgICAgIH0KICAgICB9CiB9CkBAIC0yMTY2LDUgKzIxNjYsNSBAQCBSZW1vdGVNZWRpYUVuZ2lu ZUNvbmZpZ3VyYXRpb25GYWN0b3J5JiBXZWJQcm9jZXNzOjptZWRpYUVuZ2luZUNvbmZpZ3VyYXRp b25GYWN0bwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICN1bmRlZiBSRUxFQVNFX0xPR19TRVNT SU9OX0lECi0jdW5kZWYgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRAotI3VuZGVmIFJFTEVBU0VfTE9H X0VSUk9SX0lGX0FMTE9XRUQKKyN1bmRlZiBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HCisjdW5kZWYg V0VCUFJPQ0VTU19SRUxFQVNFX0xPR19FUlJPUgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9j ZXNzLmgKaW5kZXggYzc0N2NhNzM0ZDU2Y2UyOTFiYTA3OTBiMDI0ZWQ1MDQxMGI1MzgyYy4uYWI1 NjlkMjU5Y2FmZjliYTJiMDYzNDkyYTliMjdmNTU1YjE5ODA1OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5oCkBAIC02MDAsOCArNjAwLDYgQEAgcHJpdmF0ZToKICAgICB2b2lk IHNldFVzZVN5c3RlbUFwcGVhcmFuY2VGb3JTY3JvbGxiYXJzKGJvb2wpOwogI2VuZGlmCiAKLSAg ICBib29sIGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpIHsgcmV0dXJuIG1fc2Vzc2lvbklEID8g bV9zZXNzaW9uSUQtPmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpIDogdHJ1ZTsgfQotCiAgICAg UmVmUHRyPFdlYkNvbm5lY3Rpb25Ub1VJUHJvY2Vzcz4gbV93ZWJDb25uZWN0aW9uOwogCiAgICAg SGFzaE1hcDxXZWJDb3JlOjpQYWdlSWRlbnRpZmllciwgUmVmUHRyPFdlYlBhZ2U+PiBtX3BhZ2VN YXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vz c0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbQppbmRleCAzNWM5MTI1YzIyOWI4YTgzODc5MmJlNGEzNWE5MjhhOWVmYjIzZmFmLi4wNzFi NGZmYWEyZGVjMGMzNTRlMTg5ZjJjYjRhZWZiNmIyM2RiYTY4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KQEAgLTE2Nyw4ICsxNjcs OCBAQCBTT0ZUX0xJTktfQ0xBU1MoQ29yZVNlcnZpY2VzLCBfTFNEU2VydmljZSkKIFNPRlRfTElO S19DTEFTUyhDb3JlU2VydmljZXMsIF9MU0RPcGVuU2VydmljZSkKIAogI2RlZmluZSBSRUxFQVNF X0xPR19TRVNTSU9OX0lEIChtX3Nlc3Npb25JRCA/IG1fc2Vzc2lvbklELT50b1VJbnQ2NCgpIDog MCkKLSNkZWZpbmUgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQsIC4uLikgUkVM RUFTRV9MT0dfSUYoaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5uZWwsICIlcCAtIFtz ZXNzaW9uSUQ9JSIgUFJJdTY0ICJdIFdlYlByb2Nlc3M6OiIgZm10LCB0aGlzLCBSRUxFQVNFX0xP R19TRVNTSU9OX0lELCAjI19fVkFfQVJHU19fKQotI2RlZmluZSBSRUxFQVNFX0xPR19FUlJPUl9J Rl9BTExPV0VEKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUl9JRihpc0Fsd2F5 c09uTG9nZ2luZ0FsbG93ZWQoKSwgY2hhbm5lbCwgIiVwIC0gW3Nlc3Npb25JRD0lIiBQUkl1NjQg Il0gV2ViUHJvY2Vzczo6IiBmbXQsIHRoaXMsIFJFTEVBU0VfTE9HX1NFU1NJT05fSUQsICMjX19W QV9BUkdTX18pCisjZGVmaW5lIFdFQlBST0NFU1NfUkVMRUFTRV9MT0coY2hhbm5lbCwgZm10LCAu Li4pIFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFtzZXNzaW9uSUQ9JSIgUFJJdTY0ICJdIFdl YlByb2Nlc3M6OiIgZm10LCB0aGlzLCBSRUxFQVNFX0xPR19TRVNTSU9OX0lELCAjI19fVkFfQVJH U19fKQorI2RlZmluZSBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HX0VSUk9SKGNoYW5uZWwsIGZtdCwg Li4uKSBSRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCAiJXAgLSBbc2Vzc2lvbklEPSUiIFBSSXU2 NCAiXSBXZWJQcm9jZXNzOjoiIGZtdCwgdGhpcywgUkVMRUFTRV9MT0dfU0VTU0lPTl9JRCwgIyNf X1ZBX0FSR1NfXykKIAogI2lmIFBMQVRGT1JNKE1BQykKIFNPRlRfTElOS19GUkFNRVdPUktfSU5f VU1CUkVMTEEoQXBwbGljYXRpb25TZXJ2aWNlcywgSElTZXJ2aWNlcykKQEAgLTUwOCw3ICs1MDgs NyBAQCB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKElzSW5Qcm9jZXNzSW5pdGlh bGl6YXRpb24gaXNJblByb2Nlc3NJbml0aWFsaQogICAgICAgICBtYWNoX21zZ190eXBlX251bWJl cl90IGluZm9fc2l6ZSA9IFRBU0tfQVVESVRfVE9LRU5fQ09VTlQ7CiAgICAgICAgIGtlcm5fcmV0 dXJuX3Qga3IgPSB0YXNrX2luZm8obWFjaF90YXNrX3NlbGYoKSwgVEFTS19BVURJVF9UT0tFTiwg cmVpbnRlcnByZXRfY2FzdDxpbnRlZ2VyX3QgKj4oJmF1ZGl0VG9rZW4pLCAmaW5mb19zaXplKTsK ICAgICAgICAgaWYgKGtyICE9IEtFUk5fU1VDQ0VTUykgewotICAgICAgICAgICAgUkVMRUFTRV9M T0dfRVJST1JfSUZfQUxMT1dFRChQcm9jZXNzLCAidXBkYXRlUHJvY2Vzc05hbWU6IFVuYWJsZSB0 byBnZXQgYXVkaXQgdG9rZW4gZm9yIHNlbGYuIEVycm9yOiAle3B1YmxpY31zICgleCkiLCBtYWNo X2Vycm9yX3N0cmluZyhrciksIGtyKTsKKyAgICAgICAgICAgIFdFQlBST0NFU1NfUkVMRUFTRV9M T0dfRVJST1IoUHJvY2VzcywgInVwZGF0ZVByb2Nlc3NOYW1lOiBVbmFibGUgdG8gZ2V0IGF1ZGl0 IHRva2VuIGZvciBzZWxmLiBFcnJvcjogJXtwdWJsaWN9cyAoJXgpIiwgbWFjaF9lcnJvcl9zdHJp bmcoa3IpLCBrcik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgU3Ry aW5nIGRpc3BsYXlOYW1lID0gYXBwbGljYXRpb25OYW1lLmdldCgpOwpAQCAtNTIxLDcgKzUyMSw3 IEBAIHZvaWQgV2ViUHJvY2Vzczo6dXBkYXRlUHJvY2Vzc05hbWUoSXNJblByb2Nlc3NJbml0aWFs aXphdGlvbiBpc0luUHJvY2Vzc0luaXRpYWxpCiAgICAgYXV0byBlcnJvciA9IF9MU1NldEFwcGxp Y2F0aW9uSW5mb3JtYXRpb25JdGVtKGtMU0RlZmF1bHRTZXNzaW9uSUQsIF9MU0dldEN1cnJlbnRB cHBsaWNhdGlvbkFTTigpLCBfa0xTRGlzcGxheU5hbWVLZXksIChDRlN0cmluZ1JlZilhcHBsaWNh dGlvbk5hbWUuZ2V0KCksIG51bGxwdHIpOwogICAgIEFTU0VSVCghZXJyb3IpOwogICAgIGlmIChl cnJvcikgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3MsICJ1 cGRhdGVQcm9jZXNzTmFtZTogRmFpbGVkIHRvIHNldCB0aGUgZGlzcGxheSBuYW1lIG9mIHRoZSBX ZWJDb250ZW50IHByb2Nlc3MsIGVycm9yIGNvZGU9JWxkIiwgc3RhdGljX2Nhc3Q8bG9uZz4oZXJy b3IpKTsKKyAgICAgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAidXBk YXRlUHJvY2Vzc05hbWU6IEZhaWxlZCB0byBzZXQgdGhlIGRpc3BsYXkgbmFtZSBvZiB0aGUgV2Vi Q29udGVudCBwcm9jZXNzLCBlcnJvciBjb2RlPSVsZCIsIHN0YXRpY19jYXN0PGxvbmc+KGVycm9y KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAjaWYgQVNTRVJUX0VOQUJMRUQKQEAgLTc4Nyw3 ICs3ODcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZUFjdGl2ZVBhZ2VzKGNvbnN0IFN0cmlu ZyYgb3ZlcnJpZGVEaXNwbGF5TmFtZSkKICAgICBtYWNoX21zZ190eXBlX251bWJlcl90IGluZm9f c2l6ZSA9IFRBU0tfQVVESVRfVE9LRU5fQ09VTlQ7CiAgICAga2Vybl9yZXR1cm5fdCBrciA9IHRh c2tfaW5mbyhtYWNoX3Rhc2tfc2VsZigpLCBUQVNLX0FVRElUX1RPS0VOLCByZWludGVycHJldF9j YXN0PGludGVnZXJfdCAqPigmYXVkaXRUb2tlbiksICZpbmZvX3NpemUpOwogICAgIGlmIChrciAh PSBLRVJOX1NVQ0NFU1MpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQ cm9jZXNzLCAidXBkYXRlQWN0aXZlUGFnZXM6IFVuYWJsZSB0byBnZXQgYXVkaXQgdG9rZW4gZm9y IHNlbGYuIEVycm9yOiAle3B1YmxpY31zICgleCkiLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGty KTsKKyAgICAgICAgV0VCUFJPQ0VTU19SRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAidXBkYXRl QWN0aXZlUGFnZXM6IFVuYWJsZSB0byBnZXQgYXVkaXQgdG9rZW4gZm9yIHNlbGYuIEVycm9yOiAl e3B1YmxpY31zICgleCkiLCBtYWNoX2Vycm9yX3N0cmluZyhrciksIGtyKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIApAQCAtODU0LDkgKzg1NCw5IEBAIHZvaWQgV2ViUHJvY2Vzczo6dXBkYXRl Q1BVTW9uaXRvclN0YXRlKENQVU1vbml0b3JVcGRhdGVSZWFzb24gcmVhc29uKQogICAgIGlmICgh bV9jcHVNb25pdG9yKSB7CiAgICAgICAgIG1fY3B1TW9uaXRvciA9IG1ha2VVbmlxdWU8Q1BVTW9u aXRvcj4oY3B1TW9uaXRvcmluZ0ludGVydmFsLCBbdGhpc10oZG91YmxlIGNwdVVzYWdlKSB7CiAg ICAgICAgICAgICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6U2VydmljZVdvcmtl cikKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3NT dXNwZW5zaW9uLCAidXBkYXRlQ1BVTW9uaXRvclN0YXRlOiBTZXJ2aWNlIHdvcmtlciBwcm9jZXNz IGV4Y2VlZGVkIENQVSBsaW1pdCBvZiAlLjFmJSUgKHdhcyB1c2luZyAlLjFmJSUpIiwgbV9jcHVM aW1pdC52YWx1ZSgpICogMTAwLCBjcHVVc2FnZSAqIDEwMCk7CisgICAgICAgICAgICAgICAgV0VC UFJPQ0VTU19SRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgInVwZGF0ZUNQVU1v bml0b3JTdGF0ZTogU2VydmljZSB3b3JrZXIgcHJvY2VzcyBleGNlZWRlZCBDUFUgbGltaXQgb2Yg JS4xZiUlICh3YXMgdXNpbmcgJS4xZiUlKSIsIG1fY3B1TGltaXQudmFsdWUoKSAqIDEwMCwgY3B1 VXNhZ2UgKiAxMDApOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIFJFTEVBU0Vf TE9HX0VSUk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N1c3BlbnNpb24sICJ1cGRhdGVDUFVNb25pdG9y U3RhdGU6IFdlYlByb2Nlc3MgZXhjZWVkZWQgQ1BVIGxpbWl0IG9mICUuMWYlJSAod2FzIHVzaW5n ICUuMWYlJSkgaGFzVmlzaWJsZVBhZ2VzPyAlZCIsIG1fY3B1TGltaXQudmFsdWUoKSAqIDEwMCwg Y3B1VXNhZ2UgKiAxMDAsIGhhc1Zpc2libGVXZWJQYWdlKCkpOworICAgICAgICAgICAgICAgIFdF QlBST0NFU1NfUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24sICJ1cGRhdGVDUFVN b25pdG9yU3RhdGU6IFdlYlByb2Nlc3MgZXhjZWVkZWQgQ1BVIGxpbWl0IG9mICUuMWYlJSAod2Fz IHVzaW5nICUuMWYlJSkgaGFzVmlzaWJsZVBhZ2VzPyAlZCIsIG1fY3B1TGltaXQudmFsdWUoKSAq IDEwMCwgY3B1VXNhZ2UgKiAxMDAsIGhhc1Zpc2libGVXZWJQYWdlKCkpOwogICAgICAgICAgICAg cGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5 OjpEaWRFeGNlZWRDUFVMaW1pdCgpLCAwKTsKICAgICAgICAgfSk7CiAgICAgfSBlbHNlIGlmIChy ZWFzb24gPT0gQ1BVTW9uaXRvclVwZGF0ZVJlYXNvbjo6VmlzaWJpbGl0eUhhc0NoYW5nZWQpIHsK QEAgLTk1Miw3ICs5NTIsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmRlc3Ryb3lSZW5kZXJpbmdSZXNv dXJjZXMoKQogI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIE1vbm90b25pY1RpbWUgZW5k VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOwogI2VuZGlmCi0gICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRChQcm9jZXNzU3VzcGVuc2lvbiwgImRlc3Ryb3lSZW5kZXJpbmdSZXNvdXJjZXM6IHRv b2sgJS4yZm1zIiwgKGVuZFRpbWUgLSBzdGFydFRpbWUpLm1pbGxpc2Vjb25kcygpKTsKKyAgICBX RUJQUk9DRVNTX1JFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiZGVzdHJveVJlbmRlcmlu Z1Jlc291cmNlczogdG9vayAlLjJmbXMiLCAoZW5kVGltZSAtIHN0YXJ0VGltZSkubWlsbGlzZWNv bmRzKCkpOwogfQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTk5Miw5ICs5OTIsOSBA QCB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZUZyZWV6ZXJTdGF0dXMoKQogICAgIGJvb2wgaXNGcmVl emFibGUgPSBzaG91bGRGcmVlemVPblN1c3BlbnNpb24oKTsKICAgICBhdXRvIHJlc3VsdCA9IG1l bW9yeXN0YXR1c19jb250cm9sKE1FTU9SWVNUQVRVU19DTURfU0VUX1BST0NFU1NfSVNfRlJFRVpB QkxFLCBnZXRwaWQoKSwgaXNGcmVlemFibGUgPyAxIDogMCwgbnVsbHB0ciwgMCk7CiAgICAgaWYg KHJlc3VsdCkKLSAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQcm9jZXNzU3Vz cGVuc2lvbiwgInVwZGF0ZUZyZWV6ZXJTdGF0dXM6IGlzRnJlZXphYmxlPSVkLCBlcnJvcj0lZCIs IGlzRnJlZXphYmxlLCByZXN1bHQpOworICAgICAgICBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HX0VS Uk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAidXBkYXRlRnJlZXplclN0YXR1czogaXNGcmVlemFibGU9 JWQsIGVycm9yPSVkIiwgaXNGcmVlemFibGUsIHJlc3VsdCk7CiAgICAgZWxzZQotICAgICAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTdXNwZW5zaW9uLCAidXBkYXRlRnJlZXplclN0 YXR1czogaXNGcmVlemFibGU9JWQsIHN1Y2Nlc3MiLCBpc0ZyZWV6YWJsZSk7CisgICAgICAgIFdF QlBST0NFU1NfUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJ1cGRhdGVGcmVlemVyU3Rh dHVzOiBpc0ZyZWV6YWJsZT0lZCwgc3VjY2VzcyIsIGlzRnJlZXphYmxlKTsKIH0KICNlbmRpZgog CkBAIC0xMzM5LDExICsxMzM5LDExIEBAIHZvaWQgV2ViUHJvY2Vzczo6Y29uc3VtZUF1ZGlvQ29t cG9uZW50UmVnaXN0cmF0aW9ucyhjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhCiAKICAgICBh dXRvIGVyciA9IEF1ZGlvQ29tcG9uZW50QXBwbHlTZXJ2ZXJSZWdpc3RyYXRpb25zKHJlZ2lzdHJh dGlvbnMuZ2V0KCkpOwogICAgIGlmIChub0VyciAhPSBlcnIpCi0gICAgICAgIFJFTEVBU0VfTE9H X0VSUk9SX0lGX0FMTE9XRUQoUHJvY2VzcywgIkNvdWxkIG5vdCBhcHBseSBBdWRpb0NvbXBvbmVu dCByZWdpc3RyYXRpb25zLCBlcnIoJWxkKSIsIHN0YXRpY19jYXN0PGxvbmc+KGVycikpOworICAg ICAgICBXRUJQUk9DRVNTX1JFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJDb3VsZCBub3QgYXBw bHkgQXVkaW9Db21wb25lbnQgcmVnaXN0cmF0aW9ucywgZXJyKCVsZCkiLCBzdGF0aWNfY2FzdDxs b25nPihlcnIpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICN1bmRlZiBSRUxFQVNF X0xPR19TRVNTSU9OX0lECi0jdW5kZWYgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRAotI3VuZGVmIFJF TEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQKKyN1bmRlZiBXRUJQUk9DRVNTX1JFTEVBU0VfTE9H CisjdW5kZWYgV0VCUFJPQ0VTU19SRUxFQVNFX0xPR19FUlJPUgo=