215120 2020-08-04 02:05:55 -0700 RegistrationDatabase::openSQLiteDatabase can spin 2020-08-05 04:03:13 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez ggaren webkit-bug-importer oldest_to_newest 1677586 0 youennf 2020-08-04 02:05:55 -0700 RegistrationDatabase::openSQLiteDatabase can spin 1677588 1 youennf 2020-08-04 02:08:19 -0700 <rdar://problem/64850347> 1677589 2 youennf 2020-08-04 02:08:58 -0700 Probably a regression from https://bugs.webkit.org/show_bug.cgi?id=201002 1677595 3 405910 youennf 2020-08-04 02:40:31 -0700 Created attachment 405910 Patch 1677605 4 405914 youennf 2020-08-04 04:51:41 -0700 Created attachment 405914 Patch 1677630 5 youennf 2020-08-04 08:52:37 -0700 win failure unrelated 1677631 6 405914 youennf 2020-08-04 08:55:23 -0700 Comment on attachment 405914 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405914&action=review > Source/WebCore/workers/service/server/RegistrationDatabase.cpp:332 > + postTaskToWorkQueue([this, pushCounter = ++m_pushCounter, completionHandler = WTFMove(completionHandler)]() mutable { I guess I could push the counter increment to postTaskToWorkQueue 1677636 7 405914 ggaren 2020-08-04 08:59:30 -0700 Comment on attachment 405914 Patch r=me 1677893 8 405914 achristensen 2020-08-04 23:00:03 -0700 Comment on attachment 405914 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405914&action=review >> Source/WebCore/workers/service/server/RegistrationDatabase.cpp:332 >> + postTaskToWorkQueue([this, pushCounter = ++m_pushCounter, completionHandler = WTFMove(completionHandler)]() mutable { > > I guess I could push the counter increment to postTaskToWorkQueue Yeah, as it stands now this is an unused capture. 1677906 9 405991 youennf 2020-08-05 01:46:20 -0700 Created attachment 405991 Patch for landing 1677911 10 ews-feeder 2020-08-05 04:03:13 -0700 Committed r265283: <https://trac.webkit.org/changeset/265283> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405991. 405910 2020-08-04 02:40:31 -0700 2020-08-04 04:51:37 -0700 Patch bug-215120-20200804114029.patch text/plain 12450 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzZiOGJkN2Q3MGJiYWU0 NTkxOGI0ZWU4NGZlY2QyYjI5ZTRhZWFhMS4uYzNiZGY1NjQxYmVhMzZjMzVhMjA1MjA4YzNlNjgw OThiMzAzM2NkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA4LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWdpc3RyYXRpb25EYXRh YmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlIGNhbiBzcGluCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzY0ODUwMzQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluIGNhc2Ugd2UgZmFpbCBvcGVuaW5nIHRoZSBkYXRhYmFzZSB3aGVuIGltcG9ydGluZywg d2UgZGVsZXRlIHRoZSBkYXRhYmFzZSwgdGhlIGZpbGUgYW5kIHJldHJ5LgorICAgICAgICBXZSBk byBub3QgbmVlZCB0byByZXRyeSBpbiB0aGF0IGNhc2Ugc2luY2UgdGhlcmUgaXMgbm90aGluZyB0 byBpbXBvcnQuIFVwZGF0ZSB0aGUgY29kZSB0byBwcm9jZWVkIHdpdGggc2VuZGluZyBhbiBpbXBv cnQgZmFpbHVyZSB0byBTV1NlcnZlci4KKworICAgICAgICBJbiBjYXNlIG9mIHB1c2hpbmcgY2hh bmdlcyB0byB0aGUgZGF0YWJhc2UsIGl0IG1pZ2h0IGJlIHVzZWZ1bCB0byByZXRyeSBidXQgaXQg aXMgYmVzdCB0byBkbyB0aGlzIGFzeW5jaHJvbm91c2x5LgorICAgICAgICBGb3IgaW5zdGFuY2Us IHRoZXJlIG1pZ2h0IGJlIGEgc2NyaXB0IGRlbGV0aW5nIHRoZSBmaWxlcy9mb2xkZXJzIHdoZXJl IGlzIHN0b3JlZCB0aGUgZGF0YWJhc2UuCisgICAgICAgIEluIHRoYXQgY2FzZSwgd2UgY2hlY2sg dGhlIHJlc3VsdCBvZiBwdXNoaW5nIGNoYW5nZXMuCisgICAgICAgIElmIHRoZXkgc3VjY2VlZCwg d2UgY2FsbCB0aGUgY29tcGxldGlvbiBoYW5kbGVyIGFuZCBzdG9wLgorICAgICAgICBPdGhlcndp c2UsIHdlIHdpbGwgcmV0cnkgcHVzaGluZyB0aGUgY2hhbmdlcyBpZiBjaGFuZ2VzIHdlcmUgbm90 IHB1c2hlZCBhZ2FpbiBpbiB0aGUgbWVhbnRpbWUuCisgICAgICAgIFdlIGludHJvZHVjZSBhIHB1 c2ggY291bnRlciBmb3IgdGhhdCBwdXJwb3NlLgorCisgICAgICAgICogd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWdp c3RyYXRpb25EYXRhYmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjppbXBvcnRSZWNvcmRzSWZOZWNlc3NhcnkpOgorICAgICAg ICAoV2ViQ29yZTo6UmVnaXN0cmF0aW9uRGF0YWJhc2U6OnB1c2hDaGFuZ2VzKToKKyAgICAgICAg KFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpzY2hlZHVsZVB1c2hDaGFuZ2VzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2VzKToKKyAg ICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmg6Cisg ICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTV1NlcnZlcjo6cmVnaXN0cmF0aW9uU3RvcmVEYXRhYmFzZUZhaWxlZFRvT3Blbik6 CisKIDIwMjAtMDgtMDMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg ICAgIE1lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyIHNob3VsZCBlbnN1cmUgaXRzIHdyaXRlciBp bnB1dCBpcyByZWFkeSBmb3IgbW9yZSBkYXRhIGJlZm9yZSBhcHBlbmRpbmcgbmV3IHNhbXBsZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvUmVnaXN0 cmF0aW9uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHAKaW5kZXggZWZlNzJhYzJiNzIzMDg3NGQ5ZmI4YzUw MTk2NWNiYWNmMjdlMDcwZS4uNTZlYTNmMGJiYTM3NzQ3OTI4NTU4MTM3Mjc0Njg5Yzg4NjIwODM4 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdp c3RyYXRpb25EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHAKQEAgLTEzOCw3ICsxMzgsNyBAQCB2b2lk IFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpwb3N0VGFza1RvV29ya1F1ZXVlKEZ1bmN0aW9uPHZvaWQo KT4mJiB0YXNrKQogICAgIH0pOwogfQogCi12b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpvcGVu U1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmlsZW5hbWUpCitib29sIFJlZ2lzdHJh dGlvbkRhdGFiYXNlOjpvcGVuU1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmlsZW5h bWUpCiB7CiAgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CiAgICAgQVNTRVJUKCFtX2RhdGFi YXNlKTsKQEAgLTE1NCwxMCArMTU0LDcgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6b3Bl blNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgZnVsbEZpbGVuYW1lKQogICAgIGlmICghbV9k YXRhYmFzZS0+b3BlbihmdWxsRmlsZW5hbWUpKSB7CiAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S KFNlcnZpY2VXb3JrZXIsICJGYWlsZWQgdG8gb3BlbiBTZXJ2aWNlIFdvcmtlciByZWdpc3RyYXRp b24gZGF0YWJhc2UiKTsKICAgICAgICAgbV9kYXRhYmFzZSA9IG51bGxwdHI7Ci0gICAgICAgIGNh bGxPbk1haW5UaHJlYWQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gewot ICAgICAgICAgICAgZGF0YWJhc2VGYWlsZWRUb09wZW4oKTsKLSAgICAgICAgfSk7Ci0gICAgICAg IHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8vIERpc2FibGUg dGhyZWFkaW5nIGNoZWNrcy4gV2UgYWx3YXlzIGFjY2VzcyB0aGUgZGF0YWJhc2UgZnJvbSBvdXIg c2VyaWFsIFdvcmtRdWV1ZS4gU3VjaCBhY2Nlc3NlcwpAQCAtMTY2LDM2ICsxNjMsNDIgQEAgdm9p ZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYg ZnVsbEZpbGVuYW1lKQogICAgIG1fZGF0YWJhc2UtPmRpc2FibGVUaHJlYWRpbmdDaGVja3MoKTsK ICAgICAKICAgICBhdXRvIGRvUmVjb3ZlcnlBdHRlbXB0ID0gWyZdIHsKLSAgICAgICAgLy8gRGVs ZXRlIHRoZSBkYXRhYmFzZSBhbmQgcmUtY3JlYXRlIGl0LgorICAgICAgICAvLyBEZWxldGUgdGhl IGRhdGFiYXNlIGFuZCBmaWxlcy4gV2Ugd2lsbCB0cnkgcmVjcmVhdGluZyBpdCB3aGVuIGZsdXNo aW5nIGNoYW5nZXMuCiAgICAgICAgIG1fZGF0YWJhc2UgPSBudWxscHRyOwogICAgICAgICBTUUxp dGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFzZUZpbGUoZnVsbEZpbGVuYW1lKTsKLSAgICAgICAg b3BlblNRTGl0ZURhdGFiYXNlKGZ1bGxGaWxlbmFtZSk7CiAgICAgfTsKICAgICAKICAgICBTdHJp bmcgZXJyb3JNZXNzYWdlID0gZW5zdXJlVmFsaWRSZWNvcmRzVGFibGUoKTsKICAgICBpZiAoIWVy cm9yTWVzc2FnZS5pc051bGwoKSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNl V29ya2VyLCAiZW5zdXJlVmFsaWRSZWNvcmRzVGFibGUgZmFpbGVkLCByZWFzb246ICUiIFBVQkxJ Q19MT0dfU1RSSU5HLCBlcnJvck1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGRvUmVj b3ZlcnlBdHRlbXB0KCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KICAgICAKICAgICBlcnJvck1lc3NhZ2UgPSBpbXBvcnRSZWNvcmRzKCk7CiAgICAgaWYg KCFlcnJvck1lc3NhZ2UuaXNOdWxsKCkpIHsKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoU2Vy dmljZVdvcmtlciwgImltcG9ydFJlY29yZHMgZmFpbGVkLCByZWFzb246ICUiIFBVQkxJQ19MT0df U1RSSU5HLCBlcnJvck1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGRvUmVjb3ZlcnlB dHRlbXB0KCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K KyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6aW1wb3J0 UmVjb3Jkc0lmTmVjZXNzYXJ5KCkKIHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKIAot ICAgIGlmIChGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKG1fZGF0YWJhc2VGaWxlUGF0aCkpCi0gICAg ICAgIG9wZW5TUUxpdGVEYXRhYmFzZShtX2RhdGFiYXNlRmlsZVBhdGgpOworICAgIGlmIChGaWxl U3lzdGVtOjpmaWxlRXhpc3RzKG1fZGF0YWJhc2VGaWxlUGF0aCkpIHsKKyAgICAgICAgaWYgKCFv cGVuU1FMaXRlRGF0YWJhc2UobV9kYXRhYmFzZUZpbGVQYXRoKSkgeworICAgICAgICAgICAgY2Fs bE9uTWFpblRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7Cisg ICAgICAgICAgICAgICAgZGF0YWJhc2VGYWlsZWRUb09wZW4oKTsKKyAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQogCi0gICAgY2FsbE9uTWFpblRo cmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7Ci0gICAgICAgIHByb3RlY3Rl ZFRoaXMtPmRhdGFiYXNlT3BlbmVkQW5kUmVjb3Jkc0ltcG9ydGVkKCk7CisgICAgY2FsbE9uTWFp blRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7CisgICAgICAg IGRhdGFiYXNlT3BlbmVkQW5kUmVjb3Jkc0ltcG9ydGVkKCk7CiAgICAgfSk7CiB9CiAKQEAgLTI5 MywyMCArMjk2LDMyIEBAIHZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OnB1c2hDaGFuZ2VzKGNv bnN0IEhhc2hNYXA8U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktlCiAgICAgICAgIGVsc2UKICAg ICAgICAgICAgIHJlbW92ZWRSZWdpc3RyYXRpb25zLmFwcGVuZChrZXlWYWx1ZS5rZXkuaXNvbGF0 ZWRDb3B5KCkpOwogICAgIH0KKyAgICBzY2hlZHVsZVB1c2hDaGFuZ2VzKFdURk1vdmUodXBkYXRl ZFJlZ2lzdHJhdGlvbnMpLCBXVEZNb3ZlKHJlbW92ZWRSZWdpc3RyYXRpb25zKSwgV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOworfQogCi0gICAgcG9zdFRhc2tUb1dvcmtRdWV1ZShbdGhpcywg dXBkYXRlZFJlZ2lzdHJhdGlvbnMgPSBXVEZNb3ZlKHVwZGF0ZWRSZWdpc3RyYXRpb25zKSwgcmVt b3ZlZFJlZ2lzdHJhdGlvbnMgPSBXVEZNb3ZlKHJlbW92ZWRSZWdpc3RyYXRpb25zKSwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLSAg ICAgICAgZG9QdXNoQ2hhbmdlcyh1cGRhdGVkUmVnaXN0cmF0aW9ucywgcmVtb3ZlZFJlZ2lzdHJh dGlvbnMpOwotCi0gICAgICAgIGlmICghY29tcGxldGlvbkhhbmRsZXIpCi0gICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSk7Cit2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpzY2hlZHVsZVB1c2hDaGFuZ2VzKFZl Y3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JiYgdXBkYXRlZFJlZ2lzdHJhdGlvbnMsIFZl Y3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYmIHJlbW92ZWRSZWdpc3RyYXRpb25z LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAg cG9zdFRhc2tUb1dvcmtRdWV1ZShbdGhpcywgcHVzaENvdW50ZXIgPSArK21fcHVzaENvdW50ZXIs IHVwZGF0ZWRSZWdpc3RyYXRpb25zID0gV1RGTW92ZSh1cGRhdGVkUmVnaXN0cmF0aW9ucyksIHJl bW92ZWRSZWdpc3RyYXRpb25zID0gV1RGTW92ZShyZW1vdmVkUmVnaXN0cmF0aW9ucyksIGNvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7Cisg ICAgICAgIGJvb2wgc3VjY2VzcyA9IGRvUHVzaENoYW5nZXModXBkYXRlZFJlZ2lzdHJhdGlvbnMs IHJlbW92ZWRSZWdpc3RyYXRpb25zKTsKKyAgICAgICAgaWYgKHN1Y2Nlc3MpIHsKKyAgICAgICAg ICAgIHVwZGF0ZWRSZWdpc3RyYXRpb25zLmNsZWFyKCk7CisgICAgICAgICAgICByZW1vdmVkUmVn aXN0cmF0aW9ucy5jbGVhcigpOworICAgICAgICB9CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQo W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgc3VjY2VzcywgcHVzaENvdW50 ZXIsIHVwZGF0ZWRSZWdpc3RyYXRpb25zID0gV1RGTW92ZSh1cGRhdGVkUmVnaXN0cmF0aW9ucyku aXNvbGF0ZWRDb3B5KCksIHJlbW92ZWRSZWdpc3RyYXRpb25zID0gV1RGTW92ZShyZW1vdmVkUmVn aXN0cmF0aW9ucykuaXNvbGF0ZWRDb3B5KCksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBpZiAoIXN1Y2Nlc3Mg JiYgcHVzaENvdW50ZXIgPT0gbV9wdXNoQ291bnRlcikgeworICAgICAgICAgICAgICAgIC8vIFdl IHJldHJ5IHdyaXRpbmcgaWYgbm8gb3RoZXIgY2hhbmdlIHdhcyBwdXNoZWQuCisgICAgICAgICAg ICAgICAgc2NoZWR1bGVQdXNoQ2hhbmdlcyhXVEZNb3ZlKHVwZGF0ZWRSZWdpc3RyYXRpb25zKSwg V1RGTW92ZShyZW1vdmVkUmVnaXN0cmF0aW9ucyksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBp ZiAoY29tcGxldGlvbkhhbmRsZXIpCisgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo KTsKKyAgICAgICAgfSk7CiAgICAgfSk7CiB9CiAKIHZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6 OmNsb3NlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsK LSAgICBwb3N0VGFza1RvV29ya1F1ZXVlKFt0aGlzLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgeworICAgIHBvc3RUYXNrVG9Xb3JrUXVl dWUoW3RoaXMsIHB1c2hDb3VudGVyID0gKyttX3B1c2hDb3VudGVyLCBjb21wbGV0aW9uSGFuZGxl ciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICBtX2Rh dGFiYXNlID0gbnVsbHB0cjsKICAgICAgICAgY2FsbE9uTWFpblRocmVhZChXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKSk7CiAgICAgfSk7CkBAIC0zMTQsNyArMzI5LDcgQEAgdm9pZCBSZWdpc3Ry YXRpb25EYXRhYmFzZTo6Y2xvc2UoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRp b25IYW5kbGVyKQogCiB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpjbGVhckFsbChDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgcG9zdFRhc2tU b1dvcmtRdWV1ZShbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICBwb3N0VGFza1RvV29ya1F1ZXVlKFt0aGlzLCBwdXNo Q291bnRlciA9ICsrbV9wdXNoQ291bnRlciwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgbV9kYXRhYmFzZSA9IG51bGxw dHI7CiAKICAgICAgICAgU1FMaXRlRmlsZVN5c3RlbTo6ZGVsZXRlRGF0YWJhc2VGaWxlKG1fZGF0 YWJhc2VGaWxlUGF0aCk7CkBAIC0zMjQsMTIgKzMzOSwxMiBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRh dGFiYXNlOjpjbGVhckFsbChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhh bmRsZQogICAgIH0pOwogfQogCi12b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFu Z2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JiB1cGRhdGVkUmVnaXN0 cmF0aW9ucywgY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+JiByZW1v dmVkUmVnaXN0cmF0aW9ucykKK2Jvb2wgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OmRvUHVzaENoYW5n ZXMoY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YT4mIHVwZGF0ZWRSZWdpc3Ry YXRpb25zLCBjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktleT4mIHJlbW92 ZWRSZWdpc3RyYXRpb25zKQogewogICAgIGlmICghbV9kYXRhYmFzZSkgewogICAgICAgICBvcGVu U1FMaXRlRGF0YWJhc2UobV9kYXRhYmFzZUZpbGVQYXRoKTsKICAgICAgICAgaWYgKCFtX2RhdGFi YXNlKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KIAogICAgIFNRTGl0ZVRyYW5zYWN0aW9uIHRyYW5zYWN0aW9uKCptX2RhdGFiYXNlKTsKQEAg LTMzOCw3ICszNTMsNyBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2Vz KGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JgogICAgIFNRTGl0ZVN0YXRl bWVudCBzcWwoKm1fZGF0YWJhc2UsICJJTlNFUlQgSU5UTyBSZWNvcmRzIFZBTFVFUyAoPywgPywg PywgPywgPywgPywgPywgPywgPywgPywgPywgPywgPykiX3MpOwogICAgIGlmIChzcWwucHJlcGFy ZSgpICE9IFNRTElURV9PSykgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNlV29y a2VyLCAiRmFpbGVkIHRvIHByZXBhcmUgc3RhdGVtZW50IHRvIHN0b3JlIHJlZ2lzdHJhdGlvbiBk YXRhIGludG8gcmVjb3JkcyB0YWJsZSAoJWkpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3Io KSwgbV9kYXRhYmFzZS0+bGFzdEVycm9yTXNnKCkpOwotICAgICAgICByZXR1cm47CisgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBmb3IgKGF1dG8mIHJlZ2lzdHJhdGlvbiA6IHJl bW92ZWRSZWdpc3RyYXRpb25zKSB7CkBAIC0zNDcsNyArMzYyLDcgQEAgdm9pZCBSZWdpc3RyYXRp b25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlckNvbnRl eHREYXRhPiYKICAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCgxLCByZWdpc3RyYXRpb24udG9E YXRhYmFzZUtleSgpKSAhPSBTUUxJVEVfT0sKICAgICAgICAgICAgIHx8IHNxbC5zdGVwKCkgIT0g U1FMSVRFX0RPTkUpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VXb3Jr ZXIsICJGYWlsZWQgdG8gcmVtb3ZlIHJlZ2lzdHJhdGlvbiBkYXRhIGZyb20gcmVjb3JkcyB0YWJs ZSAoJWkpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+bGFzdEVy cm9yTXNnKCkpOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNzYsMTMgKzM5MSwxNCBAQCB2b2lkIFJlZ2lzdHJh dGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29u dGV4dERhdGE+JgogICAgICAgICAgICAgfHwgc3FsLmJpbmRCbG9iKDEzLCBjZXJ0aWZpY2F0ZUlu Zm9FbmNvZGVyLmJ1ZmZlcigpLCBjZXJ0aWZpY2F0ZUluZm9FbmNvZGVyLmJ1ZmZlclNpemUoKSkg IT0gU1FMSVRFX09LCiAgICAgICAgICAgICB8fCBzcWwuc3RlcCgpICE9IFNRTElURV9ET05FKSB7 CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNlV29ya2VyLCAiRmFpbGVkIHRv IHN0b3JlIHJlZ2lzdHJhdGlvbiBkYXRhIGludG8gcmVjb3JkcyB0YWJsZSAoJWkpIC0gJXMiLCBt X2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+bGFzdEVycm9yTXNnKCkpOwotICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAg ICAgfQogCiAgICAgdHJhbnNhY3Rpb24uY29tbWl0KCk7CiAKICAgICBMT0coU2VydmljZVdvcmtl ciwgIlVwZGF0ZWQgU2VydmljZVdvcmtlciByZWdpc3RyYXRpb24gZGF0YWJhc2UgKCV6dSBhZGRl ZC91cGRhdGVkIHJlZ2lzdHJhdGlvbnMgYW5kICV6dSByZW1vdmVkIHJlZ2lzdHJhdGlvbnMiLCB1 cGRhdGVkUmVnaXN0cmF0aW9ucy5zaXplKCksIHJlbW92ZWRSZWdpc3RyYXRpb25zLnNpemUoKSk7 CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIFN0cmluZyBSZWdpc3RyYXRpb25EYXRhYmFzZTo6aW1w b3J0UmVjb3JkcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uv c2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3Nl cnZpY2Uvc2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmgKaW5kZXggYjFkNmNjM2NkODFkOGRh YWI2MDQ5MmNhODJhMzAxNzJhMjdlNTNjNC4uN2YyYmY5ZTI1YzQ0NDU5ZDVhOGViOTkzNDM0Y2Q1 M2RiMGRjOTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3Nl cnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv c2VydmljZS9zZXJ2ZXIvUmVnaXN0cmF0aW9uRGF0YWJhc2UuaApAQCAtNjEsMTQgKzYxLDE1IEBA IHByaXZhdGU6CiAgICAgCiAgICAgU3RyaW5nIGRhdGFiYXNlRGlyZWN0b3J5SXNvbGF0ZWRDb3B5 KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZURpcmVjdG9yeS5pc29sYXRlZENvcHkoKTsgfQog CisgICAgdm9pZCBzY2hlZHVsZVB1c2hDaGFuZ2VzKFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4 dERhdGE+JiYsIFZlY3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYmLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgcG9zdFRhc2tUb1dvcmtRdWV1ZShGdW5j dGlvbjx2b2lkKCk+JiYpOwogCiAgICAgLy8gTWV0aG9kcyB0byBiZSBydW4gb24gdGhlIHdvcmsg cXVldWUuCi0gICAgdm9pZCBvcGVuU1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmls ZW5hbWUpOworICAgIGJvb2wgb3BlblNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgZnVsbEZp bGVuYW1lKTsKICAgICBTdHJpbmcgZW5zdXJlVmFsaWRSZWNvcmRzVGFibGUoKTsKICAgICBTdHJp bmcgaW1wb3J0UmVjb3JkcygpOwogICAgIHZvaWQgaW1wb3J0UmVjb3Jkc0lmTmVjZXNzYXJ5KCk7 Ci0gICAgdm9pZCBkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4 dERhdGE+JiwgY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+Jik7Cisg ICAgYm9vbCBkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERh dGE+JiwgY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+Jik7CiAgICAg dm9pZCBkb0NsZWFyT3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luJik7CiAKICAgICAvLyBSZXBs aWVzIHRvIHRoZSBtYWluIHRocmVhZC4KQEAgLTgxLDYgKzgyLDcgQEAgcHJpdmF0ZToKICAgICBT dHJpbmcgbV9kYXRhYmFzZURpcmVjdG9yeTsKICAgICBTdHJpbmcgbV9kYXRhYmFzZUZpbGVQYXRo OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxTUUxpdGVEYXRhYmFzZT4gbV9kYXRhYmFzZTsKKyAgICB1 aW50NjRfdCBtX3B1c2hDb3VudGVyIHsgMCB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVy LmNwcAppbmRleCBkODNmODY2NWI2NTVjNTllMTBjZmZlYzg0MjkzNWQ4ZTY1MmQ4NGMwLi4xNjQ2 YjFmYjdlZGJjY2Q2OWMzNzEyNTg3ZDYwMDYyMDc1Zjc3YThmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcApAQCAtMTQ5LDYgKzE0 OSw3IEBAIHZvaWQgU1dTZXJ2ZXI6OndoZW5JbXBvcnRJc0NvbXBsZXRlZChDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiYgY2FsbGJhY2spCiAKIHZvaWQgU1dTZXJ2ZXI6OnJlZ2lzdHJhdGlvblN0 b3JlRGF0YWJhc2VGYWlsZWRUb09wZW4oKQogeworICAgIEFTU0VSVCghbV9pbXBvcnRDb21wbGV0 ZWQpOwogICAgIGlmICghbV9pbXBvcnRDb21wbGV0ZWQpCiAgICAgICAgIHJlZ2lzdHJhdGlvblN0 b3JlSW1wb3J0Q29tcGxldGUoKTsKIH0K 405914 2020-08-04 04:51:41 -0700 2020-08-05 01:46:16 -0700 Patch bug-215120-20200804135139.patch text/plain 12490 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzZiOGJkN2Q3MGJiYWU0 NTkxOGI0ZWU4NGZlY2QyYjI5ZTRhZWFhMS4uYzNiZGY1NjQxYmVhMzZjMzVhMjA1MjA4YzNlNjgw OThiMzAzM2NkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA4LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWdpc3RyYXRpb25EYXRh YmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlIGNhbiBzcGluCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzY0ODUwMzQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluIGNhc2Ugd2UgZmFpbCBvcGVuaW5nIHRoZSBkYXRhYmFzZSB3aGVuIGltcG9ydGluZywg d2UgZGVsZXRlIHRoZSBkYXRhYmFzZSwgdGhlIGZpbGUgYW5kIHJldHJ5LgorICAgICAgICBXZSBk byBub3QgbmVlZCB0byByZXRyeSBpbiB0aGF0IGNhc2Ugc2luY2UgdGhlcmUgaXMgbm90aGluZyB0 byBpbXBvcnQuIFVwZGF0ZSB0aGUgY29kZSB0byBwcm9jZWVkIHdpdGggc2VuZGluZyBhbiBpbXBv cnQgZmFpbHVyZSB0byBTV1NlcnZlci4KKworICAgICAgICBJbiBjYXNlIG9mIHB1c2hpbmcgY2hh bmdlcyB0byB0aGUgZGF0YWJhc2UsIGl0IG1pZ2h0IGJlIHVzZWZ1bCB0byByZXRyeSBidXQgaXQg aXMgYmVzdCB0byBkbyB0aGlzIGFzeW5jaHJvbm91c2x5LgorICAgICAgICBGb3IgaW5zdGFuY2Us IHRoZXJlIG1pZ2h0IGJlIGEgc2NyaXB0IGRlbGV0aW5nIHRoZSBmaWxlcy9mb2xkZXJzIHdoZXJl IGlzIHN0b3JlZCB0aGUgZGF0YWJhc2UuCisgICAgICAgIEluIHRoYXQgY2FzZSwgd2UgY2hlY2sg dGhlIHJlc3VsdCBvZiBwdXNoaW5nIGNoYW5nZXMuCisgICAgICAgIElmIHRoZXkgc3VjY2VlZCwg d2UgY2FsbCB0aGUgY29tcGxldGlvbiBoYW5kbGVyIGFuZCBzdG9wLgorICAgICAgICBPdGhlcndp c2UsIHdlIHdpbGwgcmV0cnkgcHVzaGluZyB0aGUgY2hhbmdlcyBpZiBjaGFuZ2VzIHdlcmUgbm90 IHB1c2hlZCBhZ2FpbiBpbiB0aGUgbWVhbnRpbWUuCisgICAgICAgIFdlIGludHJvZHVjZSBhIHB1 c2ggY291bnRlciBmb3IgdGhhdCBwdXJwb3NlLgorCisgICAgICAgICogd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWdp c3RyYXRpb25EYXRhYmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjppbXBvcnRSZWNvcmRzSWZOZWNlc3NhcnkpOgorICAgICAg ICAoV2ViQ29yZTo6UmVnaXN0cmF0aW9uRGF0YWJhc2U6OnB1c2hDaGFuZ2VzKToKKyAgICAgICAg KFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpzY2hlZHVsZVB1c2hDaGFuZ2VzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2VzKToKKyAg ICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmg6Cisg ICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTV1NlcnZlcjo6cmVnaXN0cmF0aW9uU3RvcmVEYXRhYmFzZUZhaWxlZFRvT3Blbik6 CisKIDIwMjAtMDgtMDMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAg ICAgIE1lZGlhUmVjb3JkZXJQcml2YXRlV3JpdGVyIHNob3VsZCBlbnN1cmUgaXRzIHdyaXRlciBp bnB1dCBpcyByZWFkeSBmb3IgbW9yZSBkYXRhIGJlZm9yZSBhcHBlbmRpbmcgbmV3IHNhbXBsZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvUmVnaXN0 cmF0aW9uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZl ci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHAKaW5kZXggZWZlNzJhYzJiNzIzMDg3NGQ5ZmI4YzUw MTk2NWNiYWNmMjdlMDcwZS4uMTQ3MWY0NmI2MWM0MzdjMWJlMDZkZDQyOTNmMzdiZmIyNmU1YzY0 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdp c3RyYXRpb25EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHAKQEAgLTEzOCw3ICsxMzgsNyBAQCB2b2lk IFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpwb3N0VGFza1RvV29ya1F1ZXVlKEZ1bmN0aW9uPHZvaWQo KT4mJiB0YXNrKQogICAgIH0pOwogfQogCi12b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpvcGVu U1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmlsZW5hbWUpCitib29sIFJlZ2lzdHJh dGlvbkRhdGFiYXNlOjpvcGVuU1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmlsZW5h bWUpCiB7CiAgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CiAgICAgQVNTRVJUKCFtX2RhdGFi YXNlKTsKQEAgLTE1NCwxMCArMTU0LDcgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6b3Bl blNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgZnVsbEZpbGVuYW1lKQogICAgIGlmICghbV9k YXRhYmFzZS0+b3BlbihmdWxsRmlsZW5hbWUpKSB7CiAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S KFNlcnZpY2VXb3JrZXIsICJGYWlsZWQgdG8gb3BlbiBTZXJ2aWNlIFdvcmtlciByZWdpc3RyYXRp b24gZGF0YWJhc2UiKTsKICAgICAgICAgbV9kYXRhYmFzZSA9IG51bGxwdHI7Ci0gICAgICAgIGNh bGxPbk1haW5UaHJlYWQoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKV0gewot ICAgICAgICAgICAgZGF0YWJhc2VGYWlsZWRUb09wZW4oKTsKLSAgICAgICAgfSk7Ci0gICAgICAg IHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8vIERpc2FibGUg dGhyZWFkaW5nIGNoZWNrcy4gV2UgYWx3YXlzIGFjY2VzcyB0aGUgZGF0YWJhc2UgZnJvbSBvdXIg c2VyaWFsIFdvcmtRdWV1ZS4gU3VjaCBhY2Nlc3NlcwpAQCAtMTY2LDM2ICsxNjMsNDIgQEAgdm9p ZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYg ZnVsbEZpbGVuYW1lKQogICAgIG1fZGF0YWJhc2UtPmRpc2FibGVUaHJlYWRpbmdDaGVja3MoKTsK ICAgICAKICAgICBhdXRvIGRvUmVjb3ZlcnlBdHRlbXB0ID0gWyZdIHsKLSAgICAgICAgLy8gRGVs ZXRlIHRoZSBkYXRhYmFzZSBhbmQgcmUtY3JlYXRlIGl0LgorICAgICAgICAvLyBEZWxldGUgdGhl IGRhdGFiYXNlIGFuZCBmaWxlcy4gV2Ugd2lsbCB0cnkgcmVjcmVhdGluZyBpdCB3aGVuIGZsdXNo aW5nIGNoYW5nZXMuCiAgICAgICAgIG1fZGF0YWJhc2UgPSBudWxscHRyOwogICAgICAgICBTUUxp dGVGaWxlU3lzdGVtOjpkZWxldGVEYXRhYmFzZUZpbGUoZnVsbEZpbGVuYW1lKTsKLSAgICAgICAg b3BlblNRTGl0ZURhdGFiYXNlKGZ1bGxGaWxlbmFtZSk7CiAgICAgfTsKICAgICAKICAgICBTdHJp bmcgZXJyb3JNZXNzYWdlID0gZW5zdXJlVmFsaWRSZWNvcmRzVGFibGUoKTsKICAgICBpZiAoIWVy cm9yTWVzc2FnZS5pc051bGwoKSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNl V29ya2VyLCAiZW5zdXJlVmFsaWRSZWNvcmRzVGFibGUgZmFpbGVkLCByZWFzb246ICUiIFBVQkxJ Q19MT0dfU1RSSU5HLCBlcnJvck1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGRvUmVj b3ZlcnlBdHRlbXB0KCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KICAgICAKICAgICBlcnJvck1lc3NhZ2UgPSBpbXBvcnRSZWNvcmRzKCk7CiAgICAgaWYg KCFlcnJvck1lc3NhZ2UuaXNOdWxsKCkpIHsKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoU2Vy dmljZVdvcmtlciwgImltcG9ydFJlY29yZHMgZmFpbGVkLCByZWFzb246ICUiIFBVQkxJQ19MT0df U1RSSU5HLCBlcnJvck1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGRvUmVjb3ZlcnlB dHRlbXB0KCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K KyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6aW1wb3J0 UmVjb3Jkc0lmTmVjZXNzYXJ5KCkKIHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKIAot ICAgIGlmIChGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKG1fZGF0YWJhc2VGaWxlUGF0aCkpCi0gICAg ICAgIG9wZW5TUUxpdGVEYXRhYmFzZShtX2RhdGFiYXNlRmlsZVBhdGgpOworICAgIGlmIChGaWxl U3lzdGVtOjpmaWxlRXhpc3RzKG1fZGF0YWJhc2VGaWxlUGF0aCkpIHsKKyAgICAgICAgaWYgKCFv cGVuU1FMaXRlRGF0YWJhc2UobV9kYXRhYmFzZUZpbGVQYXRoKSkgeworICAgICAgICAgICAgY2Fs bE9uTWFpblRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7Cisg ICAgICAgICAgICAgICAgZGF0YWJhc2VGYWlsZWRUb09wZW4oKTsKKyAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQogCi0gICAgY2FsbE9uTWFpblRo cmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7Ci0gICAgICAgIHByb3RlY3Rl ZFRoaXMtPmRhdGFiYXNlT3BlbmVkQW5kUmVjb3Jkc0ltcG9ydGVkKCk7CisgICAgY2FsbE9uTWFp blRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7CisgICAgICAg IGRhdGFiYXNlT3BlbmVkQW5kUmVjb3Jkc0ltcG9ydGVkKCk7CiAgICAgfSk7CiB9CiAKQEAgLTI5 MywyMCArMjk2LDMyIEBAIHZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OnB1c2hDaGFuZ2VzKGNv bnN0IEhhc2hNYXA8U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktlCiAgICAgICAgIGVsc2UKICAg ICAgICAgICAgIHJlbW92ZWRSZWdpc3RyYXRpb25zLmFwcGVuZChrZXlWYWx1ZS5rZXkuaXNvbGF0 ZWRDb3B5KCkpOwogICAgIH0KKyAgICBzY2hlZHVsZVB1c2hDaGFuZ2VzKFdURk1vdmUodXBkYXRl ZFJlZ2lzdHJhdGlvbnMpLCBXVEZNb3ZlKHJlbW92ZWRSZWdpc3RyYXRpb25zKSwgV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOworfQogCi0gICAgcG9zdFRhc2tUb1dvcmtRdWV1ZShbdGhpcywg dXBkYXRlZFJlZ2lzdHJhdGlvbnMgPSBXVEZNb3ZlKHVwZGF0ZWRSZWdpc3RyYXRpb25zKSwgcmVt b3ZlZFJlZ2lzdHJhdGlvbnMgPSBXVEZNb3ZlKHJlbW92ZWRSZWdpc3RyYXRpb25zKSwgY29tcGxl dGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKLSAg ICAgICAgZG9QdXNoQ2hhbmdlcyh1cGRhdGVkUmVnaXN0cmF0aW9ucywgcmVtb3ZlZFJlZ2lzdHJh dGlvbnMpOwotCi0gICAgICAgIGlmICghY29tcGxldGlvbkhhbmRsZXIpCi0gICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSk7Cit2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpzY2hlZHVsZVB1c2hDaGFuZ2VzKFZl Y3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JiYgdXBkYXRlZFJlZ2lzdHJhdGlvbnMsIFZl Y3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYmIHJlbW92ZWRSZWdpc3RyYXRpb25z LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAg cG9zdFRhc2tUb1dvcmtRdWV1ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBwdXNoQ291bnRlciA9ICsrbV9wdXNoQ291bnRlciwgdXBkYXRlZFJlZ2lzdHJhdGlvbnMgPSBX VEZNb3ZlKHVwZGF0ZWRSZWdpc3RyYXRpb25zKSwgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMgPSBXVEZN b3ZlKHJlbW92ZWRSZWdpc3RyYXRpb25zKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgYm9vbCBzdWNjZXNzID0gZG9Q dXNoQ2hhbmdlcyh1cGRhdGVkUmVnaXN0cmF0aW9ucywgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMpOwor ICAgICAgICBpZiAoc3VjY2VzcykgeworICAgICAgICAgICAgdXBkYXRlZFJlZ2lzdHJhdGlvbnMu Y2xlYXIoKTsKKyAgICAgICAgICAgIHJlbW92ZWRSZWdpc3RyYXRpb25zLmNsZWFyKCk7CisgICAg ICAgIH0KKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdU Rk1vdmUocHJvdGVjdGVkVGhpcyksIHN1Y2Nlc3MsIHB1c2hDb3VudGVyLCB1cGRhdGVkUmVnaXN0 cmF0aW9ucyA9IFdURk1vdmUodXBkYXRlZFJlZ2lzdHJhdGlvbnMpLmlzb2xhdGVkQ29weSgpLCBy ZW1vdmVkUmVnaXN0cmF0aW9ucyA9IFdURk1vdmUocmVtb3ZlZFJlZ2lzdHJhdGlvbnMpLmlzb2xh dGVkQ29weSgpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp XSgpIG11dGFibGUgeworICAgICAgICAgICAgaWYgKCFzdWNjZXNzICYmIHB1c2hDb3VudGVyID09 IG1fcHVzaENvdW50ZXIpIHsKKyAgICAgICAgICAgICAgICAvLyBXZSByZXRyeSB3cml0aW5nIGlm IG5vIG90aGVyIGNoYW5nZSB3YXMgcHVzaGVkLgorICAgICAgICAgICAgICAgIHNjaGVkdWxlUHVz aENoYW5nZXMoV1RGTW92ZSh1cGRhdGVkUmVnaXN0cmF0aW9ucyksIFdURk1vdmUocmVtb3ZlZFJl Z2lzdHJhdGlvbnMpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGNvbXBsZXRpb25IYW5k bGVyKQorICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgICAgIH0pOwog ICAgIH0pOwogfQogCiB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpjbG9zZShDb21wbGV0aW9u SGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgcG9zdFRhc2tUb1dv cmtRdWV1ZShbdGhpcywgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKV0oKSBtdXRhYmxlIHsKKyAgICBwb3N0VGFza1RvV29ya1F1ZXVlKFt0aGlzLCBwdXNoQ291 bnRlciA9ICsrbV9wdXNoQ291bnRlciwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKICAgICAgICAgbV9kYXRhYmFzZSA9IG51bGxwdHI7 CiAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwog ICAgIH0pOwpAQCAtMzE0LDcgKzMyOSw3IEBAIHZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OmNs b3NlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIAogdm9p ZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6Y2xlYXJBbGwoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIHBvc3RUYXNrVG9Xb3JrUXVldWUoW3RoaXMs IGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKCkgbXV0YWJs ZSB7CisgICAgcG9zdFRhc2tUb1dvcmtRdWV1ZShbdGhpcywgcHVzaENvdW50ZXIgPSArK21fcHVz aENvdW50ZXIsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcild KCkgbXV0YWJsZSB7CiAgICAgICAgIG1fZGF0YWJhc2UgPSBudWxscHRyOwogCiAgICAgICAgIFNR TGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZShtX2RhdGFiYXNlRmlsZVBhdGgpOwpA QCAtMzI0LDEyICszMzksMTIgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6Y2xlYXJBbGwo Q29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGUKICAgICB9KTsKIH0K IAotdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhjb25zdCBWZWN0b3I8 U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYgdXBkYXRlZFJlZ2lzdHJhdGlvbnMsIGNvbnN0IFZl Y3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMp Citib29sIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxT ZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JiB1cGRhdGVkUmVnaXN0cmF0aW9ucywgY29uc3QgVmVj dG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+JiByZW1vdmVkUmVnaXN0cmF0aW9ucykK IHsKICAgICBpZiAoIW1fZGF0YWJhc2UpIHsKICAgICAgICAgb3BlblNRTGl0ZURhdGFiYXNlKG1f ZGF0YWJhc2VGaWxlUGF0aCk7CiAgICAgICAgIGlmICghbV9kYXRhYmFzZSkKLSAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBTUUxpdGVU cmFuc2FjdGlvbiB0cmFuc2FjdGlvbigqbV9kYXRhYmFzZSk7CkBAIC0zMzgsNyArMzUzLDcgQEAg dm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhjb25zdCBWZWN0b3I8U2Vy dmljZVdvcmtlckNvbnRleHREYXRhPiYKICAgICBTUUxpdGVTdGF0ZW1lbnQgc3FsKCptX2RhdGFi YXNlLCAiSU5TRVJUIElOVE8gUmVjb3JkcyBWQUxVRVMgKD8sID8sID8sID8sID8sID8sID8sID8s ID8sID8sID8sID8sID8pIl9zKTsKICAgICBpZiAoc3FsLnByZXBhcmUoKSAhPSBTUUxJVEVfT0sp IHsKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoU2VydmljZVdvcmtlciwgIkZhaWxlZCB0byBw cmVwYXJlIHN0YXRlbWVudCB0byBzdG9yZSByZWdpc3RyYXRpb24gZGF0YSBpbnRvIHJlY29yZHMg dGFibGUgKCVpKSAtICVzIiwgbV9kYXRhYmFzZS0+bGFzdEVycm9yKCksIG1fZGF0YWJhc2UtPmxh c3RFcnJvck1zZygpKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogCiAgICAgZm9yIChhdXRvJiByZWdpc3RyYXRpb24gOiByZW1vdmVkUmVnaXN0cmF0aW9u cykgewpAQCAtMzQ3LDcgKzM2Miw3IEBAIHZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OmRvUHVz aENoYW5nZXMoY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YT4mCiAgICAgICAg ICAgICB8fCBzcWwuYmluZFRleHQoMSwgcmVnaXN0cmF0aW9uLnRvRGF0YWJhc2VLZXkoKSkgIT0g U1FMSVRFX09LCiAgICAgICAgICAgICB8fCBzcWwuc3RlcCgpICE9IFNRTElURV9ET05FKSB7CiAg ICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNlV29ya2VyLCAiRmFpbGVkIHRvIHJl bW92ZSByZWdpc3RyYXRpb24gZGF0YSBmcm9tIHJlY29yZHMgdGFibGUgKCVpKSAtICVzIiwgbV9k YXRhYmFzZS0+bGFzdEVycm9yKCksIG1fZGF0YWJhc2UtPmxhc3RFcnJvck1zZygpKTsKLSAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogICAg IH0KIApAQCAtMzc2LDEzICszOTEsMTQgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6ZG9Q dXNoQ2hhbmdlcyhjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYKICAgICAg ICAgICAgIHx8IHNxbC5iaW5kQmxvYigxMywgY2VydGlmaWNhdGVJbmZvRW5jb2Rlci5idWZmZXIo KSwgY2VydGlmaWNhdGVJbmZvRW5jb2Rlci5idWZmZXJTaXplKCkpICE9IFNRTElURV9PSwogICAg ICAgICAgICAgfHwgc3FsLnN0ZXAoKSAhPSBTUUxJVEVfRE9ORSkgewogICAgICAgICAgICAgUkVM RUFTRV9MT0dfRVJST1IoU2VydmljZVdvcmtlciwgIkZhaWxlZCB0byBzdG9yZSByZWdpc3RyYXRp b24gZGF0YSBpbnRvIHJlY29yZHMgdGFibGUgKCVpKSAtICVzIiwgbV9kYXRhYmFzZS0+bGFzdEVy cm9yKCksIG1fZGF0YWJhc2UtPmxhc3RFcnJvck1zZygpKTsKLSAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogICAgIH0KIAogICAgIHRyYW5z YWN0aW9uLmNvbW1pdCgpOwogCiAgICAgTE9HKFNlcnZpY2VXb3JrZXIsICJVcGRhdGVkIFNlcnZp Y2VXb3JrZXIgcmVnaXN0cmF0aW9uIGRhdGFiYXNlICglenUgYWRkZWQvdXBkYXRlZCByZWdpc3Ry YXRpb25zIGFuZCAlenUgcmVtb3ZlZCByZWdpc3RyYXRpb25zIiwgdXBkYXRlZFJlZ2lzdHJhdGlv bnMuc2l6ZSgpLCByZW1vdmVkUmVnaXN0cmF0aW9ucy5zaXplKCkpOworICAgIHJldHVybiB0cnVl OwogfQogCiBTdHJpbmcgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OmltcG9ydFJlY29yZHMoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdpc3RyYXRp b25EYXRhYmFzZS5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9SZWdp c3RyYXRpb25EYXRhYmFzZS5oCmluZGV4IGIxZDZjYzNjZDgxZDhkYWFiNjA0OTJjYTgyYTMwMTcy YTI3ZTUzYzQuLjdmMmJmOWUyNWM0NDQ1OWQ1YThlYjk5MzQzNGNkNTNkYjBkYzk3MWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvUmVnaXN0cmF0aW9u RGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1Jl Z2lzdHJhdGlvbkRhdGFiYXNlLmgKQEAgLTYxLDE0ICs2MSwxNSBAQCBwcml2YXRlOgogICAgIAog ICAgIFN0cmluZyBkYXRhYmFzZURpcmVjdG9yeUlzb2xhdGVkQ29weSgpIGNvbnN0IHsgcmV0dXJu IG1fZGF0YWJhc2VEaXJlY3RvcnkuaXNvbGF0ZWRDb3B5KCk7IH0KIAorICAgIHZvaWQgc2NoZWR1 bGVQdXNoQ2hhbmdlcyhWZWN0b3I8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYmLCBWZWN0b3I8 U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktleT4mJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgp PiYmKTsKICAgICB2b2lkIHBvc3RUYXNrVG9Xb3JrUXVldWUoRnVuY3Rpb248dm9pZCgpPiYmKTsK IAogICAgIC8vIE1ldGhvZHMgdG8gYmUgcnVuIG9uIHRoZSB3b3JrIHF1ZXVlLgotICAgIHZvaWQg b3BlblNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgZnVsbEZpbGVuYW1lKTsKKyAgICBib29s IG9wZW5TUUxpdGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIGZ1bGxGaWxlbmFtZSk7CiAgICAgU3Ry aW5nIGVuc3VyZVZhbGlkUmVjb3Jkc1RhYmxlKCk7CiAgICAgU3RyaW5nIGltcG9ydFJlY29yZHMo KTsKICAgICB2b2lkIGltcG9ydFJlY29yZHNJZk5lY2Vzc2FyeSgpOwotICAgIHZvaWQgZG9QdXNo Q2hhbmdlcyhjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYsIGNvbnN0IFZl Y3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYpOworICAgIGJvb2wgZG9QdXNoQ2hh bmdlcyhjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlckNvbnRleHREYXRhPiYsIGNvbnN0IFZlY3Rv cjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYpOwogICAgIHZvaWQgZG9DbGVhck9yaWdp bihjb25zdCBTZWN1cml0eU9yaWdpbiYpOwogCiAgICAgLy8gUmVwbGllcyB0byB0aGUgbWFpbiB0 aHJlYWQuCkBAIC04MSw2ICs4Miw3IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fZGF0YWJhc2VE aXJlY3Rvcnk7CiAgICAgU3RyaW5nIG1fZGF0YWJhc2VGaWxlUGF0aDsKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8U1FMaXRlRGF0YWJhc2U+IG1fZGF0YWJhc2U7CisgICAgdWludDY0X3QgbV9wdXNoQ291 bnRlciB7IDAgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKaW5kZXggZDgzZjg2 NjViNjU1YzU5ZTEwY2ZmZWM4NDI5MzVkOGU2NTJkODRjMC4uMTY0NmIxZmI3ZWRiY2NkNjljMzcx MjU4N2Q2MDA2MjA3NWY3N2E4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9z ZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKQEAgLTE0OSw2ICsxNDksNyBAQCB2b2lkIFNXU2Vy dmVyOjp3aGVuSW1wb3J0SXNDb21wbGV0ZWQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNh bGxiYWNrKQogCiB2b2lkIFNXU2VydmVyOjpyZWdpc3RyYXRpb25TdG9yZURhdGFiYXNlRmFpbGVk VG9PcGVuKCkKIHsKKyAgICBBU1NFUlQoIW1faW1wb3J0Q29tcGxldGVkKTsKICAgICBpZiAoIW1f aW1wb3J0Q29tcGxldGVkKQogICAgICAgICByZWdpc3RyYXRpb25TdG9yZUltcG9ydENvbXBsZXRl KCk7CiB9Cg== 405991 2020-08-05 01:46:20 -0700 2020-08-05 04:03:13 -0700 Patch for landing bug-215120-20200805104618.patch text/plain 11766 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc0YmM3OTRlMmRhMDRk NWJlYzc5YzczMmIxNDAzYzVkODM2ZjdjNC4uODRjOWI1MmUzNjBlODgyN2YzZjdhZjA0MWM1ODc0 ZDZkNGY4MzkyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTA4LTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZWdpc3RyYXRpb25EYXRh YmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlIGNhbiBzcGluCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTUxMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzY0ODUwMzQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgorCisgICAg ICAgIEluIGNhc2Ugd2UgZmFpbCBvcGVuaW5nIHRoZSBkYXRhYmFzZSB3aGVuIGltcG9ydGluZywg d2UgZGVsZXRlIHRoZSBkYXRhYmFzZSwgdGhlIGZpbGUgYW5kIHJldHJ5LgorICAgICAgICBXZSBk byBub3QgbmVlZCB0byByZXRyeSBpbiB0aGF0IGNhc2Ugc2luY2UgdGhlcmUgaXMgbm90aGluZyB0 byBpbXBvcnQuIFVwZGF0ZSB0aGUgY29kZSB0byBwcm9jZWVkIHdpdGggc2VuZGluZyBhbiBpbXBv cnQgZmFpbHVyZSB0byBTV1NlcnZlci4KKworICAgICAgICBJbiBjYXNlIG9mIHB1c2hpbmcgY2hh bmdlcyB0byB0aGUgZGF0YWJhc2UsIGl0IG1pZ2h0IGJlIHVzZWZ1bCB0byByZXRyeSBidXQgaXQg aXMgYmVzdCB0byBkbyB0aGlzIGFzeW5jaHJvbm91c2x5LgorICAgICAgICBGb3IgaW5zdGFuY2Us IHRoZXJlIG1pZ2h0IGJlIGEgc2NyaXB0IGRlbGV0aW5nIHRoZSBmaWxlcy9mb2xkZXJzIHdoZXJl IGlzIHN0b3JlZCB0aGUgZGF0YWJhc2UuCisgICAgICAgIEluIHRoYXQgY2FzZSwgd2UgY2hlY2sg dGhlIHJlc3VsdCBvZiBwdXNoaW5nIGNoYW5nZXMuCisgICAgICAgIElmIHRoZXkgc3VjY2VlZCwg d2UgY2FsbCB0aGUgY29tcGxldGlvbiBoYW5kbGVyIGFuZCBzdG9wLgorICAgICAgICBPdGhlcndp c2UsIHdlIHdpbGwgcmV0cnkgcHVzaGluZyB0aGUgY2hhbmdlcyBpZiBjaGFuZ2VzIHdlcmUgbm90 IHB1c2hlZCBhZ2FpbiBpbiB0aGUgbWVhbnRpbWUuCisgICAgICAgIFdlIGludHJvZHVjZSBhIHB1 c2ggY291bnRlciBmb3IgdGhhdCBwdXJwb3NlLgorCisgICAgICAgICogd29ya2Vycy9zZXJ2aWNl L3NlcnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWdp c3RyYXRpb25EYXRhYmFzZTo6cG9zdFRhc2tUb1dvcmtRdWV1ZSk6CisgICAgICAgIChXZWJDb3Jl OjpSZWdpc3RyYXRpb25EYXRhYmFzZTo6b3BlblNRTGl0ZURhdGFiYXNlKToKKyAgICAgICAgKFdl YkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjppbXBvcnRSZWNvcmRzSWZOZWNlc3NhcnkpOgor ICAgICAgICAoV2ViQ29yZTo6UmVnaXN0cmF0aW9uRGF0YWJhc2U6OnB1c2hDaGFuZ2VzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpzY2hlZHVsZVB1c2hDaGFuZ2Vz KToKKyAgICAgICAgKFdlYkNvcmU6OlJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2Vz KToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNl Lmg6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTV1NlcnZlcjo6cmVnaXN0cmF0aW9uU3RvcmVEYXRhYmFzZUZhaWxlZFRv T3Blbik6CisKIDIwMjAtMDgtMDQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIFVwZGF0ZSBBdWRpb1NhbXBsZURhdGFTb3VyY2Ugb2Zmc2V0IGNvbXB1dGF0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1JlZ2lz dHJhdGlvbkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2 ZXIvUmVnaXN0cmF0aW9uRGF0YWJhc2UuY3BwCmluZGV4IGVmZTcyYWMyYjcyMzA4NzRkOWZiOGM1 MDE5NjVjYmFjZjI3ZTA3MGUuLjU1YjAyNWE5YWUxMzc3YzU2MjM4ODlmMjg2ZjQ5NDdlNzE5NmI5 NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvUmVn aXN0cmF0aW9uRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vydmlj ZS9zZXJ2ZXIvUmVnaXN0cmF0aW9uRGF0YWJhc2UuY3BwCkBAIC0xMzMsMTIgKzEzMywxMyBAQCB2 b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpwb3N0VGFza1RvV29ya1F1ZXVlKEZ1bmN0aW9uPHZv aWQoKT4mJiB0YXNrKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKKyAgICArK21f cHVzaENvdW50ZXI7CiAgICAgbV93b3JrUXVldWUtPmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0g bWFrZVJlZigqdGhpcyksIHRhc2sgPSBXVEZNb3ZlKHRhc2spXSgpIG11dGFibGUgewogICAgICAg ICB0YXNrKCk7CiAgICAgfSk7CiB9CiAKLXZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6Om9wZW5T UUxpdGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIGZ1bGxGaWxlbmFtZSkKK2Jvb2wgUmVnaXN0cmF0 aW9uRGF0YWJhc2U6Om9wZW5TUUxpdGVEYXRhYmFzZShjb25zdCBTdHJpbmcmIGZ1bGxGaWxlbmFt ZSkKIHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKICAgICBBU1NFUlQoIW1fZGF0YWJh c2UpOwpAQCAtMTU0LDEwICsxNTUsNyBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpvcGVu U1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmlsZW5hbWUpCiAgICAgaWYgKCFtX2Rh dGFiYXNlLT5vcGVuKGZ1bGxGaWxlbmFtZSkpIHsKICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1Io U2VydmljZVdvcmtlciwgIkZhaWxlZCB0byBvcGVuIFNlcnZpY2UgV29ya2VyIHJlZ2lzdHJhdGlv biBkYXRhYmFzZSIpOwogICAgICAgICBtX2RhdGFiYXNlID0gbnVsbHB0cjsKLSAgICAgICAgY2Fs bE9uTWFpblRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7Ci0g ICAgICAgICAgICBkYXRhYmFzZUZhaWxlZFRvT3BlbigpOwotICAgICAgICB9KTsKLSAgICAgICAg cmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgLy8gRGlzYWJsZSB0 aHJlYWRpbmcgY2hlY2tzLiBXZSBhbHdheXMgYWNjZXNzIHRoZSBkYXRhYmFzZSBmcm9tIG91ciBz ZXJpYWwgV29ya1F1ZXVlLiBTdWNoIGFjY2Vzc2VzCkBAIC0xNjYsMzYgKzE2NCw0MiBAQCB2b2lk IFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpvcGVuU1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBm dWxsRmlsZW5hbWUpCiAgICAgbV9kYXRhYmFzZS0+ZGlzYWJsZVRocmVhZGluZ0NoZWNrcygpOwog ICAgIAogICAgIGF1dG8gZG9SZWNvdmVyeUF0dGVtcHQgPSBbJl0gewotICAgICAgICAvLyBEZWxl dGUgdGhlIGRhdGFiYXNlIGFuZCByZS1jcmVhdGUgaXQuCisgICAgICAgIC8vIERlbGV0ZSB0aGUg ZGF0YWJhc2UgYW5kIGZpbGVzLiBXZSB3aWxsIHRyeSByZWNyZWF0aW5nIGl0IHdoZW4gZmx1c2hp bmcgY2hhbmdlcy4KICAgICAgICAgbV9kYXRhYmFzZSA9IG51bGxwdHI7CiAgICAgICAgIFNRTGl0 ZUZpbGVTeXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZShmdWxsRmlsZW5hbWUpOwotICAgICAgICBv cGVuU1FMaXRlRGF0YWJhc2UoZnVsbEZpbGVuYW1lKTsKICAgICB9OwogICAgIAogICAgIFN0cmlu ZyBlcnJvck1lc3NhZ2UgPSBlbnN1cmVWYWxpZFJlY29yZHNUYWJsZSgpOwogICAgIGlmICghZXJy b3JNZXNzYWdlLmlzTnVsbCgpKSB7CiAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VX b3JrZXIsICJlbnN1cmVWYWxpZFJlY29yZHNUYWJsZSBmYWlsZWQsIHJlYXNvbjogJSIgUFVCTElD X0xPR19TVFJJTkcsIGVycm9yTWVzc2FnZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgZG9SZWNv dmVyeUF0dGVtcHQoKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogICAgIAogICAgIGVycm9yTWVzc2FnZSA9IGltcG9ydFJlY29yZHMoKTsKICAgICBpZiAo IWVycm9yTWVzc2FnZS5pc051bGwoKSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2 aWNlV29ya2VyLCAiaW1wb3J0UmVjb3JkcyBmYWlsZWQsIHJlYXNvbjogJSIgUFVCTElDX0xPR19T VFJJTkcsIGVycm9yTWVzc2FnZS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgZG9SZWNvdmVyeUF0 dGVtcHQoKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQor ICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjppbXBvcnRS ZWNvcmRzSWZOZWNlc3NhcnkoKQogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwogCi0g ICAgaWYgKEZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobV9kYXRhYmFzZUZpbGVQYXRoKSkKLSAgICAg ICAgb3BlblNRTGl0ZURhdGFiYXNlKG1fZGF0YWJhc2VGaWxlUGF0aCk7CisgICAgaWYgKEZpbGVT eXN0ZW06OmZpbGVFeGlzdHMobV9kYXRhYmFzZUZpbGVQYXRoKSkgeworICAgICAgICBpZiAoIW9w ZW5TUUxpdGVEYXRhYmFzZShtX2RhdGFiYXNlRmlsZVBhdGgpKSB7CisgICAgICAgICAgICBjYWxs T25NYWluVGhyZWFkKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKKyAg ICAgICAgICAgICAgICBkYXRhYmFzZUZhaWxlZFRvT3BlbigpOworICAgICAgICAgICAgfSk7Cisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CiAKLSAgICBjYWxsT25NYWluVGhy ZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKLSAgICAgICAgcHJvdGVjdGVk VGhpcy0+ZGF0YWJhc2VPcGVuZWRBbmRSZWNvcmRzSW1wb3J0ZWQoKTsKKyAgICBjYWxsT25NYWlu VGhyZWFkKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKKyAgICAgICAg ZGF0YWJhc2VPcGVuZWRBbmRSZWNvcmRzSW1wb3J0ZWQoKTsKICAgICB9KTsKIH0KIApAQCAtMjkz LDE0ICsyOTcsMjYgQEAgdm9pZCBSZWdpc3RyYXRpb25EYXRhYmFzZTo6cHVzaENoYW5nZXMoY29u c3QgSGFzaE1hcDxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2UKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMuYXBwZW5kKGtleVZhbHVlLmtleS5pc29sYXRl ZENvcHkoKSk7CiAgICAgfQorICAgIHNjaGVkdWxlUHVzaENoYW5nZXMoV1RGTW92ZSh1cGRhdGVk UmVnaXN0cmF0aW9ucyksIFdURk1vdmUocmVtb3ZlZFJlZ2lzdHJhdGlvbnMpLCBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7Cit9CiAKLSAgICBwb3N0VGFza1RvV29ya1F1ZXVlKFt0aGlzLCB1 cGRhdGVkUmVnaXN0cmF0aW9ucyA9IFdURk1vdmUodXBkYXRlZFJlZ2lzdHJhdGlvbnMpLCByZW1v dmVkUmVnaXN0cmF0aW9ucyA9IFdURk1vdmUocmVtb3ZlZFJlZ2lzdHJhdGlvbnMpLCBjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewotICAg ICAgICBkb1B1c2hDaGFuZ2VzKHVwZGF0ZWRSZWdpc3RyYXRpb25zLCByZW1vdmVkUmVnaXN0cmF0 aW9ucyk7Ci0KLSAgICAgICAgaWYgKCFjb21wbGV0aW9uSGFuZGxlcikKLSAgICAgICAgICAgIHJl dHVybjsKLQotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpKTsKK3ZvaWQgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OnNjaGVkdWxlUHVzaENoYW5nZXMoVmVj dG9yPFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YT4mJiB1cGRhdGVkUmVnaXN0cmF0aW9ucywgVmVj dG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+JiYgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMs IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBw b3N0VGFza1RvV29ya1F1ZXVlKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IHB1c2hDb3VudGVyID0gbV9wdXNoQ291bnRlciwgdXBkYXRlZFJlZ2lzdHJhdGlvbnMgPSBXVEZN b3ZlKHVwZGF0ZWRSZWdpc3RyYXRpb25zKSwgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMgPSBXVEZNb3Zl KHJlbW92ZWRSZWdpc3RyYXRpb25zKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgYm9vbCBzdWNjZXNzID0gZG9QdXNo Q2hhbmdlcyh1cGRhdGVkUmVnaXN0cmF0aW9ucywgcmVtb3ZlZFJlZ2lzdHJhdGlvbnMpOworICAg ICAgICBpZiAoc3VjY2VzcykgeworICAgICAgICAgICAgdXBkYXRlZFJlZ2lzdHJhdGlvbnMuY2xl YXIoKTsKKyAgICAgICAgICAgIHJlbW92ZWRSZWdpc3RyYXRpb25zLmNsZWFyKCk7CisgICAgICAg IH0KKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFdURk1v dmUocHJvdGVjdGVkVGhpcyksIHN1Y2Nlc3MsIHB1c2hDb3VudGVyLCB1cGRhdGVkUmVnaXN0cmF0 aW9ucyA9IFdURk1vdmUodXBkYXRlZFJlZ2lzdHJhdGlvbnMpLmlzb2xhdGVkQ29weSgpLCByZW1v dmVkUmVnaXN0cmF0aW9ucyA9IFdURk1vdmUocmVtb3ZlZFJlZ2lzdHJhdGlvbnMpLmlzb2xhdGVk Q29weSgpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgp IG11dGFibGUgeworICAgICAgICAgICAgaWYgKCFzdWNjZXNzICYmIChwdXNoQ291bnRlciArIDEp ID09IG1fcHVzaENvdW50ZXIpIHsKKyAgICAgICAgICAgICAgICAvLyBXZSByZXRyeSB3cml0aW5n IGlmIG5vIG90aGVyIGNoYW5nZSB3YXMgcHVzaGVkLgorICAgICAgICAgICAgICAgIHNjaGVkdWxl UHVzaENoYW5nZXMoV1RGTW92ZSh1cGRhdGVkUmVnaXN0cmF0aW9ucyksIFdURk1vdmUocmVtb3Zl ZFJlZ2lzdHJhdGlvbnMpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGNvbXBsZXRpb25I YW5kbGVyKQorICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CisgICAgICAgIH0p OwogICAgIH0pOwogfQogCkBAIC0zMjQsMTIgKzM0MCwxMiBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRh dGFiYXNlOjpjbGVhckFsbChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhh bmRsZQogICAgIH0pOwogfQogCi12b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFu Z2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JiB1cGRhdGVkUmVnaXN0 cmF0aW9ucywgY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+JiByZW1v dmVkUmVnaXN0cmF0aW9ucykKK2Jvb2wgUmVnaXN0cmF0aW9uRGF0YWJhc2U6OmRvUHVzaENoYW5n ZXMoY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YT4mIHVwZGF0ZWRSZWdpc3Ry YXRpb25zLCBjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbktleT4mIHJlbW92 ZWRSZWdpc3RyYXRpb25zKQogewogICAgIGlmICghbV9kYXRhYmFzZSkgewogICAgICAgICBvcGVu U1FMaXRlRGF0YWJhc2UobV9kYXRhYmFzZUZpbGVQYXRoKTsKICAgICAgICAgaWYgKCFtX2RhdGFi YXNlKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KIAogICAgIFNRTGl0ZVRyYW5zYWN0aW9uIHRyYW5zYWN0aW9uKCptX2RhdGFiYXNlKTsKQEAg LTMzOCw3ICszNTQsNyBAQCB2b2lkIFJlZ2lzdHJhdGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2Vz KGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERhdGE+JgogICAgIFNRTGl0ZVN0YXRl bWVudCBzcWwoKm1fZGF0YWJhc2UsICJJTlNFUlQgSU5UTyBSZWNvcmRzIFZBTFVFUyAoPywgPywg PywgPywgPywgPywgPywgPywgPywgPywgPywgPywgPykiX3MpOwogICAgIGlmIChzcWwucHJlcGFy ZSgpICE9IFNRTElURV9PSykgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNlV29y a2VyLCAiRmFpbGVkIHRvIHByZXBhcmUgc3RhdGVtZW50IHRvIHN0b3JlIHJlZ2lzdHJhdGlvbiBk YXRhIGludG8gcmVjb3JkcyB0YWJsZSAoJWkpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3Io KSwgbV9kYXRhYmFzZS0+bGFzdEVycm9yTXNnKCkpOwotICAgICAgICByZXR1cm47CisgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBmb3IgKGF1dG8mIHJlZ2lzdHJhdGlvbiA6IHJl bW92ZWRSZWdpc3RyYXRpb25zKSB7CkBAIC0zNDcsNyArMzYzLDcgQEAgdm9pZCBSZWdpc3RyYXRp b25EYXRhYmFzZTo6ZG9QdXNoQ2hhbmdlcyhjb25zdCBWZWN0b3I8U2VydmljZVdvcmtlckNvbnRl eHREYXRhPiYKICAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCgxLCByZWdpc3RyYXRpb24udG9E YXRhYmFzZUtleSgpKSAhPSBTUUxJVEVfT0sKICAgICAgICAgICAgIHx8IHNxbC5zdGVwKCkgIT0g U1FMSVRFX0RPTkUpIHsKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VXb3Jr ZXIsICJGYWlsZWQgdG8gcmVtb3ZlIHJlZ2lzdHJhdGlvbiBkYXRhIGZyb20gcmVjb3JkcyB0YWJs ZSAoJWkpIC0gJXMiLCBtX2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+bGFzdEVy cm9yTXNnKCkpOwotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNzYsMTMgKzM5MiwxNCBAQCB2b2lkIFJlZ2lzdHJh dGlvbkRhdGFiYXNlOjpkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29u dGV4dERhdGE+JgogICAgICAgICAgICAgfHwgc3FsLmJpbmRCbG9iKDEzLCBjZXJ0aWZpY2F0ZUlu Zm9FbmNvZGVyLmJ1ZmZlcigpLCBjZXJ0aWZpY2F0ZUluZm9FbmNvZGVyLmJ1ZmZlclNpemUoKSkg IT0gU1FMSVRFX09LCiAgICAgICAgICAgICB8fCBzcWwuc3RlcCgpICE9IFNRTElURV9ET05FKSB7 CiAgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihTZXJ2aWNlV29ya2VyLCAiRmFpbGVkIHRv IHN0b3JlIHJlZ2lzdHJhdGlvbiBkYXRhIGludG8gcmVjb3JkcyB0YWJsZSAoJWkpIC0gJXMiLCBt X2RhdGFiYXNlLT5sYXN0RXJyb3IoKSwgbV9kYXRhYmFzZS0+bGFzdEVycm9yTXNnKCkpOwotICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAg ICAgfQogCiAgICAgdHJhbnNhY3Rpb24uY29tbWl0KCk7CiAKICAgICBMT0coU2VydmljZVdvcmtl ciwgIlVwZGF0ZWQgU2VydmljZVdvcmtlciByZWdpc3RyYXRpb24gZGF0YWJhc2UgKCV6dSBhZGRl ZC91cGRhdGVkIHJlZ2lzdHJhdGlvbnMgYW5kICV6dSByZW1vdmVkIHJlZ2lzdHJhdGlvbnMiLCB1 cGRhdGVkUmVnaXN0cmF0aW9ucy5zaXplKCksIHJlbW92ZWRSZWdpc3RyYXRpb25zLnNpemUoKSk7 CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIFN0cmluZyBSZWdpc3RyYXRpb25EYXRhYmFzZTo6aW1w b3J0UmVjb3JkcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uv c2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3Nl cnZpY2Uvc2VydmVyL1JlZ2lzdHJhdGlvbkRhdGFiYXNlLmgKaW5kZXggYjFkNmNjM2NkODFkOGRh YWI2MDQ5MmNhODJhMzAxNzJhMjdlNTNjNC4uN2YyYmY5ZTI1YzQ0NDU5ZDVhOGViOTkzNDM0Y2Q1 M2RiMGRjOTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3Nl cnZlci9SZWdpc3RyYXRpb25EYXRhYmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv c2VydmljZS9zZXJ2ZXIvUmVnaXN0cmF0aW9uRGF0YWJhc2UuaApAQCAtNjEsMTQgKzYxLDE1IEBA IHByaXZhdGU6CiAgICAgCiAgICAgU3RyaW5nIGRhdGFiYXNlRGlyZWN0b3J5SXNvbGF0ZWRDb3B5 KCkgY29uc3QgeyByZXR1cm4gbV9kYXRhYmFzZURpcmVjdG9yeS5pc29sYXRlZENvcHkoKTsgfQog CisgICAgdm9pZCBzY2hlZHVsZVB1c2hDaGFuZ2VzKFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4 dERhdGE+JiYsIFZlY3RvcjxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5PiYmLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHZvaWQgcG9zdFRhc2tUb1dvcmtRdWV1ZShGdW5j dGlvbjx2b2lkKCk+JiYpOwogCiAgICAgLy8gTWV0aG9kcyB0byBiZSBydW4gb24gdGhlIHdvcmsg cXVldWUuCi0gICAgdm9pZCBvcGVuU1FMaXRlRGF0YWJhc2UoY29uc3QgU3RyaW5nJiBmdWxsRmls ZW5hbWUpOworICAgIGJvb2wgb3BlblNRTGl0ZURhdGFiYXNlKGNvbnN0IFN0cmluZyYgZnVsbEZp bGVuYW1lKTsKICAgICBTdHJpbmcgZW5zdXJlVmFsaWRSZWNvcmRzVGFibGUoKTsKICAgICBTdHJp bmcgaW1wb3J0UmVjb3JkcygpOwogICAgIHZvaWQgaW1wb3J0UmVjb3Jkc0lmTmVjZXNzYXJ5KCk7 Ci0gICAgdm9pZCBkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4 dERhdGE+JiwgY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+Jik7Cisg ICAgYm9vbCBkb1B1c2hDaGFuZ2VzKGNvbnN0IFZlY3RvcjxTZXJ2aWNlV29ya2VyQ29udGV4dERh dGE+JiwgY29uc3QgVmVjdG9yPFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXk+Jik7CiAgICAg dm9pZCBkb0NsZWFyT3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luJik7CiAKICAgICAvLyBSZXBs aWVzIHRvIHRoZSBtYWluIHRocmVhZC4KQEAgLTgxLDYgKzgyLDcgQEAgcHJpdmF0ZToKICAgICBT dHJpbmcgbV9kYXRhYmFzZURpcmVjdG9yeTsKICAgICBTdHJpbmcgbV9kYXRhYmFzZUZpbGVQYXRo OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxTUUxpdGVEYXRhYmFzZT4gbV9kYXRhYmFzZTsKKyAgICB1 aW50NjRfdCBtX3B1c2hDb3VudGVyIHsgMCB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVy LmNwcAppbmRleCBkODNmODY2NWI2NTVjNTllMTBjZmZlYzg0MjkzNWQ4ZTY1MmQ4NGMwLi4xNjQ2 YjFmYjdlZGJjY2Q2OWMzNzEyNTg3ZDYwMDYyMDc1Zjc3YThmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcApAQCAtMTQ5LDYgKzE0 OSw3IEBAIHZvaWQgU1dTZXJ2ZXI6OndoZW5JbXBvcnRJc0NvbXBsZXRlZChDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiYgY2FsbGJhY2spCiAKIHZvaWQgU1dTZXJ2ZXI6OnJlZ2lzdHJhdGlvblN0 b3JlRGF0YWJhc2VGYWlsZWRUb09wZW4oKQogeworICAgIEFTU0VSVCghbV9pbXBvcnRDb21wbGV0 ZWQpOwogICAgIGlmICghbV9pbXBvcnRDb21wbGV0ZWQpCiAgICAgICAgIHJlZ2lzdHJhdGlvblN0 b3JlSW1wb3J0Q29tcGxldGUoKTsKIH0K