238778 2022-04-04 16:57:05 -0700 Turn off LLInt ICs in captive portal mode 2022-04-04 20:33:14 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam ews-watchlist keith_miller mark.lam msaboff tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1858153 0 saam 2022-04-04 16:57:05 -0700 <rdar://84830873> 1858154 1 456651 saam 2022-04-04 17:00:35 -0700 Created attachment 456651 patch 1858156 2 456651 ysuzuki 2022-04-04 17:02:25 -0700 Comment on attachment 456651 patch r=me 1858167 3 456653 saam 2022-04-04 17:48:21 -0700 Created attachment 456653 patch for landing 1858217 4 ews-feeder 2022-04-04 20:33:11 -0700 Committed r292369 (249234@main): <https://commits.webkit.org/249234@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456653. 456651 2022-04-04 17:00:35 -0700 2022-04-04 17:48:21 -0700 patch a-backup.diff text/plain 12521 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjkyMzEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDIyLTA0LTA0ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFR1cm4gb2ZmIExMSW50IElDcyBpbiBjYXB0aXZlIHBvcnRhbCBtb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg3NzgKKyAgICAgICAgPHJkYXI6 Ly84NDgzMDg3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGJ5dGVjb2RlL1JlcGF0Y2guY3BwOgorICAgICAgICAoSlNDOjpsaW5rU2xvd0Zvcik6 CisgICAgICAgICogYnl0ZWNvZGUvUmVwYXRjaC5oOgorICAgICAgICAqIGJ5dGVjb2RlL1JlcGF0 Y2hJbmxpbmVzLmg6CisgICAgICAgIChKU0M6OmxpbmtGb3IpOgorICAgICAgICAqIGxsaW50L0xM SW50Q29tbW9uLmg6CisgICAgICAgICogbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwOgorICAgICAg ICAoSlNDOjpMTEludDo6TExJTlRfU0xPV19QQVRIX0RFQ0wpOgorICAgICAgICAoSlNDOjpMTElu dDo6cGVyZm9ybUxMSW50R2V0QnlJRCk6CisgICAgICAgICogcnVudGltZS9PcHRpb25zTGlzdC5o OgorCiAyMDIyLTA0LTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIGRlZmF1bHQgY29uc3RydWN0b3IgdG8gQVNDSUlMaXRlcmFsCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUmVwYXRjaC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1JlcGF0Y2guY3BwCShyZXZpc2lvbiAyOTIzMTIpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvUmVwYXRjaC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTgxLDcgKzgxLDcgQEAgc3RhdGljIHZvaWQgbGlua1Nsb3dQYXRoVG8oVk0mIHZtLCBD YWxsTAogfQogI2VuZGlmCiAKLXN0YXRpYyB2b2lkIGxpbmtTbG93Rm9yKFZNJiB2bSwgQ2FsbExp bmtJbmZvJiBjYWxsTGlua0luZm8pCit2b2lkIGxpbmtTbG93Rm9yKFZNJiB2bSwgQ2FsbExpbmtJ bmZvJiBjYWxsTGlua0luZm8pCiB7CiAgICAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpJVFN0dWJS b3V0aW5lUHRyVGFnPiB2aXJ0dWFsVGh1bmsgPSB2bS5nZXRDVElWaXJ0dWFsQ2FsbChjYWxsTGlu a0luZm8uY2FsbE1vZGUoKSk7CiAgICAgbGlua1Nsb3dQYXRoVG8odm0sIGNhbGxMaW5rSW5mbywg dmlydHVhbFRodW5rKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9SZXBh dGNoLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1JlcGF0 Y2guaAkocmV2aXNpb24gMjkyMzEyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L1JlcGF0Y2guaAkod29ya2luZyBjb3B5KQpAQCAtNzMsNiArNzMsNyBAQCB2b2lkIHJlcGF0Y2hT ZXRQcml2YXRlQnJhbmQoSlNHbG9iYWxPYmplCiB2b2lkIHJlcGF0Y2hJbnN0YW5jZU9mKEpTR2xv YmFsT2JqZWN0KiwgQ29kZUJsb2NrKiwgSlNWYWx1ZSwgSlNWYWx1ZSBwcm90b3R5cGUsIFN0cnVj dHVyZVN0dWJJbmZvJiwgYm9vbCB3YXNGb3VuZCk7CiB2b2lkIGxpbmtNb25vbW9ycGhpY0NhbGwo Vk0mLCBDYWxsRnJhbWUqLCBDYWxsTGlua0luZm8mLCBDb2RlQmxvY2sqLCBKU09iamVjdCogY2Fs bGVlLCBNYWNyb0Fzc2VtYmxlckNvZGVQdHI8SlNFbnRyeVB0clRhZz4pOwogdm9pZCBsaW5rRGly ZWN0Q2FsbChDYWxsRnJhbWUqLCBPcHRpbWl6aW5nQ2FsbExpbmtJbmZvJiwgQ29kZUJsb2NrKiwg TWFjcm9Bc3NlbWJsZXJDb2RlUHRyPEpTRW50cnlQdHJUYWc+KTsKK3ZvaWQgbGlua1Nsb3dGb3Io Vk0mLCBDYWxsTGlua0luZm8mKTsKIHZvaWQgbGlua1Nsb3dGb3IoQ2FsbEZyYW1lKiwgQ2FsbExp bmtJbmZvJik7CiB2b2lkIHVubGlua0NhbGwoVk0mLCBDYWxsTGlua0luZm8mKTsKIHZvaWQgbGlu a1BvbHltb3JwaGljQ2FsbChKU0dsb2JhbE9iamVjdCosIENhbGxGcmFtZSosIENhbGxMaW5rSW5m byYsIENhbGxWYXJpYW50KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9S ZXBhdGNoSW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9SZXBhdGNoSW5saW5lcy5oCShyZXZpc2lvbiAyOTIzMTIpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvUmVwYXRjaElubGluZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMTAy LDYgKzEwMiwxMiBAQCBBTFdBWVNfSU5MSU5FIFNsb3dQYXRoUmV0dXJuVHlwZSBsaW5rRm9yCiAK ICAgICBSRUxFQVNFX0FTU0VSVCghY2FsbExpbmtJbmZvLT5pc0RpcmVjdCgpKTsKIAorICAgIGF1 dG8gaXNDYWNoaW5nRW5hYmxlZCA9IFsmXSB7CisgICAgICAgIGlmIChPcHRpb25zOjp1c2VMTElu dElDcygpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBjYWxsRnJh bWUtPmNvZGVCbG9jaygpLT5qaXRUeXBlKCkgIT0gSklUVHlwZTo6SW50ZXJwcmV0ZXJUaHVuazsK KyAgICB9OworCiAgICAgSlNWYWx1ZSBjYWxsZWVBc1ZhbHVlID0gY2FsbGVlRnJhbWUtPmd1YXJh bnRlZWRKU1ZhbHVlQ2FsbGVlKCk7CiAgICAgSlNDZWxsKiBjYWxsZWVBc0Z1bmN0aW9uQ2VsbCA9 IGdldEpTRnVuY3Rpb24oY2FsbGVlQXNWYWx1ZSk7CiAgICAgaWYgKCFjYWxsZWVBc0Z1bmN0aW9u Q2VsbCkgewpAQCAtMTA5LDEwICsxMTUsMTMgQEAgQUxXQVlTX0lOTElORSBTbG93UGF0aFJldHVy blR5cGUgbGlua0ZvcgogICAgICAgICAgICAgTWFjcm9Bc3NlbWJsZXJDb2RlUHRyPEpTRW50cnlQ dHJUYWc+IGNvZGVQdHIgPSB2bS5nZXRDVElJbnRlcm5hbEZ1bmN0aW9uVHJhbXBvbGluZUZvcihr aW5kKTsKICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKCEhY29kZVB0cik7CiAKLSAgICAgICAg ICAgIGlmICghY2FsbExpbmtJbmZvLT5zZWVuT25jZSgpKQotICAgICAgICAgICAgICAgIGNhbGxM aW5rSW5mby0+c2V0U2VlbigpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGxp bmtNb25vbW9ycGhpY0NhbGwodm0sIGNhbGxlZUZyYW1lLCAqY2FsbExpbmtJbmZvLCBudWxscHRy LCBpbnRlcm5hbEZ1bmN0aW9uLCBjb2RlUHRyKTsKKyAgICAgICAgICAgIGlmIChMSUtFTFkoaXND YWNoaW5nRW5hYmxlZCgpKSkgeworICAgICAgICAgICAgICAgIGlmICghY2FsbExpbmtJbmZvLT5z ZWVuT25jZSgpKQorICAgICAgICAgICAgICAgICAgICBjYWxsTGlua0luZm8tPnNldFNlZW4oKTsK KyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGxpbmtNb25vbW9ycGhp Y0NhbGwodm0sIGNhbGxlZUZyYW1lLCAqY2FsbExpbmtJbmZvLCBudWxscHRyLCBpbnRlcm5hbEZ1 bmN0aW9uLCBjb2RlUHRyKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIGxp bmtTbG93Rm9yKHZtLCAqY2FsbExpbmtJbmZvKTsKIAogICAgICAgICAgICAgdm9pZCogbGlua2Vk VGFyZ2V0ID0gY29kZVB0ci5leGVjdXRhYmxlQWRkcmVzcygpOwogICAgICAgICAgICAgcmV0dXJu IGVuY29kZVJlc3VsdChsaW5rZWRUYXJnZXQsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KGNhbGxM aW5rSW5mby0+Y2FsbE1vZGUoKSA9PSBDYWxsTW9kZTo6VGFpbCA/IFJldXNlVGhlRnJhbWUgOiBL ZWVwVGhlRnJhbWUpKTsKQEAgLTE2MSwxMCArMTcwLDEzIEBAIEFMV0FZU19JTkxJTkUgU2xvd1Bh dGhSZXR1cm5UeXBlIGxpbmtGb3IKICAgICAgICAgY29kZVB0ciA9IGZ1bmN0aW9uRXhlY3V0YWJs ZS0+ZW50cnlwb2ludEZvcihraW5kLCBhcml0eSk7CiAgICAgfQogCi0gICAgaWYgKCFjYWxsTGlu a0luZm8tPnNlZW5PbmNlKCkpCi0gICAgICAgIGNhbGxMaW5rSW5mby0+c2V0U2VlbigpOwotICAg IGVsc2UKLSAgICAgICAgbGlua01vbm9tb3JwaGljQ2FsbCh2bSwgY2FsbGVlRnJhbWUsICpjYWxs TGlua0luZm8sIGNvZGVCbG9jaywgY2FsbGVlLCBjb2RlUHRyKTsKKyAgICBpZiAoTElLRUxZKGlz Q2FjaGluZ0VuYWJsZWQoKSkpIHsKKyAgICAgICAgaWYgKCFjYWxsTGlua0luZm8tPnNlZW5PbmNl KCkpCisgICAgICAgICAgICBjYWxsTGlua0luZm8tPnNldFNlZW4oKTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgbGlua01vbm9tb3JwaGljQ2FsbCh2bSwgY2FsbGVlRnJhbWUsICpjYWxsTGlu a0luZm8sIGNvZGVCbG9jaywgY2FsbGVlLCBjb2RlUHRyKTsKKyAgICB9IGVsc2UKKyAgICAgICAg bGlua1Nsb3dGb3Iodm0sICpjYWxsTGlua0luZm8pOwogCiAgICAgcmV0dXJuIGVuY29kZVJlc3Vs dChjb2RlUHRyLmV4ZWN1dGFibGVBZGRyZXNzKCksIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KGNh bGxMaW5rSW5mby0+Y2FsbE1vZGUoKSA9PSBDYWxsTW9kZTo6VGFpbCA/IFJldXNlVGhlRnJhbWUg OiBLZWVwVGhlRnJhbWUpKTsKIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M TEludENvbW1vbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9M TEludENvbW1vbi5oCShyZXZpc2lvbiAyOTIzMTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv bGxpbnQvTExJbnRDb21tb24uaAkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgsMyBAQAogI2Vs c2UKICNkZWZpbmUgTExJTlRfQUxXQVlTX0FMTE9DQVRFX1NMT1cgMAogI2VuZGlmCi0KLS8vIERp c2FibGUgaW5saW5lIGNhY2hpbmcgb2YgZ2V0X2J5X2lkIGFuZCBwdXRfYnlfaWQuCi0jZGVmaW5l IExMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVyAwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv bGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAJKHJldmlzaW9uIDI5MjMxMikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY0Nyw3ICs2NDcsNyBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfdHJ5X2dl dF9iCiAgICAgYmFzZVZhbHVlLmdldFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIGlkZW50LCBz bG90KTsKICAgICBKU1ZhbHVlIHJlc3VsdCA9IHNsb3QuZ2V0UHVyZVJlc3VsdCgpOwogCi0gICAg aWYgKCFMTElOVF9BTFdBWVNfQUNDRVNTX1NMT1cgJiYgc2xvdC5pc0NhY2hlYWJsZSgpICYmICFz bG90LmlzVW5zZXQoKSkgeworICAgIGlmIChPcHRpb25zOjp1c2VMTEludElDcygpICYmIHNsb3Qu aXNDYWNoZWFibGUoKSAmJiAhc2xvdC5pc1Vuc2V0KCkpIHsKICAgICAgICAgQVNTRVJUKCFzbG90 LmlzVGFpbnRlZEJ5T3BhcXVlT2JqZWN0KCkpOwogICAgICAgICBBU1NFUlQoYmFzZVZhbHVlLmlz Q2VsbCgpKTsKIApAQCAtNjk5LDcgKzY5OSw3IEBAIExMSU5UX1NMT1dfUEFUSF9ERUNMKHNsb3df cGF0aF9nZXRfYnlfaWQKICAgICBKU1ZhbHVlIHJlc3VsdCA9IGZvdW5kID8gc2xvdC5nZXRWYWx1 ZShnbG9iYWxPYmplY3QsIGlkZW50KSA6IGpzVW5kZWZpbmVkKCk7CiAgICAgTExJTlRfQ0hFQ0tf RVhDRVBUSU9OKCk7CiAKLSAgICBpZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVyAmJiBzbG90 LmlzQ2FjaGVhYmxlKCkgJiYgIXNsb3QuaXNVbnNldCgpKSB7CisgICAgaWYgKE9wdGlvbnM6OnVz ZUxMSW50SUNzKCkgJiYgc2xvdC5pc0NhY2hlYWJsZSgpICYmICFzbG90LmlzVW5zZXQoKSkgewog ICAgICAgICBhdXRvJiBtZXRhZGF0YSA9IGJ5dGVjb2RlLm1ldGFkYXRhKGNvZGVCbG9jayk7CiAg ICAgICAgIHsKICAgICAgICAgICAgIFN0cnVjdHVyZUlEIG9sZFN0cnVjdHVyZUlEID0gbWV0YWRh dGEubV9zdHJ1Y3R1cmVJRDsKQEAgLTgxNCw3ICs4MTQsNyBAQCBzdGF0aWMgSlNWYWx1ZSBwZXJm b3JtTExJbnRHZXRCeUlEKGNvbnN0CiAgICAgSlNWYWx1ZSByZXN1bHQgPSBiYXNlVmFsdWUuZ2V0 KGdsb2JhbE9iamVjdCwgaWRlbnQsIHNsb3QpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhy b3dTY29wZSwgeyB9KTsKIAotICAgIGlmICghTExJTlRfQUxXQVlTX0FDQ0VTU19TTE9XCisgICAg aWYgKE9wdGlvbnM6OnVzZUxMSW50SUNzKCkKICAgICAgICAgJiYgYmFzZVZhbHVlLmlzQ2VsbCgp CiAgICAgICAgICYmIHNsb3QuaXNDYWNoZWFibGUoKQogICAgICAgICAmJiAhc2xvdC5pc1Vuc2V0 KCkpIHsKQEAgLTg2NSw3ICs4NjUsNyBAQCBzdGF0aWMgSlNWYWx1ZSBwZXJmb3JtTExJbnRHZXRC eUlEKGNvbnN0CiAgICAgICAgICAgICBpZiAoISgtLW1ldGFkYXRhLmhpdENvdW50Rm9yTExJbnRD YWNoaW5nKSkKICAgICAgICAgICAgICAgICBzZXR1cEdldEJ5SWRQcm90b3R5cGVDYWNoZShnbG9i YWxPYmplY3QsIHZtLCBjb2RlQmxvY2ssIHBjLCBtZXRhZGF0YSwgYmFzZUNlbGwsIHNsb3QsIGlk ZW50KTsKICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xP VyAmJiBpc0pTQXJyYXkoYmFzZVZhbHVlKSAmJiBpZGVudCA9PSB2bS5wcm9wZXJ0eU5hbWVzLT5s ZW5ndGgpIHsKKyAgICB9IGVsc2UgaWYgKE9wdGlvbnM6OnVzZUxMSW50SUNzKCkgJiYgaXNKU0Fy cmF5KGJhc2VWYWx1ZSkgJiYgaWRlbnQgPT0gdm0ucHJvcGVydHlOYW1lcy0+bGVuZ3RoKSB7CiAg ICAgICAgIHsKICAgICAgICAgICAgIENvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIoY29kZUJsb2Nr LT5tX2xvY2spOwogICAgICAgICAgICAgbWV0YWRhdGEuc2V0QXJyYXlMZW5ndGhNb2RlKCk7CkBA IC05NjIsNyArOTYyLDcgQEAgTExJTlRfU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX3B1dF9ieV9p ZAogICAgICAgICBiYXNlVmFsdWUucHV0SW5saW5lKGdsb2JhbE9iamVjdCwgaWRlbnQsIGdldE9w ZXJhbmQoY2FsbEZyYW1lLCBieXRlY29kZS5tX3ZhbHVlKSwgc2xvdCk7CiAgICAgTExJTlRfQ0hF Q0tfRVhDRVBUSU9OKCk7CiAgICAgCi0gICAgaWYgKCFMTElOVF9BTFdBWVNfQUNDRVNTX1NMT1cK KyAgICBpZiAoT3B0aW9uczo6dXNlTExJbnRJQ3MoKQogICAgICAgICAmJiBiYXNlVmFsdWUuaXND ZWxsKCkKICAgICAgICAgJiYgc2xvdC5pc0NhY2hlYWJsZVB1dCgpCiAgICAgICAgICYmIG9sZFN0 cnVjdHVyZS0+cHJvcGVydHlBY2Nlc3Nlc0FyZUNhY2hlYWJsZSgpKSB7CkBAIC0xMTUzLDcgKzEx NTMsNyBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfZ2V0X3ByaXZhCiAgICAgYmFz ZU9iamVjdC0+Z2V0UHJpdmF0ZUZpZWxkKGdsb2JhbE9iamVjdCwgcHJvcGVydHksIHNsb3QpOwog ICAgIExMSU5UX0NIRUNLX0VYQ0VQVElPTigpOwogCi0gICAgaWYgKCFMTElOVF9BTFdBWVNfQUND RVNTX1NMT1cgJiYgYmFzZVZhbHVlLmlzQ2VsbCgpICYmIHNsb3QuaXNDYWNoZWFibGUoKSAmJiAh c2xvdC5pc1Vuc2V0KCkpIHsKKyAgICBpZiAoT3B0aW9uczo6dXNlTExJbnRJQ3MoKSAmJiBiYXNl VmFsdWUuaXNDZWxsKCkgJiYgc2xvdC5pc0NhY2hlYWJsZSgpICYmICFzbG90LmlzVW5zZXQoKSkg ewogICAgICAgICBhdXRvJiBtZXRhZGF0YSA9IGJ5dGVjb2RlLm1ldGFkYXRhKGNvZGVCbG9jayk7 CiAgICAgICAgIHsKICAgICAgICAgICAgIFN0cnVjdHVyZUlEIG9sZFN0cnVjdHVyZUlEID0gbWV0 YWRhdGEubV9zdHJ1Y3R1cmVJRDsKQEAgLTEyODMsNyArMTI4Myw3IEBAIExMSU5UX1NMT1dfUEFU SF9ERUNMKHNsb3dfcGF0aF9wdXRfcHJpdmEKICAgICB9CiAgICAgTExJTlRfQ0hFQ0tfRVhDRVBU SU9OKCk7CiAKLSAgICBpZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVworICAgIGlmIChPcHRp b25zOjp1c2VMTEludElDcygpCiAgICAgICAgICYmIGJhc2VWYWx1ZS5pc0NlbGwoKQogICAgICAg ICAmJiBzbG90LmlzQ2FjaGVhYmxlUHV0KCkKICAgICAgICAgJiYgc3Vic2NyaXB0LmlzQ2VsbCgp CkBAIC0xMzcyLDcgKzEzNzIsNyBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfc2V0 X3ByaXZhCiAgICAgYmFzZU9iamVjdC0+c2V0UHJpdmF0ZUJyYW5kKGdsb2JhbE9iamVjdCwgYnJh bmQpOwogICAgIExMSU5UX0NIRUNLX0VYQ0VQVElPTigpOwogCi0gICAgaWYgKCFMTElOVF9BTFdB WVNfQUNDRVNTX1NMT1cgJiYgIW9sZFN0cnVjdHVyZS0+aXNEaWN0aW9uYXJ5KCkpIHsKKyAgICBp ZiAoT3B0aW9uczo6dXNlTExJbnRJQ3MoKSAmJiAhb2xkU3RydWN0dXJlLT5pc0RpY3Rpb25hcnko KSkgewogICAgICAgICBHQ1NhZmVDb25jdXJyZW50SlNMb2NrZXIgbG9ja2VyKGNvZGVCbG9jay0+ bV9sb2NrLCB2bSk7CiAgICAgICAgIFN0cnVjdHVyZSogbmV3U3RydWN0dXJlID0gYmFzZU9iamVj dC0+c3RydWN0dXJlKHZtKTsKIApAQCAtMTQxNSw3ICsxNDE1LDcgQEAgTExJTlRfU0xPV19QQVRI X0RFQ0woc2xvd19wYXRoX2NoZWNrX3ByaQogICAgIC8vIFNpbmNlIGEgYnJhbmQgY2FuJ3QgZXZl ciBiZSByZW1vdmVkIGZyb20gYW4gb2JqZWN0LCBpdCdzIHNhZmUgdG8KICAgICAvLyByZWx5IG9u IFN0cnVjdHVyZUlEIGV2ZW4gaWYgaXQncyBhbiB1bmNhY2hlYWJsZSBkaWN0aW9uYXJ5LgogICAg IFN0cnVjdHVyZSogc3RydWN0dXJlID0gYmFzZU9iamVjdC0+c3RydWN0dXJlKHZtKTsKLSAgICBp ZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVykgeworICAgIGlmIChPcHRpb25zOjp1c2VMTElu dElDcygpKSB7CiAgICAgICAgIEdDU2FmZUNvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIoY29kZUJs b2NrLT5tX2xvY2ssIHZtKTsKIAogICAgICAgICBtZXRhZGF0YS5tX3N0cnVjdHVyZUlEID0gc3Ry dWN0dXJlLT5pZCgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9u c0xpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRp b25zTGlzdC5oCShyZXZpc2lvbiAyOTIzMTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9PcHRpb25zTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01MzIsNiArNTMyLDcgQEAgYm9v bCBjYW5Vc2VXZWJBc3NlbWJseUZhc3RNZW1vcnkoKTsKICAgICB2KEJvb2wsIHZlcmJvc2VFeGVj dXRhYmxlUG9vbEFsbG9jYXRpb24sIGZhbHNlLCBOb3JtYWwsIG51bGxwdHIpIFwKICAgICB2KEJv b2wsIHVzZURhdGFJQ0luT3B0aW1pemluZ0pJVCwgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikgXAog ICAgIHYoQm9vbCwgdXNlRGF0YUlDU2hhcmluZywgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikgXAor ICAgIHYoQm9vbCwgdXNlTExJbnRJQ3MsIHRydWUsIE5vcm1hbCwgIlVzZSBwcm9wZXJ0eSBhbmQg Y2FsbCBJQ3MgaW4gTExJbnQgY29kZS4iKSBcCiAgICAgdihCb29sLCB1c2VCYXNlbGluZUpJVENv ZGVTaGFyaW5nLCBpczY0Qml0KCksIE5vcm1hbCwgbnVsbHB0cikgXAogICAgIFwKICAgICAvKiBG ZWF0dXJlIEZsYWdzICovXApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MjMxMikKKysrIFNvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjIt MDQtMDQgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgVHVybiBv ZmYgTExJbnQgSUNzIGluIGNhcHRpdmUgcG9ydGFsIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODc3OAorICAgICAgICA8cmRhcjovLzg0ODMw ODczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRp ZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5oOgorICAgICAgICAoV2Vi S2l0OjpYUENTZXJ2aWNlSW5pdGlhbGl6ZXIpOgorCiAyMDIyLTA0LTA0ICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBTZXJ2aWNlLVdvcmtlci1OYXZpZ2F0aW9u LVByZWxvYWQgaGVhZGVyIG5vdCBiZWluZyBzZW50IHdoZW4gTmF2aWdhdGlvbiBQcmVsb2FkIGlz IGVuYWJsZWQuCkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVz L0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2Uv WFBDU2VydmljZUVudHJ5UG9pbnQuaAkocmV2aXNpb24gMjkyMzEyKQorKysgU291cmNlL1dlYktp dC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VF bnRyeVBvaW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTk3LDYgKzk3LDcgQEAgdm9pZCBYUENTZXJ2 aWNlSW5pdGlhbGl6ZXIoT1NPYmplY3RQdHI8eAogICAgICAgICAgICAgSlNDOjpPcHRpb25zOjpB bGxvd1VuZmluYWxpemVkQWNjZXNzU2NvcGUgc2NvcGU7CiAgICAgICAgICAgICBKU0M6Ok9wdGlv bnM6OnVzZUdlbmVyYXRpb25hbEdDKCkgPSBmYWxzZTsKICAgICAgICAgICAgIEpTQzo6T3B0aW9u czo6dXNlQ29uY3VycmVudEdDKCkgPSBmYWxzZTsKKyAgICAgICAgICAgIEpTQzo6T3B0aW9uczo6 dXNlTExJbnRJQ3MoKSA9IGZhbHNlOwogICAgICAgICB9CiAgICAgICAgIGlmICh4cGNfZGljdGlv bmFyeV9nZXRfYm9vbChpbml0aWFsaXplck1lc3NhZ2UsICJkaXNhYmxlLWppdCIpKQogICAgICAg ICAgICAgSlNDOjpFeGVjdXRhYmxlQWxsb2NhdG9yOjpzZXRKSVRFbmFibGVkKGZhbHNlKTsKSW5k ZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDI5MjM1NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDIyLTA0LTA0ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisg ICAgICAgIFR1cm4gb2ZmIExMSW50IElDcyBpbiBjYXB0aXZlIHBvcnRhbCBtb2RlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg3NzgKKyAgICAgICAg PHJkYXI6Ly84NDgzMDg3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHM6CisKIDIwMjItMDQtMDQg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRo ZSBUZXN0V2ViS2l0QVBJIGJ1aWxkIHdpdGggYW4gaU9TIDE1LjQgaW50ZXJuYWwgU0RLCkluZGV4 OiBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMJKHJldmlzaW9uIDI5MjMxMikKKysrIFRvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTEzMTgsNiAr MTMxOCw3IEBAIEJBU0VfTU9ERVMgPSBbCiAgICAgICAgICAgICAiLS12YWxpZGF0ZUdyYXBoQXRF YWNoUGhhc2U9dHJ1ZSIsCiAgICAgICAgICAgICAiLS11c2VTb3VyY2VQcm92aWRlckNhY2hlPWZh bHNlIiwKICAgICAgICAgICAgICItLXVzZVJhbmRvbWl6aW5nRXhlY3V0YWJsZUlzbGFuZEFsbG9j YXRpb249dHJ1ZSIsCisgICAgICAgICAgICAiLS11c2VMTEludElDcz1mYWxzZSIsCiAgICAgICAg IF0gKwogICAgICAgICBOT19DSklUX09QVElPTlMKICAgICBdLAo= 456653 2022-04-04 17:48:21 -0700 2022-04-04 20:33:13 -0700 patch for landing a-backup.diff text/plain 10314 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjkyMzEyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDIyLTA0LTA0ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFR1cm4gb2ZmIExMSW50IElDcyBpbiBjYXB0aXZlIHBvcnRhbCBtb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg3NzgKKyAgICAgICAgPHJkYXI6 Ly84NDgzMDg3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAg ICAgICogYnl0ZWNvZGUvQ2FsbExpbmtJbmZvLmNwcDoKKyAgICAgICAgKEpTQzo6QmFzZWxpbmVD YWxsTGlua0luZm86OmluaXRpYWxpemUpOgorICAgICAgICAqIGJ5dGVjb2RlL1JlcGF0Y2guY3Bw OgorICAgICAgICAoSlNDOjp1bmxpbmtDYWxsKToKKyAgICAgICAgKiBsbGludC9MTEludENvbW1v bi5oOgorICAgICAgICAqIGxsaW50L0xMSW50U2xvd1BhdGhzLmNwcDoKKyAgICAgICAgKEpTQzo6 TExJbnQ6OkxMSU5UX1NMT1dfUEFUSF9ERUNMKToKKyAgICAgICAgKEpTQzo6TExJbnQ6OnBlcmZv cm1MTEludEdldEJ5SUQpOgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9uc0xpc3QuaDoKKwogMjAy Mi0wNC0wMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBk ZWZhdWx0IGNvbnN0cnVjdG9yIHRvIEFTQ0lJTGl0ZXJhbApJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NhbGxMaW5rSW5mby5jcHAJKHJldmlzaW9uIDI5MjMxMikK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9DYWxsTGlua0luZm8uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMjQsNyArMzI0LDEwIEBAIHZvaWQgQmFzZWxpbmVDYWxsTGlua0luZm86 OmluaXRpYWxpemUoVk0KICAgICAgICAgbV9mcmFtZVNodWZmbGVEYXRhID0gbWFrZVVuaXF1ZTxD YWxsRnJhbWVTaHVmZmxlRGF0YT4oKmZyYW1lU2h1ZmZsZURhdGEpOwogICAgIH0KICNlbmRpZgot ICAgIHNldFNsb3dQYXRoQ2FsbERlc3RpbmF0aW9uKHZtLmdldENUSUxpbmtDYWxsKCkuY29kZSgp KTsKKyAgICBpZiAoTElLRUxZKE9wdGlvbnM6OnVzZUxMSW50SUNzKCkpKQorICAgICAgICBzZXRT bG93UGF0aENhbGxEZXN0aW5hdGlvbih2bS5nZXRDVElMaW5rQ2FsbCgpLmNvZGUoKSk7CisgICAg ZWxzZQorICAgICAgICBzZXRTbG93UGF0aENhbGxEZXN0aW5hdGlvbih2bS5nZXRDVElWaXJ0dWFs Q2FsbChjYWxsTW9kZSgpKS5yZXRhZ2dlZDxKU0VudHJ5UHRyVGFnPigpLmNvZGUoKSk7CiAgICAg Ly8gSWYgSklUIGlzIGRpc2FibGVkLCB3ZSBzaG91bGQgbm90IHN1cHBvcnQgZHluYW1pY2FsbHkg Z2VuZXJhdGVkIGNhbGwgSUMuCiAgICAgaWYgKCFPcHRpb25zOjp1c2VKSVQoKSkKICAgICAgICAg ZGlzYWxsb3dTdHVicygpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1Jl cGF0Y2guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9S ZXBhdGNoLmNwcAkocmV2aXNpb24gMjkyMzEyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb2RlL1JlcGF0Y2guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjMsNyArMTYzLDEwIEBAIHZv aWQgdW5saW5rQ2FsbChWTSYgdm0sIENhbGxMaW5rSW5mbyYgY2EKIHsKICAgICBkYXRhTG9nTG5J ZihPcHRpb25zOjpkdW1wRGlzYXNzZW1ibHkoKSwgIlVubGlua2luZyBDYWxsTGlua0luZm86ICIs IFJhd1BvaW50ZXIoJmNhbGxMaW5rSW5mbykpOwogICAgIAotICAgIHJldmVydENhbGwodm0sIGNh bGxMaW5rSW5mbywgdm0uZ2V0Q1RJTGlua0NhbGwoKS5yZXRhZ2dlZDxKSVRTdHViUm91dGluZVB0 clRhZz4oKSk7CisgICAgaWYgKFVOTElLRUxZKCFPcHRpb25zOjp1c2VMTEludElDcygpICYmIGNh bGxMaW5rSW5mby50eXBlKCkgPT0gQ2FsbExpbmtJbmZvOjpUeXBlOjpCYXNlbGluZSkpCisgICAg ICAgIHJldmVydENhbGwodm0sIGNhbGxMaW5rSW5mbywgdm0uZ2V0Q1RJVmlydHVhbENhbGwoY2Fs bExpbmtJbmZvLmNhbGxNb2RlKCkpKTsKKyAgICBlbHNlCisgICAgICAgIHJldmVydENhbGwodm0s IGNhbGxMaW5rSW5mbywgdm0uZ2V0Q1RJTGlua0NhbGwoKS5yZXRhZ2dlZDxKSVRTdHViUm91dGlu ZVB0clRhZz4oKSk7CiB9CiAKIE1hY3JvQXNzZW1ibGVyQ29kZVB0cjxKU0VudHJ5UHRyVGFnPiBq c1RvV2FzbUlDQ29kZVB0cihWTSYgdm0sIENvZGVTcGVjaWFsaXphdGlvbktpbmQga2luZCwgSlNP YmplY3QqIGNhbGxlZSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludENv bW1vbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludENv bW1vbi5oCShyZXZpc2lvbiAyOTIzMTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQv TExJbnRDb21tb24uaAkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgsMyBAQAogI2Vsc2UKICNk ZWZpbmUgTExJTlRfQUxXQVlTX0FMTE9DQVRFX1NMT1cgMAogI2VuZGlmCi0KLS8vIERpc2FibGUg aW5saW5lIGNhY2hpbmcgb2YgZ2V0X2J5X2lkIGFuZCBwdXRfYnlfaWQuCi0jZGVmaW5lIExMSU5U X0FMV0FZU19BQ0NFU1NfU0xPVyAwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQv TExJbnRTbG93UGF0aHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9s bGludC9MTEludFNsb3dQYXRocy5jcHAJKHJldmlzaW9uIDI5MjMxMikKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9sbGludC9MTEludFNsb3dQYXRocy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0 Nyw3ICs2NDcsNyBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfdHJ5X2dldF9iCiAg ICAgYmFzZVZhbHVlLmdldFByb3BlcnR5U2xvdChnbG9iYWxPYmplY3QsIGlkZW50LCBzbG90KTsK ICAgICBKU1ZhbHVlIHJlc3VsdCA9IHNsb3QuZ2V0UHVyZVJlc3VsdCgpOwogCi0gICAgaWYgKCFM TElOVF9BTFdBWVNfQUNDRVNTX1NMT1cgJiYgc2xvdC5pc0NhY2hlYWJsZSgpICYmICFzbG90Lmlz VW5zZXQoKSkgeworICAgIGlmIChPcHRpb25zOjp1c2VMTEludElDcygpICYmIHNsb3QuaXNDYWNo ZWFibGUoKSAmJiAhc2xvdC5pc1Vuc2V0KCkpIHsKICAgICAgICAgQVNTRVJUKCFzbG90LmlzVGFp bnRlZEJ5T3BhcXVlT2JqZWN0KCkpOwogICAgICAgICBBU1NFUlQoYmFzZVZhbHVlLmlzQ2VsbCgp KTsKIApAQCAtNjk5LDcgKzY5OSw3IEBAIExMSU5UX1NMT1dfUEFUSF9ERUNMKHNsb3dfcGF0aF9n ZXRfYnlfaWQKICAgICBKU1ZhbHVlIHJlc3VsdCA9IGZvdW5kID8gc2xvdC5nZXRWYWx1ZShnbG9i YWxPYmplY3QsIGlkZW50KSA6IGpzVW5kZWZpbmVkKCk7CiAgICAgTExJTlRfQ0hFQ0tfRVhDRVBU SU9OKCk7CiAKLSAgICBpZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVyAmJiBzbG90LmlzQ2Fj aGVhYmxlKCkgJiYgIXNsb3QuaXNVbnNldCgpKSB7CisgICAgaWYgKE9wdGlvbnM6OnVzZUxMSW50 SUNzKCkgJiYgc2xvdC5pc0NhY2hlYWJsZSgpICYmICFzbG90LmlzVW5zZXQoKSkgewogICAgICAg ICBhdXRvJiBtZXRhZGF0YSA9IGJ5dGVjb2RlLm1ldGFkYXRhKGNvZGVCbG9jayk7CiAgICAgICAg IHsKICAgICAgICAgICAgIFN0cnVjdHVyZUlEIG9sZFN0cnVjdHVyZUlEID0gbWV0YWRhdGEubV9z dHJ1Y3R1cmVJRDsKQEAgLTgxNCw3ICs4MTQsNyBAQCBzdGF0aWMgSlNWYWx1ZSBwZXJmb3JtTExJ bnRHZXRCeUlEKGNvbnN0CiAgICAgSlNWYWx1ZSByZXN1bHQgPSBiYXNlVmFsdWUuZ2V0KGdsb2Jh bE9iamVjdCwgaWRlbnQsIHNsb3QpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29w ZSwgeyB9KTsKIAotICAgIGlmICghTExJTlRfQUxXQVlTX0FDQ0VTU19TTE9XCisgICAgaWYgKE9w dGlvbnM6OnVzZUxMSW50SUNzKCkKICAgICAgICAgJiYgYmFzZVZhbHVlLmlzQ2VsbCgpCiAgICAg ICAgICYmIHNsb3QuaXNDYWNoZWFibGUoKQogICAgICAgICAmJiAhc2xvdC5pc1Vuc2V0KCkpIHsK QEAgLTg2NSw3ICs4NjUsNyBAQCBzdGF0aWMgSlNWYWx1ZSBwZXJmb3JtTExJbnRHZXRCeUlEKGNv bnN0CiAgICAgICAgICAgICBpZiAoISgtLW1ldGFkYXRhLmhpdENvdW50Rm9yTExJbnRDYWNoaW5n KSkKICAgICAgICAgICAgICAgICBzZXR1cEdldEJ5SWRQcm90b3R5cGVDYWNoZShnbG9iYWxPYmpl Y3QsIHZtLCBjb2RlQmxvY2ssIHBjLCBtZXRhZGF0YSwgYmFzZUNlbGwsIHNsb3QsIGlkZW50KTsK ICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVyAmJiBp c0pTQXJyYXkoYmFzZVZhbHVlKSAmJiBpZGVudCA9PSB2bS5wcm9wZXJ0eU5hbWVzLT5sZW5ndGgp IHsKKyAgICB9IGVsc2UgaWYgKE9wdGlvbnM6OnVzZUxMSW50SUNzKCkgJiYgaXNKU0FycmF5KGJh c2VWYWx1ZSkgJiYgaWRlbnQgPT0gdm0ucHJvcGVydHlOYW1lcy0+bGVuZ3RoKSB7CiAgICAgICAg IHsKICAgICAgICAgICAgIENvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIoY29kZUJsb2NrLT5tX2xv Y2spOwogICAgICAgICAgICAgbWV0YWRhdGEuc2V0QXJyYXlMZW5ndGhNb2RlKCk7CkBAIC05NjIs NyArOTYyLDcgQEAgTExJTlRfU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX3B1dF9ieV9pZAogICAg ICAgICBiYXNlVmFsdWUucHV0SW5saW5lKGdsb2JhbE9iamVjdCwgaWRlbnQsIGdldE9wZXJhbmQo Y2FsbEZyYW1lLCBieXRlY29kZS5tX3ZhbHVlKSwgc2xvdCk7CiAgICAgTExJTlRfQ0hFQ0tfRVhD RVBUSU9OKCk7CiAgICAgCi0gICAgaWYgKCFMTElOVF9BTFdBWVNfQUNDRVNTX1NMT1cKKyAgICBp ZiAoT3B0aW9uczo6dXNlTExJbnRJQ3MoKQogICAgICAgICAmJiBiYXNlVmFsdWUuaXNDZWxsKCkK ICAgICAgICAgJiYgc2xvdC5pc0NhY2hlYWJsZVB1dCgpCiAgICAgICAgICYmIG9sZFN0cnVjdHVy ZS0+cHJvcGVydHlBY2Nlc3Nlc0FyZUNhY2hlYWJsZSgpKSB7CkBAIC0xMTUzLDcgKzExNTMsNyBA QCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfZ2V0X3ByaXZhCiAgICAgYmFzZU9iamVj dC0+Z2V0UHJpdmF0ZUZpZWxkKGdsb2JhbE9iamVjdCwgcHJvcGVydHksIHNsb3QpOwogICAgIExM SU5UX0NIRUNLX0VYQ0VQVElPTigpOwogCi0gICAgaWYgKCFMTElOVF9BTFdBWVNfQUNDRVNTX1NM T1cgJiYgYmFzZVZhbHVlLmlzQ2VsbCgpICYmIHNsb3QuaXNDYWNoZWFibGUoKSAmJiAhc2xvdC5p c1Vuc2V0KCkpIHsKKyAgICBpZiAoT3B0aW9uczo6dXNlTExJbnRJQ3MoKSAmJiBiYXNlVmFsdWUu aXNDZWxsKCkgJiYgc2xvdC5pc0NhY2hlYWJsZSgpICYmICFzbG90LmlzVW5zZXQoKSkgewogICAg ICAgICBhdXRvJiBtZXRhZGF0YSA9IGJ5dGVjb2RlLm1ldGFkYXRhKGNvZGVCbG9jayk7CiAgICAg ICAgIHsKICAgICAgICAgICAgIFN0cnVjdHVyZUlEIG9sZFN0cnVjdHVyZUlEID0gbWV0YWRhdGEu bV9zdHJ1Y3R1cmVJRDsKQEAgLTEyODMsNyArMTI4Myw3IEBAIExMSU5UX1NMT1dfUEFUSF9ERUNM KHNsb3dfcGF0aF9wdXRfcHJpdmEKICAgICB9CiAgICAgTExJTlRfQ0hFQ0tfRVhDRVBUSU9OKCk7 CiAKLSAgICBpZiAoIUxMSU5UX0FMV0FZU19BQ0NFU1NfU0xPVworICAgIGlmIChPcHRpb25zOjp1 c2VMTEludElDcygpCiAgICAgICAgICYmIGJhc2VWYWx1ZS5pc0NlbGwoKQogICAgICAgICAmJiBz bG90LmlzQ2FjaGVhYmxlUHV0KCkKICAgICAgICAgJiYgc3Vic2NyaXB0LmlzQ2VsbCgpCkBAIC0x MzcyLDcgKzEzNzIsNyBAQCBMTElOVF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfc2V0X3ByaXZh CiAgICAgYmFzZU9iamVjdC0+c2V0UHJpdmF0ZUJyYW5kKGdsb2JhbE9iamVjdCwgYnJhbmQpOwog ICAgIExMSU5UX0NIRUNLX0VYQ0VQVElPTigpOwogCi0gICAgaWYgKCFMTElOVF9BTFdBWVNfQUND RVNTX1NMT1cgJiYgIW9sZFN0cnVjdHVyZS0+aXNEaWN0aW9uYXJ5KCkpIHsKKyAgICBpZiAoT3B0 aW9uczo6dXNlTExJbnRJQ3MoKSAmJiAhb2xkU3RydWN0dXJlLT5pc0RpY3Rpb25hcnkoKSkgewog ICAgICAgICBHQ1NhZmVDb25jdXJyZW50SlNMb2NrZXIgbG9ja2VyKGNvZGVCbG9jay0+bV9sb2Nr LCB2bSk7CiAgICAgICAgIFN0cnVjdHVyZSogbmV3U3RydWN0dXJlID0gYmFzZU9iamVjdC0+c3Ry dWN0dXJlKHZtKTsKIApAQCAtMTQxNSw3ICsxNDE1LDcgQEAgTExJTlRfU0xPV19QQVRIX0RFQ0wo c2xvd19wYXRoX2NoZWNrX3ByaQogICAgIC8vIFNpbmNlIGEgYnJhbmQgY2FuJ3QgZXZlciBiZSBy ZW1vdmVkIGZyb20gYW4gb2JqZWN0LCBpdCdzIHNhZmUgdG8KICAgICAvLyByZWx5IG9uIFN0cnVj dHVyZUlEIGV2ZW4gaWYgaXQncyBhbiB1bmNhY2hlYWJsZSBkaWN0aW9uYXJ5LgogICAgIFN0cnVj dHVyZSogc3RydWN0dXJlID0gYmFzZU9iamVjdC0+c3RydWN0dXJlKHZtKTsKLSAgICBpZiAoIUxM SU5UX0FMV0FZU19BQ0NFU1NfU0xPVykgeworICAgIGlmIChPcHRpb25zOjp1c2VMTEludElDcygp KSB7CiAgICAgICAgIEdDU2FmZUNvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIoY29kZUJsb2NrLT5t X2xvY2ssIHZtKTsKIAogICAgICAgICBtZXRhZGF0YS5tX3N0cnVjdHVyZUlEID0gc3RydWN0dXJl LT5pZCgpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9uc0xpc3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zTGlz dC5oCShyZXZpc2lvbiAyOTIzMTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9P cHRpb25zTGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC01MzIsNiArNTMyLDcgQEAgYm9vbCBjYW5V c2VXZWJBc3NlbWJseUZhc3RNZW1vcnkoKTsKICAgICB2KEJvb2wsIHZlcmJvc2VFeGVjdXRhYmxl UG9vbEFsbG9jYXRpb24sIGZhbHNlLCBOb3JtYWwsIG51bGxwdHIpIFwKICAgICB2KEJvb2wsIHVz ZURhdGFJQ0luT3B0aW1pemluZ0pJVCwgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikgXAogICAgIHYo Qm9vbCwgdXNlRGF0YUlDU2hhcmluZywgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikgXAorICAgIHYo Qm9vbCwgdXNlTExJbnRJQ3MsIHRydWUsIE5vcm1hbCwgIlVzZSBwcm9wZXJ0eSBhbmQgY2FsbCBJ Q3MgaW4gTExJbnQgY29kZS4iKSBcCiAgICAgdihCb29sLCB1c2VCYXNlbGluZUpJVENvZGVTaGFy aW5nLCBpczY0Qml0KCksIE5vcm1hbCwgbnVsbHB0cikgXAogICAgIFwKICAgICAvKiBGZWF0dXJl IEZsYWdzICovXApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MjMxMikKKysrIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjItMDQtMDQg IFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAgICAgVHVybiBvZmYgTExJ bnQgSUNzIGluIGNhcHRpdmUgcG9ydGFsIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODc3OAorICAgICAgICA8cmRhcjovLzg0ODMwODczPgor CisgICAgICAgIFJldmlld2VkIGJ5IFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgKiBTaGFyZWQv RW50cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VFbnRyeVBvaW50 Lmg6CisgICAgICAgIChXZWJLaXQ6OlhQQ1NlcnZpY2VJbml0aWFsaXplcik6CisKIDIwMjItMDQt MDQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2Ut V29ya2VyLU5hdmlnYXRpb24tUHJlbG9hZCBoZWFkZXIgbm90IGJlaW5nIHNlbnQgd2hlbiBOYXZp Z2F0aW9uIFByZWxvYWQgaXMgZW5hYmxlZC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0Vu dHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMv Q29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlRW50cnlQb2ludC5oCShyZXZpc2lvbiAyOTIzMTIp CisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1Nl cnZpY2UvWFBDU2VydmljZUVudHJ5UG9pbnQuaAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcs NyBAQCB2b2lkIFhQQ1NlcnZpY2VJbml0aWFsaXplcihPU09iamVjdFB0cjx4CiAgICAgICAgICAg ICBKU0M6Ok9wdGlvbnM6OkFsbG93VW5maW5hbGl6ZWRBY2Nlc3NTY29wZSBzY29wZTsKICAgICAg ICAgICAgIEpTQzo6T3B0aW9uczo6dXNlR2VuZXJhdGlvbmFsR0MoKSA9IGZhbHNlOwogICAgICAg ICAgICAgSlNDOjpPcHRpb25zOjp1c2VDb25jdXJyZW50R0MoKSA9IGZhbHNlOworICAgICAgICAg ICAgSlNDOjpPcHRpb25zOjp1c2VMTEludElDcygpID0gZmFsc2U7CiAgICAgICAgIH0KICAgICAg ICAgaWYgKHhwY19kaWN0aW9uYXJ5X2dldF9ib29sKGluaXRpYWxpemVyTWVzc2FnZSwgImRpc2Fi bGUtaml0IikpCiAgICAgICAgICAgICBKU0M6OkV4ZWN1dGFibGVBbGxvY2F0b3I6OnNldEpJVEVu YWJsZWQoZmFsc2UpOwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0NoYW5nZUxvZwkocmV2aXNpb24gMjkyMzU4KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjItMDQtMDQgIFNhYW0gQmFyYXRpICA8c2JhcmF0 aUBhcHBsZS5jb20+CisKKyAgICAgICAgVHVybiBvZmYgTExJbnQgSUNzIGluIGNhcHRpdmUgcG9y dGFsIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzODc3OAorICAgICAgICA8cmRhcjovLzg0ODMwODczPgorCisgICAgICAgIFJldmlld2VkIGJ5 IFl1c3VrZSBTdXp1a2kuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3Rz OgorCiAyMDIyLTA0LTA0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIEZpeCB0aGUgVGVzdFdlYktpdEFQSSBidWlsZCB3aXRoIGFuIGlPUyAxNS40IGlu dGVybmFsIFNESwpJbmRleDogVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCShyZXZpc2lvbiAy OTIzMTIpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCSh3b3JraW5nIGNv cHkpCkBAIC0xMzE4LDYgKzEzMTgsNyBAQCBCQVNFX01PREVTID0gWwogICAgICAgICAgICAgIi0t dmFsaWRhdGVHcmFwaEF0RWFjaFBoYXNlPXRydWUiLAogICAgICAgICAgICAgIi0tdXNlU291cmNl UHJvdmlkZXJDYWNoZT1mYWxzZSIsCiAgICAgICAgICAgICAiLS11c2VSYW5kb21pemluZ0V4ZWN1 dGFibGVJc2xhbmRBbGxvY2F0aW9uPXRydWUiLAorICAgICAgICAgICAgIi0tdXNlTExJbnRJQ3M9 ZmFsc2UiLAogICAgICAgICBdICsKICAgICAgICAgTk9fQ0pJVF9PUFRJT05TCiAgICAgXSwK