225429 2021-05-05 18:40:36 -0700 Fix potential races in AppleLanguagesTest.UpdateAppleLanguages API test 2021-05-10 09:39:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222825 InRadar P2 Normal --- 1 cdumez cdumez achristensen ap darin ggaren pvollan webkit-bug-importer oldest_to_newest 1757214 0 cdumez 2021-05-05 18:40:36 -0700 Fix potential race in AppleLanguagesTest.UpdateAppleLanguages API test. 1757215 1 427837 cdumez 2021-05-05 18:45:36 -0700 Created attachment 427837 Patch 1757226 2 427839 cdumez 2021-05-05 19:19:18 -0700 Created attachment 427839 Patch 1757227 3 427840 cdumez 2021-05-05 19:22:20 -0700 Created attachment 427840 Patch 1757229 4 427841 cdumez 2021-05-05 19:45:19 -0700 Created attachment 427841 Patch 1757236 5 427845 cdumez 2021-05-05 20:17:53 -0700 Created attachment 427845 Patch 1757237 6 427845 achristensen 2021-05-05 20:24:29 -0700 Comment on attachment 427845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427845&action=review > Tools/TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm:61 > // FIXME: This test is currently disabled on Apple Silicon because it times out there (https://bugs.webkit.org/show_bug.cgi?id=222619). Is it possible this is fixed too? 1757239 7 cdumez 2021-05-05 20:29:26 -0700 (In reply to Alex Christensen from comment #6) > Comment on attachment 427845 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=427845&action=review > > > Tools/TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm:61 > > // FIXME: This test is currently disabled on Apple Silicon because it times out there (https://bugs.webkit.org/show_bug.cgi?id=222619). > > Is it possible this is fixed too? Well this is what I am trying to fix but so far no success. 1757241 8 cdumez 2021-05-05 20:30:20 -0700 (In reply to Chris Dumez from comment #7) > (In reply to Alex Christensen from comment #6) > > Comment on attachment 427845 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=427845&action=review > > > > > Tools/TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm:61 > > > // FIXME: This test is currently disabled on Apple Silicon because it times out there (https://bugs.webkit.org/show_bug.cgi?id=222619). > > > > Is it possible this is fixed too? > > Well this is what I am trying to fix but so far no success. That is why I related the bugs but did not claim to have fixed the other one. 1758496 9 428172 cdumez 2021-05-10 08:38:00 -0700 Created attachment 428172 Patch 1758519 10 ews-feeder 2021-05-10 09:38:09 -0700 Committed r277267 (237534@main): <https://commits.webkit.org/237534@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428172. 1758520 11 webkit-bug-importer 2021-05-10 09:39:17 -0700 <rdar://problem/77752526> 427837 2021-05-05 18:45:36 -0700 2021-05-05 19:19:16 -0700 Patch bug-225429-20210505184535.patch text/plain 3403 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIwYjcyM2FmZmI2NzMyNWQyNDZlMDMzZmEyMjc3Mzc5 OTRlYTVjNC4uZmYwYTk1MmIxNTY4MjUzZDlkY2M2YmFjNmU5MDgxYTc5YmE4Yzk3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIxLTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IHBvdGVudGlhbCByYWNlIGluIEFwcGxlTGFuZ3VhZ2VzVGVzdC5VcGRhdGVBcHBsZUxh bmd1YWdlcyBBUEkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1NDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ2FsbGluZyBbVGVzdFdLV2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdBbnlN ZXNzYWdlXSByZWdpc3RlcnMgYSBNZXNzYWdlSGFuZGxlciB3aGljaCBzZW5kcyBhbgorICAgICAg ICBhc3luYyBXZWJVc2VyQ29udGVudENvbnRyb2xsZXI6OkFkZFVzZXJTY3JpcHRNZXNzYWdlSGFu ZGxlcnMgSVBDIHRvIHRoZSBXZWJQcm9jZXNzLiBXZSB3YW50IHRvCisgICAgICAgIG1ha2Ugc3Vy ZSB0aGF0IHRoYXQgbWVzc2FnZSBoYW5kbGVyIGlzIHJlZ2lzdGVyZWQgaW4gdGhlIFdlYlByb2Nl c3MgYmVmb3JlIHRoZSBKUyBvbiB0aGUgcGFnZQorICAgICAgICBjYWxscyBgd2Via2l0Lm1lc3Nh Z2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgpYC4gVG8gYWRkcmVzcyB0aGlzIGlz c3VlLCBJIG1vdmVkIHRoZQorICAgICAgICBjYWxsIHRvIGBbVGVzdFdLV2ViVmlldyBwZXJmb3Jt QWZ0ZXJSZWNlaXZpbmdBbnlNZXNzYWdlXWAgYmVmb3JlIHRoZSBjYWxsIHRvIGV2YWx1YXRlSmF2 YVNjcmlwdAorICAgICAgICB0aGF0IHJlZ2lzdGVycyB0aGUgZXZlbnQgbGlzdGVuZXIgdGhhdCBt YXkgY2FsbCBgd2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgp YC4KKworICAgICAgICBJIGFtIGFsc28gYWRkaW5nIGFuIGV4dHJhIGNoZWNrIGF0IHRoZSBlbmQg dG8gbWFrZSBzdXJlIHRoYXQgdGhlIHZhbHVlIG9mIG5hdmlnYXRvci5sYW5ndWFnZSBpcworICAg ICAgICBjb3JyZWN0LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3Zl cnJpZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW06CisgICAgICAgIChURVNUX0YpOgorCiAy MDIxLTA1LTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBT YW1wbGVkIFBhZ2UgVG9wIENvbG9yOiBkb24ndCBzbmFwc2hvdCBpZiB0aGUgaGl0IHRlc3QgbG9j YXRpb24gaXMgYW4gaW1hZ2Ugb3IgaGFzIGFuIGFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJpZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVu Y2UubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9PdmVycmlkZUFwcGxlTGFu Z3VhZ2VzUHJlZmVyZW5jZS5tbQppbmRleCA1YWM5MGQ4OTdjZDVlOWM0MDBlZWEwMDA5NWQ1MzU1 MTA0YzQ2Nzc2Li4yZWU5YzljM2RlMDZiZWFmNGZhOWVhNWJlZWQ5NGQzMTg5Mzg5OTdjIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9PdmVycmlkZUFwcGxlTGFu Z3VhZ2VzUHJlZmVyZW5jZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9PdmVycmlkZUFwcGxlTGFuZ3VhZ2VzUHJlZmVyZW5jZS5tbQpAQCAtMTA0LDEzICsxMDQsNiBA QCBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykKICAgICBF WFBFQ1RfV0tfU1RSRVEoQCJlbi1nYiIsIHByZWZlcnJlZExhbmd1YWdlKCkpOwogCiAgICAgX19i bG9jayBib29sIGRvbmUgPSBmYWxzZTsKLSAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6 QCJvbmxhbmd1YWdlY2hhbmdlID0gKCkgPT4geyB3ZWJraXQubWVzc2FnZUhhbmRsZXJzLnRlc3RI YW5kbGVyLnBvc3RNZXNzYWdlKG5hdmlnYXRvci5sYW5ndWFnZSk7IH07IHRydWU7IiBjb21wbGV0 aW9uSGFuZGxlcjpeKGlkIHZhbHVlLCBOU0Vycm9yICplcnJvcikgewotICAgICAgICBFWFBFQ1Rf VFJVRSghZXJyb3IpOwotICAgICAgICBkb25lID0gdHJ1ZTsKLSAgICB9XTsKLSAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwotCi0gICAgZG9uZSA9IGZhbHNlOwogICAgIF9fYmxv Y2sgYm9vbCBkaWRDaGFuZ2VMYW5ndWFnZSA9IGZhbHNlOwogICAgIFt3ZWJWaWV3IHBlcmZvcm1B ZnRlclJlY2VpdmluZ0FueU1lc3NhZ2U6XihOU1N0cmluZyAqbmV3TGFuZ3VhZ2UpIHsKICAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKEAiZW4tdXMiLCBuZXdMYW5ndWFnZSk7CkBAIC0xMTgsNiArMTEx LDEzIEBAIFRFU1RfRihBcHBsZUxhbmd1YWdlc1Rlc3QsIFVwZGF0ZUFwcGxlTGFuZ3VhZ2VzKQog ICAgICAgICBkb25lID0gdHJ1ZTsKICAgICB9XTsKIAorICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2 YVNjcmlwdDpAIm9ubGFuZ3VhZ2VjaGFuZ2UgPSAoKSA9PiB7IHdlYmtpdC5tZXNzYWdlSGFuZGxl cnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UobmF2aWdhdG9yLmxhbmd1YWdlKTsgfTsgdHJ1ZTsi IGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgdmFsdWUsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAg IEVYUEVDVF9UUlVFKCFlcnJvcik7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCiAg ICAgLy8gU3dpdGNoIHN5c3RlbSBsYW5ndWFnZSBmcm9tICJlbi1HQiIgdG8gImVuLVVTIi4gTWFr ZSBzdXJlIHRoYXQgd2UgZmlyZSBhIGxhbmd1YWdlY2hhbmdlIGV2ZW50IGF0IHRoZSBXaW5kb3cg YW5kIHRoYXQgbmF2aWdhdG9yLmxhbmd1YWdlCiAgICAgLy8gbm93IHJlcG9ydHMgImVuLWdiIi4K ICAgICBzeXN0ZW0oW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkZWZhdWx0cyB3cml0ZSBO U0dsb2JhbERvbWFpbiBBcHBsZUxhbmd1YWdlcyAnKFwiZW4tVVNcIiknIl0uVVRGOFN0cmluZyk7 CkBAIC0xMzAsNSArMTMwLDYgQEAgVEVTVF9GKEFwcGxlTGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBw bGVMYW5ndWFnZXMpCiAKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwogICAg IEVYUEVDVF9UUlVFKGRpZENoYW5nZUxhbmd1YWdlKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJl bi11cyIsIHByZWZlcnJlZExhbmd1YWdlKCkpOwogfQogI2VuZGlmCg== 427839 2021-05-05 19:19:18 -0700 2021-05-05 19:22:18 -0700 Patch bug-225429-20210505191917.patch text/plain 5418 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIwYjcyM2FmZmI2NzMyNWQyNDZlMDMzZmEyMjc3Mzc5 OTRlYTVjNC4uY2M1M2JmYzJiZTBkY2RkZmNhNzU3YzdlZGJmMzA5NmZhNjUxNDhhZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IHBvdGVudGlhbCByYWNlIGluIEFwcGxlTGFuZ3VhZ2VzVGVzdC5VcGRhdGVBcHBsZUxh bmd1YWdlcyBBUEkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1NDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ2FsbGluZyBbVGVzdFdLV2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdBbnlN ZXNzYWdlXSByZWdpc3RlcnMgYSBNZXNzYWdlSGFuZGxlciB3aGljaCBzZW5kcyBhbgorICAgICAg ICBhc3luYyBXZWJVc2VyQ29udGVudENvbnRyb2xsZXI6OkFkZFVzZXJTY3JpcHRNZXNzYWdlSGFu ZGxlcnMgSVBDIHRvIHRoZSBXZWJQcm9jZXNzLiBXZSB3YW50IHRvCisgICAgICAgIG1ha2Ugc3Vy ZSB0aGF0IHRoYXQgbWVzc2FnZSBoYW5kbGVyIGlzIHJlZ2lzdGVyZWQgaW4gdGhlIFdlYlByb2Nl c3MgYmVmb3JlIHRoZSBKUyBvbiB0aGUgcGFnZQorICAgICAgICBjYWxscyBgd2Via2l0Lm1lc3Nh Z2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgpYC4gVG8gYWRkcmVzcyB0aGlzIGlz c3VlLCBJIG1vdmVkIHRoZQorICAgICAgICBjYWxsIHRvIGBbVGVzdFdLV2ViVmlldyBwZXJmb3Jt QWZ0ZXJSZWNlaXZpbmdBbnlNZXNzYWdlXWAgYmVmb3JlIHRoZSBjYWxsIHRvIGV2YWx1YXRlSmF2 YVNjcmlwdAorICAgICAgICB0aGF0IHJlZ2lzdGVycyB0aGUgZXZlbnQgbGlzdGVuZXIgdGhhdCBt YXkgY2FsbCBgd2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgp YC4KKworICAgICAgICBBbHNvIG1ha2Ugc3VyZSB0aGUgUHJlZmVyZW5jZU9ic2VydmVyIGhhcyBi ZWVuIGFsbG9jYXRlZCBhZnRlciBzZW5kaW5nIHRoZQorICAgICAgICAiTlNBcHBsaWNhdGlvbkRp ZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbiIgYW5kIGJlZm9yZSBwcm9jZWVkaW5nIHdpdGggdGhl IHRlc3QuCisKKyAgICAgICAgSSBhbSBhbHNvIGFkZGluZyBhbiBleHRyYSBjaGVjayBhdCB0aGUg ZW5kIHRvIG1ha2Ugc3VyZSB0aGF0IHRoZSB2YWx1ZSBvZiBuYXZpZ2F0b3IubGFuZ3VhZ2UgaXMK KyAgICAgICAgY29ycmVjdC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tOgorICAgICAgICAoVEVTVF9GKToK KwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogZG9uJ3Qgc25hcHNob3QgaWYgdGhlIGhpdCB0ZXN0 IGxvY2F0aW9uIGlzIGFuIGltYWdlIG9yIGhhcyBhbiBhbmltYXRpb24KZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVm ZXJlbmNlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJpZGVBcHBs ZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KaW5kZXggNWFjOTBkODk3Y2Q1ZTljNDAwZWVhMDAwOTVk NTM1NTEwNGM0Njc3Ni4uOTY0OTIzZThkMDllODVlYjAxYWEzN2EyOWJkMjRlOTgwMWRmMWNmYiAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJpZGVBcHBs ZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQvT3ZlcnJpZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KQEAgLTI5LDYgKzI5LDgg QEAKIAogI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3RXS1dlYlZp ZXcuaCIKKyNpbXBvcnQgPFdlYktpdC9QcmVmZXJlbmNlT2JzZXJ2ZXIuaD4KKyNpbXBvcnQgPHd0 Zi9PYmpDUnVudGltZUV4dHJhcy5oPgogI2ltcG9ydCA8d3RmL2NvY29hL1ZlY3RvckNvY29hLmg+ CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKQEAgLTg2LDggKzg4LDI0IEBA IHByaXZhdGU6CiAgICAgU3RyaW5nIG1fc2F2ZWRBcHBsZUxhbmd1YWdlczsKIH07CiAKK3N0YXRp YyBJTVAgc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCA9IG5pbDsKK3N0YXRpYyBib29sIHBy ZWZlcmVuY2VPYnNlcnZlclNoYXJlZEluc3RhbmNlQ2FsbGVkID0gZmFsc2U7CisKK3N0YXRpYyBX S1ByZWZlcmVuY2VPYnNlcnZlciAqc2hhcmVkSW5zdGFuY2VNZXRob2RPdmVycmlkZShpZCBzZWxm LCBTRUwgc2VsZWN0b3IpCit7CisgICAgV0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKm9ic2VydmVyID0g d3RmQ2FsbElNUDxXS1ByZWZlcmVuY2VPYnNlcnZlciAqPihzaGFyZWRJbnN0YW5jZU1ldGhvZE9y aWdpbmFsLCBzZWxmLCBzZWxlY3Rvcik7CisgICAgcHJlZmVyZW5jZU9ic2VydmVyU2hhcmVkSW5z dGFuY2VDYWxsZWQgPSB0cnVlOworICAgIHJldHVybiBvYnNlcnZlcjsKK30KKwogVEVTVF9GKEFw cGxlTGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBwbGVMYW5ndWFnZXMpCiB7CisgICAgcHJlZmVyZW5j ZU9ic2VydmVyU2hhcmVkSW5zdGFuY2VDYWxsZWQgPSBmYWxzZTsKKyAgICBNZXRob2Qgc2hhcmVk SW5zdGFuY2VNZXRob2QgPSBjbGFzc19nZXRDbGFzc01ldGhvZChvYmpjX2dldENsYXNzKCJXS1By ZWZlcmVuY2VPYnNlcnZlciIpLCBAc2VsZWN0b3Ioc2hhcmVkSW5zdGFuY2UpKTsKKyAgICBBU1NF UlQoc2hhcmVkSW5zdGFuY2VNZXRob2QpOworICAgIHNoYXJlZEluc3RhbmNlTWV0aG9kT3JpZ2lu YWwgPSBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2hhcmVkSW5zdGFuY2VNZXRob2QsIChJTVAp c2hhcmVkSW5zdGFuY2VNZXRob2RPdmVycmlkZSk7CisgICAgQVNTRVJUKHNoYXJlZEluc3RhbmNl TWV0aG9kT3JpZ2luYWwpOworCiAgICAgLy8gVGVzdHMgdXNlcyAiZW4tR0IiIGxhbmd1YWdlIGlu aXRpYWxseS4KICAgICBzeXN0ZW0oW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkZWZhdWx0 cyB3cml0ZSBOU0dsb2JhbERvbWFpbiBBcHBsZUxhbmd1YWdlcyAnKFwiZW4tR0JcIiknIl0uVVRG OFN0cmluZyk7CiAKQEAgLTk3LDYgKzExNSw3IEBAIFRFU1RfRihBcHBsZUxhbmd1YWdlc1Rlc3Qs IFVwZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogCiAgICAgLy8gV2Ugb25seSBsaXN0ZW4gZm9yIHByZWZl cmVuY2UgY2hhbmdlcyB3aGVuIHRoZSBhcHBsaWNhdGlvbiBpcyBhY3RpdmUuCiAgICAgW1tOU05v dGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBwb3N0Tm90aWZpY2F0aW9uTmFtZTpOU0Fw cGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcCB1c2VySW5m bzpuaWxdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcHJlZmVyZW5jZU9ic2VydmVy U2hhcmVkSW5zdGFuY2VDYWxsZWQpOwogCiAgICAgYXV0byBwcmVmZXJyZWRMYW5ndWFnZSA9IFsm XSB7CiAgICAgICAgIHJldHVybiBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0 OkAibmF2aWdhdG9yLmxhbmd1YWdlIl07CkBAIC0xMDQsMTMgKzEyMyw2IEBAIFRFU1RfRihBcHBs ZUxhbmd1YWdlc1Rlc3QsIFVwZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogICAgIEVYUEVDVF9XS19TVFJF UShAImVuLWdiIiwgcHJlZmVycmVkTGFuZ3VhZ2UoKSk7CiAKICAgICBfX2Jsb2NrIGJvb2wgZG9u ZSA9IGZhbHNlOwotICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAIm9ubGFuZ3VhZ2Vj aGFuZ2UgPSAoKSA9PiB7IHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1l c3NhZ2UobmF2aWdhdG9yLmxhbmd1YWdlKTsgfTsgdHJ1ZTsiIGNvbXBsZXRpb25IYW5kbGVyOl4o aWQgdmFsdWUsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAgICAgIEVYUEVDVF9UUlVFKCFlcnJvcik7 Ci0gICAgICAgIGRvbmUgPSB0cnVlOwotICAgIH1dOwotICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6 OnJ1bigmZG9uZSk7Ci0KLSAgICBkb25lID0gZmFsc2U7CiAgICAgX19ibG9jayBib29sIGRpZENo YW5nZUxhbmd1YWdlID0gZmFsc2U7CiAgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5n QW55TWVzc2FnZTpeKE5TU3RyaW5nICpuZXdMYW5ndWFnZSkgewogICAgICAgICBFWFBFQ1RfV0tf U1RSRVEoQCJlbi11cyIsIG5ld0xhbmd1YWdlKTsKQEAgLTExOCw2ICsxMzAsMTMgQEAgVEVTVF9G KEFwcGxlTGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBwbGVMYW5ndWFnZXMpCiAgICAgICAgIGRvbmUg PSB0cnVlOwogICAgIH1dOwogCisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAib25s YW5ndWFnZWNoYW5nZSA9ICgpID0+IHsgd2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxl ci5wb3N0TWVzc2FnZShuYXZpZ2F0b3IubGFuZ3VhZ2UpOyB9OyB0cnVlOyIgY29tcGxldGlvbkhh bmRsZXI6XihpZCB2YWx1ZSwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgRVhQRUNUX1RSVUUo IWVycm9yKTsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQ STo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKICAgICAvLyBTd2l0Y2gg c3lzdGVtIGxhbmd1YWdlIGZyb20gImVuLUdCIiB0byAiZW4tVVMiLiBNYWtlIHN1cmUgdGhhdCB3 ZSBmaXJlIGEgbGFuZ3VhZ2VjaGFuZ2UgZXZlbnQgYXQgdGhlIFdpbmRvdyBhbmQgdGhhdCBuYXZp Z2F0b3IubGFuZ3VhZ2UKICAgICAvLyBub3cgcmVwb3J0cyAiZW4tZ2IiLgogICAgIHN5c3RlbShb TlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImRlZmF1bHRzIHdyaXRlIE5TR2xvYmFsRG9tYWlu IEFwcGxlTGFuZ3VhZ2VzICcoXCJlbi1VU1wiKSciXS5VVEY4U3RyaW5nKTsKQEAgLTEzMCw1ICsx NDksOCBAQCBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykK IAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CiAgICAgRVhQRUNUX1RSVUUo ZGlkQ2hhbmdlTGFuZ3VhZ2UpOworICAgIEVYUEVDVF9XS19TVFJFUShAImVuLXVzIiwgcHJlZmVy cmVkTGFuZ3VhZ2UoKSk7CisKKyAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2hhcmVkSW5z dGFuY2VNZXRob2QsIChJTVApc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCk7CiB9CiAjZW5k aWYK 427840 2021-05-05 19:22:20 -0700 2021-05-05 19:45:17 -0700 Patch bug-225429-20210505192220.patch text/plain 5613 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIwYjcyM2FmZmI2NzMyNWQyNDZlMDMzZmEyMjc3Mzc5 OTRlYTVjNC4uY2M1M2JmYzJiZTBkY2RkZmNhNzU3YzdlZGJmMzA5NmZhNjUxNDhhZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IHBvdGVudGlhbCByYWNlIGluIEFwcGxlTGFuZ3VhZ2VzVGVzdC5VcGRhdGVBcHBsZUxh bmd1YWdlcyBBUEkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1NDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ2FsbGluZyBbVGVzdFdLV2ViVmlldyBwZXJmb3JtQWZ0ZXJSZWNlaXZpbmdBbnlN ZXNzYWdlXSByZWdpc3RlcnMgYSBNZXNzYWdlSGFuZGxlciB3aGljaCBzZW5kcyBhbgorICAgICAg ICBhc3luYyBXZWJVc2VyQ29udGVudENvbnRyb2xsZXI6OkFkZFVzZXJTY3JpcHRNZXNzYWdlSGFu ZGxlcnMgSVBDIHRvIHRoZSBXZWJQcm9jZXNzLiBXZSB3YW50IHRvCisgICAgICAgIG1ha2Ugc3Vy ZSB0aGF0IHRoYXQgbWVzc2FnZSBoYW5kbGVyIGlzIHJlZ2lzdGVyZWQgaW4gdGhlIFdlYlByb2Nl c3MgYmVmb3JlIHRoZSBKUyBvbiB0aGUgcGFnZQorICAgICAgICBjYWxscyBgd2Via2l0Lm1lc3Nh Z2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgpYC4gVG8gYWRkcmVzcyB0aGlzIGlz c3VlLCBJIG1vdmVkIHRoZQorICAgICAgICBjYWxsIHRvIGBbVGVzdFdLV2ViVmlldyBwZXJmb3Jt QWZ0ZXJSZWNlaXZpbmdBbnlNZXNzYWdlXWAgYmVmb3JlIHRoZSBjYWxsIHRvIGV2YWx1YXRlSmF2 YVNjcmlwdAorICAgICAgICB0aGF0IHJlZ2lzdGVycyB0aGUgZXZlbnQgbGlzdGVuZXIgdGhhdCBt YXkgY2FsbCBgd2Via2l0Lm1lc3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgp YC4KKworICAgICAgICBBbHNvIG1ha2Ugc3VyZSB0aGUgUHJlZmVyZW5jZU9ic2VydmVyIGhhcyBi ZWVuIGFsbG9jYXRlZCBhZnRlciBzZW5kaW5nIHRoZQorICAgICAgICAiTlNBcHBsaWNhdGlvbkRp ZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbiIgYW5kIGJlZm9yZSBwcm9jZWVkaW5nIHdpdGggdGhl IHRlc3QuCisKKyAgICAgICAgSSBhbSBhbHNvIGFkZGluZyBhbiBleHRyYSBjaGVjayBhdCB0aGUg ZW5kIHRvIG1ha2Ugc3VyZSB0aGF0IHRoZSB2YWx1ZSBvZiBuYXZpZ2F0b3IubGFuZ3VhZ2UgaXMK KyAgICAgICAgY29ycmVjdC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tOgorICAgICAgICAoVEVTVF9GKToK KwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogZG9uJ3Qgc25hcHNob3QgaWYgdGhlIGhpdCB0ZXN0 IGxvY2F0aW9uIGlzIGFuIGltYWdlIG9yIGhhcyBhbiBhbmltYXRpb24KZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVm ZXJlbmNlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJpZGVBcHBs ZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KaW5kZXggNWFjOTBkODk3Y2Q1ZTljNDAwZWVhMDAwOTVk NTM1NTEwNGM0Njc3Ni4uMDM5Y2ZmMGI3MzdhZjA2MWM0NzQ0Y2IxY2UzOWE1NGFkODFhYjUwNiAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJpZGVBcHBs ZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQvT3ZlcnJpZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KQEAgLTI5LDYgKzI5LDgg QEAKIAogI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3RXS1dlYlZp ZXcuaCIKKyNpbXBvcnQgPFdlYktpdC9QcmVmZXJlbmNlT2JzZXJ2ZXIuaD4KKyNpbXBvcnQgPHd0 Zi9PYmpDUnVudGltZUV4dHJhcy5oPgogI2ltcG9ydCA8d3RmL2NvY29hL1ZlY3RvckNvY29hLmg+ CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKQEAgLTg2LDggKzg4LDI0IEBA IHByaXZhdGU6CiAgICAgU3RyaW5nIG1fc2F2ZWRBcHBsZUxhbmd1YWdlczsKIH07CiAKK3N0YXRp YyBJTVAgc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCA9IG5pbDsKK3N0YXRpYyBib29sIHBy ZWZlcmVuY2VPYnNlcnZlclNoYXJlZEluc3RhbmNlQ2FsbGVkID0gZmFsc2U7CisKK3N0YXRpYyBX S1ByZWZlcmVuY2VPYnNlcnZlciAqc2hhcmVkSW5zdGFuY2VNZXRob2RPdmVycmlkZShpZCBzZWxm LCBTRUwgc2VsZWN0b3IpCit7CisgICAgV0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKm9ic2VydmVyID0g d3RmQ2FsbElNUDxXS1ByZWZlcmVuY2VPYnNlcnZlciAqPihzaGFyZWRJbnN0YW5jZU1ldGhvZE9y aWdpbmFsLCBzZWxmLCBzZWxlY3Rvcik7CisgICAgcHJlZmVyZW5jZU9ic2VydmVyU2hhcmVkSW5z dGFuY2VDYWxsZWQgPSB0cnVlOworICAgIHJldHVybiBvYnNlcnZlcjsKK30KKwogVEVTVF9GKEFw cGxlTGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBwbGVMYW5ndWFnZXMpCiB7CisgICAgcHJlZmVyZW5j ZU9ic2VydmVyU2hhcmVkSW5zdGFuY2VDYWxsZWQgPSBmYWxzZTsKKyAgICBNZXRob2Qgc2hhcmVk SW5zdGFuY2VNZXRob2QgPSBjbGFzc19nZXRDbGFzc01ldGhvZChvYmpjX2dldENsYXNzKCJXS1By ZWZlcmVuY2VPYnNlcnZlciIpLCBAc2VsZWN0b3Ioc2hhcmVkSW5zdGFuY2UpKTsKKyAgICBBU1NF UlQoc2hhcmVkSW5zdGFuY2VNZXRob2QpOworICAgIHNoYXJlZEluc3RhbmNlTWV0aG9kT3JpZ2lu YWwgPSBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2hhcmVkSW5zdGFuY2VNZXRob2QsIChJTVAp c2hhcmVkSW5zdGFuY2VNZXRob2RPdmVycmlkZSk7CisgICAgQVNTRVJUKHNoYXJlZEluc3RhbmNl TWV0aG9kT3JpZ2luYWwpOworCiAgICAgLy8gVGVzdHMgdXNlcyAiZW4tR0IiIGxhbmd1YWdlIGlu aXRpYWxseS4KICAgICBzeXN0ZW0oW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkZWZhdWx0 cyB3cml0ZSBOU0dsb2JhbERvbWFpbiBBcHBsZUxhbmd1YWdlcyAnKFwiZW4tR0JcIiknIl0uVVRG OFN0cmluZyk7CiAKQEAgLTk3LDYgKzExNSwxMiBAQCBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0 LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykKIAogICAgIC8vIFdlIG9ubHkgbGlzdGVuIGZvciBwcmVm ZXJlbmNlIGNoYW5nZXMgd2hlbiB0aGUgYXBwbGljYXRpb24gaXMgYWN0aXZlLgogICAgIFtbTlNO b3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6TlNB cHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbiBvYmplY3Q6TlNBcHAgdXNlcklu Zm86bmlsXTsKKyAgICB1bnNpZ25lZCB0aW1lb3V0ID0gMDsKKyAgICB3aGlsZSAoIXByZWZlcmVu Y2VPYnNlcnZlclNoYXJlZEluc3RhbmNlQ2FsbGVkICYmICsrdGltZW91dCA8IDEwMCkKKyAgICAg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c2xlZXAoMC4xKTsKKyAgICBFWFBFQ1RfVFJVRShwcmVm ZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCk7CisgICAgaWYgKCFwcmVmZXJlbmNl T2JzZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0 byBwcmVmZXJyZWRMYW5ndWFnZSA9IFsmXSB7CiAgICAgICAgIHJldHVybiBbd2ViVmlldyBzdHJp bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAibmF2aWdhdG9yLmxhbmd1YWdlIl07CkBAIC0xMDQs MTMgKzEyOCw2IEBAIFRFU1RfRihBcHBsZUxhbmd1YWdlc1Rlc3QsIFVwZGF0ZUFwcGxlTGFuZ3Vh Z2VzKQogICAgIEVYUEVDVF9XS19TVFJFUShAImVuLWdiIiwgcHJlZmVycmVkTGFuZ3VhZ2UoKSk7 CiAKICAgICBfX2Jsb2NrIGJvb2wgZG9uZSA9IGZhbHNlOwotICAgIFt3ZWJWaWV3IGV2YWx1YXRl SmF2YVNjcmlwdDpAIm9ubGFuZ3VhZ2VjaGFuZ2UgPSAoKSA9PiB7IHdlYmtpdC5tZXNzYWdlSGFu ZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UobmF2aWdhdG9yLmxhbmd1YWdlKTsgfTsgdHJ1 ZTsiIGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgdmFsdWUsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAg ICAgIEVYUEVDVF9UUlVFKCFlcnJvcik7Ci0gICAgICAgIGRvbmUgPSB0cnVlOwotICAgIH1dOwot ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Ci0KLSAgICBkb25lID0gZmFsc2U7 CiAgICAgX19ibG9jayBib29sIGRpZENoYW5nZUxhbmd1YWdlID0gZmFsc2U7CiAgICAgW3dlYlZp ZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nQW55TWVzc2FnZTpeKE5TU3RyaW5nICpuZXdMYW5ndWFn ZSkgewogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlbi11cyIsIG5ld0xhbmd1YWdlKTsKQEAg LTExOCw2ICsxMzUsMTMgQEAgVEVTVF9GKEFwcGxlTGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBwbGVM YW5ndWFnZXMpCiAgICAgICAgIGRvbmUgPSB0cnVlOwogICAgIH1dOwogCisgICAgW3dlYlZpZXcg ZXZhbHVhdGVKYXZhU2NyaXB0OkAib25sYW5ndWFnZWNoYW5nZSA9ICgpID0+IHsgd2Via2l0Lm1l c3NhZ2VIYW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZShuYXZpZ2F0b3IubGFuZ3VhZ2Up OyB9OyB0cnVlOyIgY29tcGxldGlvbkhhbmRsZXI6XihpZCB2YWx1ZSwgTlNFcnJvciAqZXJyb3Ip IHsKKyAgICAgICAgRVhQRUNUX1RSVUUoIWVycm9yKTsKKyAgICAgICAgZG9uZSA9IHRydWU7Cisg ICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0g ZmFsc2U7CisKICAgICAvLyBTd2l0Y2ggc3lzdGVtIGxhbmd1YWdlIGZyb20gImVuLUdCIiB0byAi ZW4tVVMiLiBNYWtlIHN1cmUgdGhhdCB3ZSBmaXJlIGEgbGFuZ3VhZ2VjaGFuZ2UgZXZlbnQgYXQg dGhlIFdpbmRvdyBhbmQgdGhhdCBuYXZpZ2F0b3IubGFuZ3VhZ2UKICAgICAvLyBub3cgcmVwb3J0 cyAiZW4tZ2IiLgogICAgIHN5c3RlbShbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImRlZmF1 bHRzIHdyaXRlIE5TR2xvYmFsRG9tYWluIEFwcGxlTGFuZ3VhZ2VzICcoXCJlbi1VU1wiKSciXS5V VEY4U3RyaW5nKTsKQEAgLTEzMCw1ICsxNTQsOCBAQCBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0 LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykKIAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm ZG9uZSk7CiAgICAgRVhQRUNUX1RSVUUoZGlkQ2hhbmdlTGFuZ3VhZ2UpOworICAgIEVYUEVDVF9X S19TVFJFUShAImVuLXVzIiwgcHJlZmVycmVkTGFuZ3VhZ2UoKSk7CisKKyAgICBtZXRob2Rfc2V0 SW1wbGVtZW50YXRpb24oc2hhcmVkSW5zdGFuY2VNZXRob2QsIChJTVApc2hhcmVkSW5zdGFuY2VN ZXRob2RPcmlnaW5hbCk7CiB9CiAjZW5kaWYK 427841 2021-05-05 19:45:19 -0700 2021-05-05 20:17:51 -0700 Patch bug-225429-20210505194518.patch text/plain 7902 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIwYjcyM2FmZmI2NzMyNWQyNDZlMDMzZmEyMjc3Mzc5 OTRlYTVjNC4uZjhjYTNjOGFjZmIzNjUwYjdmN2Q4M2I1NjI4MDBlZDY2MDUyMWQyNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IHBvdGVudGlhbCByYWNlcyBpbiBBcHBsZUxhbmd1YWdlc1Rlc3QuVXBkYXRlQXBwbGVM YW5ndWFnZXMgQVBJIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNTQyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENhbGxpbmcgW1Rlc3RXS1dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nQW55 TWVzc2FnZV0gcmVnaXN0ZXJzIGEgTWVzc2FnZUhhbmRsZXIgd2hpY2ggc2VuZHMgYW4KKyAgICAg ICAgYXN5bmMgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpBZGRVc2VyU2NyaXB0TWVzc2FnZUhh bmRsZXJzIElQQyB0byB0aGUgV2ViUHJvY2Vzcy4gV2Ugd2FudCB0bworICAgICAgICBtYWtlIHN1 cmUgdGhhdCB0aGF0IG1lc3NhZ2UgaGFuZGxlciBpcyByZWdpc3RlcmVkIGluIHRoZSBXZWJQcm9j ZXNzIGJlZm9yZSB0aGUgSlMgb24gdGhlIHBhZ2UKKyAgICAgICAgY2FsbHMgYHdlYmtpdC5tZXNz YWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoKWAuIFRvIGFkZHJlc3MgdGhpcyBp c3N1ZSwgSSBtb3ZlZCB0aGUKKyAgICAgICAgY2FsbCB0byBgW1Rlc3RXS1dlYlZpZXcgcGVyZm9y bUFmdGVyUmVjZWl2aW5nQW55TWVzc2FnZV1gIGJlZm9yZSB0aGUgY2FsbCB0byBldmFsdWF0ZUph dmFTY3JpcHQKKyAgICAgICAgdGhhdCByZWdpc3RlcnMgdGhlIGV2ZW50IGxpc3RlbmVyIHRoYXQg bWF5IGNhbGwgYHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2Uo KWAuCisKKyAgICAgICAgQWxzbyBtYWtlIHN1cmUgdGhlIFByZWZlcmVuY2VPYnNlcnZlciBoYXMg YmVlbiBhbGxvY2F0ZWQgYWZ0ZXIgc2VuZGluZyB0aGUKKyAgICAgICAgIk5TQXBwbGljYXRpb25E aWRCZWNvbWVBY3RpdmVOb3RpZmljYXRpb24iIGFuZCBiZWZvcmUgcHJvY2VlZGluZyB3aXRoIHRo ZSB0ZXN0LgorCisgICAgICAgIEkgYW0gYWxzbyBhZGRpbmcgYW4gZXh0cmEgY2hlY2sgYXQgdGhl IGVuZCB0byBtYWtlIHN1cmUgdGhhdCB0aGUgdmFsdWUgb2YgbmF2aWdhdG9yLmxhbmd1YWdlIGlz CisgICAgICAgIGNvcnJlY3QgYW5kIHRvIG1ha2Ugc3VyZSB0aGF0IFdLUHJlZmVyZW5jZU9ic2Vy dmVyLnByZWZlcmVuY2VEaWRDaGFuZ2Ugd2FzIGNhbGxlZC4gVGhpcyB3YXMgZG9uZQorICAgICAg ICB0byBoZWxwIGRpYWdub3NlIGZsYWtpbmVzcyBpc3N1ZXMgb24gdGhlIGJvdHMgdGhhdCBJIGNh bm5vdCByZXByb2R1Y2UgbG9jYWxseS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tOgorICAgICAgICAoVEVT VF9GKToKKwogMjAyMS0wNS0wNSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAK ICAgICAgICAgU2FtcGxlZCBQYWdlIFRvcCBDb2xvcjogZG9uJ3Qgc25hcHNob3QgaWYgdGhlIGhp dCB0ZXN0IGxvY2F0aW9uIGlzIGFuIGltYWdlIG9yIGhhcyBhbiBhbmltYXRpb24KZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L092ZXJyaWRlQXBwbGVMYW5ndWFn ZXNQcmVmZXJlbmNlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJp ZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KaW5kZXggNWFjOTBkODk3Y2Q1ZTljNDAwZWVh MDAwOTVkNTM1NTEwNGM0Njc3Ni4uMzVmNWQyYjdjODQyMTljMzdkOTU1MDQwNzEwNzEyNTE1MDUy Y2Q0YSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJp ZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQvT3ZlcnJpZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0KQEAgLTI5LDYg KzI5LDggQEAKIAogI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKICNpbXBvcnQgIlRlc3RX S1dlYlZpZXcuaCIKKyNpbXBvcnQgPFdlYktpdC9QcmVmZXJlbmNlT2JzZXJ2ZXIuaD4KKyNpbXBv cnQgPHd0Zi9PYmpDUnVudGltZUV4dHJhcy5oPgogI2ltcG9ydCA8d3RmL2NvY29hL1ZlY3RvckNv Y29hLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKQEAgLTU3LDcgKzU5 LDcgQEAgVEVTVChXZWJLaXQsIE92ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlKQogLy8g T24gb2xkZXIgbWFjT1NlcywgQ0ZQUkVGU19ESVJFQ1RfTU9ERSBpcyBkaXNhYmxlZCBhbmQgdGhl IFdlYlByb2Nlc3MgZG9lcyBub3Qgc2VlIHRoZSB1cGRhdGVkIEFwcGxlTGFuZ3VhZ2VzCiAvLyBh ZnRlciB0aGUgQXBwbGVMYW5ndWFnZVByZWZlcmVuY2VzQ2hhbmdlZE5vdGlmaWNhdGlvbiBub3Rp ZmljYXRpb24uCiAvLyBGSVhNRTogVGhpcyB0ZXN0IGlzIGN1cnJlbnRseSBkaXNhYmxlZCBvbiBB cHBsZSBTaWxpY29uIGJlY2F1c2UgaXQgdGltZXMgb3V0IHRoZXJlIChodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNjE5KS4KLSNpZiBQTEFURk9STShNQUMpICYmIF9f TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwICYmIENQVShYODZfNjQpCisj aWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1RfTU9ERSkgJiYgQ1BVKFg4 Nl82NCkKIGNsYXNzIEFwcGxlTGFuZ3VhZ2VzVGVzdCA6IHB1YmxpYyB0ZXN0aW5nOjpUZXN0IHsK IHB1YmxpYzoKICAgICBBcHBsZUxhbmd1YWdlc1Rlc3QoKQpAQCAtODYsOCArODgsMzkgQEAgcHJp dmF0ZToKICAgICBTdHJpbmcgbV9zYXZlZEFwcGxlTGFuZ3VhZ2VzOwogfTsKIAorc3RhdGljIElN UCBzaGFyZWRJbnN0YW5jZU1ldGhvZE9yaWdpbmFsID0gbmlsOworc3RhdGljIElNUCBwcmVmZXJl bmNlRGlkQ2hhbmdlTWV0aG9kT3JpZ2luYWwgPSBuaWw7CitzdGF0aWMgYm9vbCBwcmVmZXJlbmNl T2JzZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCA9IGZhbHNlOworc3RhdGljIGJvb2wgcHJlZmVy ZW5jZU9ic2VydmVyUHJlZmVyZW5jZURpZENoYW5nZUNhbGxlZCA9IGZhbHNlOworCitzdGF0aWMg V0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKnNoYXJlZEluc3RhbmNlTWV0aG9kT3ZlcnJpZGUoaWQgc2Vs ZiwgU0VMIHNlbGVjdG9yKQoreworICAgIFdLUHJlZmVyZW5jZU9ic2VydmVyICpvYnNlcnZlciA9 IHd0ZkNhbGxJTVA8V0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKj4oc2hhcmVkSW5zdGFuY2VNZXRob2RP cmlnaW5hbCwgc2VsZiwgc2VsZWN0b3IpOworICAgIHByZWZlcmVuY2VPYnNlcnZlclNoYXJlZElu c3RhbmNlQ2FsbGVkID0gdHJ1ZTsKKyAgICByZXR1cm4gb2JzZXJ2ZXI7Cit9CisKK3N0YXRpYyBX S1ByZWZlcmVuY2VPYnNlcnZlciAqcHJlZmVyZW5jZURpZENoYW5nZU1ldGhvZE92ZXJyaWRlKGlk IHNlbGYsIFNFTCBzZWxlY3RvciwgTlNTdHJpbmcgKmRvbWFpbiwgTlNTdHJpbmcgKmtleSwgTlNT dHJpbmcgKmVuY29kZWRWYWx1ZSkKK3sKKyAgICBOU0xvZyhAInByZWZlcmVuY2VEaWRDaGFuZ2VN ZXRob2RPdmVycmlkZTogZG9tYWluPSVALCBrZXk9JUAsIGVuY29kZWRWYWx1ZT0lQCIsIGRvbWFp biwga2V5LCBlbmNvZGVkVmFsdWUpOworICAgIGlmIChba2V5IGlzRXF1YWxUb1N0cmluZzpAIkFw cGxlTGFuZ3VhZ2VzIl0pCisgICAgICAgIHByZWZlcmVuY2VPYnNlcnZlclByZWZlcmVuY2VEaWRD aGFuZ2VDYWxsZWQgPSB0cnVlOworICAgIFdLUHJlZmVyZW5jZU9ic2VydmVyICpvYnNlcnZlciA9 IHd0ZkNhbGxJTVA8V0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKj4ocHJlZmVyZW5jZURpZENoYW5nZU1l dGhvZE9yaWdpbmFsLCBzZWxmLCBzZWxlY3RvciwgZG9tYWluLCBrZXksIGVuY29kZWRWYWx1ZSk7 CisgICAgcmV0dXJuIG9ic2VydmVyOworfQorCiBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0LCBV cGRhdGVBcHBsZUxhbmd1YWdlcykKIHsKKyAgICBwcmVmZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJbnN0 YW5jZUNhbGxlZCA9IGZhbHNlOworICAgIE1ldGhvZCBzaGFyZWRJbnN0YW5jZU1ldGhvZCA9IGNs YXNzX2dldENsYXNzTWV0aG9kKG9iamNfZ2V0Q2xhc3MoIldLUHJlZmVyZW5jZU9ic2VydmVyIiks IEBzZWxlY3RvcihzaGFyZWRJbnN0YW5jZSkpOworICAgIEFTU0VSVChzaGFyZWRJbnN0YW5jZU1l dGhvZCk7CisgICAgc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCA9IG1ldGhvZF9zZXRJbXBs ZW1lbnRhdGlvbihzaGFyZWRJbnN0YW5jZU1ldGhvZCwgKElNUClzaGFyZWRJbnN0YW5jZU1ldGhv ZE92ZXJyaWRlKTsKKyAgICBBU1NFUlQoc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCk7Cisg ICAgTWV0aG9kIHByZWZlcmVuY2VEaWRDaGFuZ2VNZXRob2QgPSBjbGFzc19nZXRJbnN0YW5jZU1l dGhvZChvYmpjX2dldENsYXNzKCJXS1ByZWZlcmVuY2VPYnNlcnZlciIpLCBAc2VsZWN0b3IocHJl ZmVyZW5jZURpZENoYW5nZTprZXk6ZW5jb2RlZFZhbHVlOikpOworICAgIEFTU0VSVChwcmVmZXJl bmNlRGlkQ2hhbmdlTWV0aG9kKTsKKyAgICBwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3JpZ2lu YWwgPSBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24ocHJlZmVyZW5jZURpZENoYW5nZU1ldGhvZCwg KElNUClwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3ZlcnJpZGUpOworICAgIEFTU0VSVChwcmVm ZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3JpZ2luYWwpOworCiAgICAgLy8gVGVzdHMgdXNlcyAiZW4t R0IiIGxhbmd1YWdlIGluaXRpYWxseS4KICAgICBzeXN0ZW0oW05TU3RyaW5nIHN0cmluZ1dpdGhG b3JtYXQ6QCJkZWZhdWx0cyB3cml0ZSBOU0dsb2JhbERvbWFpbiBBcHBsZUxhbmd1YWdlcyAnKFwi ZW4tR0JcIiknIl0uVVRGOFN0cmluZyk7CiAKQEAgLTk3LDYgKzEzMCwxMiBAQCBURVNUX0YoQXBw bGVMYW5ndWFnZXNUZXN0LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykKIAogICAgIC8vIFdlIG9ubHkg bGlzdGVuIGZvciBwcmVmZXJlbmNlIGNoYW5nZXMgd2hlbiB0aGUgYXBwbGljYXRpb24gaXMgYWN0 aXZlLgogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlm aWNhdGlvbk5hbWU6TlNBcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbiBvYmpl Y3Q6TlNBcHAgdXNlckluZm86bmlsXTsKKyAgICB1bnNpZ25lZCB0aW1lb3V0ID0gMDsKKyAgICB3 aGlsZSAoIXByZWZlcmVuY2VPYnNlcnZlclNoYXJlZEluc3RhbmNlQ2FsbGVkICYmICsrdGltZW91 dCA8IDEwMCkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6c2xlZXAoMC4xKTsKKyAgICBF WFBFQ1RfVFJVRShwcmVmZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCk7CisgICAg aWYgKCFwcmVmZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCkKKyAgICAgICAgcmV0 dXJuOwogCiAgICAgYXV0byBwcmVmZXJyZWRMYW5ndWFnZSA9IFsmXSB7CiAgICAgICAgIHJldHVy biBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAibmF2aWdhdG9yLmxhbmd1 YWdlIl07CkBAIC0xMDQsMTMgKzE0Myw2IEBAIFRFU1RfRihBcHBsZUxhbmd1YWdlc1Rlc3QsIFVw ZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogICAgIEVYUEVDVF9XS19TVFJFUShAImVuLWdiIiwgcHJlZmVy cmVkTGFuZ3VhZ2UoKSk7CiAKICAgICBfX2Jsb2NrIGJvb2wgZG9uZSA9IGZhbHNlOwotICAgIFt3 ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAIm9ubGFuZ3VhZ2VjaGFuZ2UgPSAoKSA9PiB7IHdl YmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UobmF2aWdhdG9yLmxh bmd1YWdlKTsgfTsgdHJ1ZTsiIGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgdmFsdWUsIE5TRXJyb3Ig KmVycm9yKSB7Ci0gICAgICAgIEVYUEVDVF9UUlVFKCFlcnJvcik7Ci0gICAgICAgIGRvbmUgPSB0 cnVlOwotICAgIH1dOwotICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Ci0KLSAg ICBkb25lID0gZmFsc2U7CiAgICAgX19ibG9jayBib29sIGRpZENoYW5nZUxhbmd1YWdlID0gZmFs c2U7CiAgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nQW55TWVzc2FnZTpeKE5TU3Ry aW5nICpuZXdMYW5ndWFnZSkgewogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlbi11cyIsIG5l d0xhbmd1YWdlKTsKQEAgLTExOCwxMCArMTUwLDE2IEBAIFRFU1RfRihBcHBsZUxhbmd1YWdlc1Rl c3QsIFVwZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogICAgICAgICBkb25lID0gdHJ1ZTsKICAgICB9XTsK IAorICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAIm9ubGFuZ3VhZ2VjaGFuZ2UgPSAo KSA9PiB7IHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UobmF2 aWdhdG9yLmxhbmd1YWdlKTsgfTsgdHJ1ZTsiIGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgdmFsdWUs IE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9UUlVFKCFlcnJvcik7CisgICAgICAg IGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9u ZSk7CisgICAgZG9uZSA9IGZhbHNlOworCiAgICAgLy8gU3dpdGNoIHN5c3RlbSBsYW5ndWFnZSBm cm9tICJlbi1HQiIgdG8gImVuLVVTIi4gTWFrZSBzdXJlIHRoYXQgd2UgZmlyZSBhIGxhbmd1YWdl Y2hhbmdlIGV2ZW50IGF0IHRoZSBXaW5kb3cgYW5kIHRoYXQgbmF2aWdhdG9yLmxhbmd1YWdlCiAg ICAgLy8gbm93IHJlcG9ydHMgImVuLWdiIi4KICAgICBzeXN0ZW0oW05TU3RyaW5nIHN0cmluZ1dp dGhGb3JtYXQ6QCJkZWZhdWx0cyB3cml0ZSBOU0dsb2JhbERvbWFpbiBBcHBsZUxhbmd1YWdlcyAn KFwiZW4tVVNcIiknIl0uVVRGOFN0cmluZyk7Ci0gICAgQ0ZOb3RpZmljYXRpb25DZW50ZXJQb3N0 Tm90aWZpY2F0aW9uKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0RGlzdHJpYnV0ZWRDZW50ZXIoKSwg Q0ZTVFIoIkFwcGxlTGFuZ3VhZ2VQcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb24iKSwgbnVs bHB0ciwgbnVsbHB0ciwgdHJ1ZSk7CiAKICAgICAvLyBJbXBsZW1lbnQgb3VyIG93biB0aW1lb3V0 IGJlY2F1c2Ugd2Ugd291bGQgZmFpbCB0byByZXNldCB0aGUgbGFuZ3VhZ2UgaWYgd2UgbGV0IHRo ZSB0ZXN0IGFjdHVhbGx5IHRpbWUgb3V0LgogICAgIGRpc3BhdGNoX2FmdGVyKGRpc3BhdGNoX3Rp bWUoRElTUEFUQ0hfVElNRV9OT1csIDEwICogTlNFQ19QRVJfU0VDKSwgZGlzcGF0Y2hfZ2V0X21h aW5fcXVldWUoKSwgXnsKQEAgLTEzMCw1ICsxNjgsOSBAQCBURVNUX0YoQXBwbGVMYW5ndWFnZXNU ZXN0LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykKIAogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZG9uZSk7CiAgICAgRVhQRUNUX1RSVUUoZGlkQ2hhbmdlTGFuZ3VhZ2UpOworICAgIEVYUEVD VF9UUlVFKHByZWZlcmVuY2VPYnNlcnZlclByZWZlcmVuY2VEaWRDaGFuZ2VDYWxsZWQpOworICAg IEVYUEVDVF9XS19TVFJFUShAImVuLXVzIiwgcHJlZmVycmVkTGFuZ3VhZ2UoKSk7CisKKyAgICBt ZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2hhcmVkSW5zdGFuY2VNZXRob2QsIChJTVApc2hhcmVk SW5zdGFuY2VNZXRob2RPcmlnaW5hbCk7CiB9CiAjZW5kaWYK 427845 2021-05-05 20:17:53 -0700 2021-05-10 08:37:58 -0700 Patch bug-225429-20210505201752.patch text/plain 8616 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MDY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDBmM2QxZmRmMjZjZTBkN2NhNTNjMTFkMTg5OWM5ZmZk NzFlYmFkMy4uNWE1OWM0MmIxZWVmNzRhYTlmM2I0MDM5YWYwNzMxODIxODY5OTVkOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTA1LTA1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IHBvdGVudGlhbCByYWNlcyBpbiBBcHBsZUxhbmd1YWdlc1Rlc3QuVXBkYXRlQXBwbGVM YW5ndWFnZXMgQVBJIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNTQyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENhbGxpbmcgW1Rlc3RXS1dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nQW55 TWVzc2FnZV0gcmVnaXN0ZXJzIGEgTWVzc2FnZUhhbmRsZXIgd2hpY2ggc2VuZHMgYW4KKyAgICAg ICAgYXN5bmMgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpBZGRVc2VyU2NyaXB0TWVzc2FnZUhh bmRsZXJzIElQQyB0byB0aGUgV2ViUHJvY2Vzcy4gV2Ugd2FudCB0bworICAgICAgICBtYWtlIHN1 cmUgdGhhdCB0aGF0IG1lc3NhZ2UgaGFuZGxlciBpcyByZWdpc3RlcmVkIGluIHRoZSBXZWJQcm9j ZXNzIGJlZm9yZSB0aGUgSlMgb24gdGhlIHBhZ2UKKyAgICAgICAgY2FsbHMgYHdlYmtpdC5tZXNz YWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoKWAuIFRvIGFkZHJlc3MgdGhpcyBp c3N1ZSwgSSBtb3ZlZCB0aGUKKyAgICAgICAgY2FsbCB0byBgW1Rlc3RXS1dlYlZpZXcgcGVyZm9y bUFmdGVyUmVjZWl2aW5nQW55TWVzc2FnZV1gIGJlZm9yZSB0aGUgY2FsbCB0byBldmFsdWF0ZUph dmFTY3JpcHQKKyAgICAgICAgdGhhdCByZWdpc3RlcnMgdGhlIGV2ZW50IGxpc3RlbmVyIHRoYXQg bWF5IGNhbGwgYHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2Uo KWAuCisKKyAgICAgICAgQWxzbyBtYWtlIHN1cmUgdGhlIFByZWZlcmVuY2VPYnNlcnZlciBoYXMg YmVlbiBhbGxvY2F0ZWQgYWZ0ZXIgc2VuZGluZyB0aGUKKyAgICAgICAgIk5TQXBwbGljYXRpb25E aWRCZWNvbWVBY3RpdmVOb3RpZmljYXRpb24iIGFuZCBiZWZvcmUgcHJvY2VlZGluZyB3aXRoIHRo ZSB0ZXN0LgorCisgICAgICAgIEkgYW0gYWxzbyBhZGRpbmcgYW4gZXh0cmEgY2hlY2sgYXQgdGhl IGVuZCB0byBtYWtlIHN1cmUgdGhhdCB0aGUgdmFsdWUgb2YgbmF2aWdhdG9yLmxhbmd1YWdlIGlz CisgICAgICAgIGNvcnJlY3QgYW5kIHRvIG1ha2Ugc3VyZSB0aGF0IFdLUHJlZmVyZW5jZU9ic2Vy dmVyLnByZWZlcmVuY2VEaWRDaGFuZ2Ugd2FzIGNhbGxlZC4gVGhpcyB3YXMgZG9uZQorICAgICAg ICB0byBoZWxwIGRpYWdub3NlIGZsYWtpbmVzcyBpc3N1ZXMgb24gdGhlIGJvdHMgdGhhdCBJIGNh bm5vdCByZXByb2R1Y2UgbG9jYWxseS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tOgorICAgICAgICAoVEVT VF9GKToKKwogMjAyMS0wNS0wNSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEuY29t PgogCiAgICAgICAgIFtidWlsZC53ZWJraXQub3JnXSBBZGQgbmV3IHBvc3QtY29tbWl0IGJ1aWxk ZXIgV1BFLUxpbnV4LTY0LWJpdC1SZWxlYXNlLU5vbi1VbmlmaWVkLUJ1aWxkCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9PdmVycmlkZUFwcGxlTGFuZ3VhZ2Vz UHJlZmVyZW5jZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L092ZXJyaWRl QXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tCmluZGV4IDVhYzkwZDg5N2NkNWU5YzQwMGVlYTAw MDk1ZDUzNTUxMDRjNDY3NzYuLjI3MTg3ZWU0ZTY5NTE2N2FjMGMxZDc5MjE5Yjk1NjI2YzVkZDRh ODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L092ZXJyaWRl QXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tCkBAIC0yOSw2ICsy OSw4IEBACiAKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCiAjaW1wb3J0ICJUZXN0V0tX ZWJWaWV3LmgiCisjaW1wb3J0IDxXZWJLaXQvUHJlZmVyZW5jZU9ic2VydmVyLmg+CisjaW1wb3J0 IDx3dGYvT2JqQ1J1bnRpbWVFeHRyYXMuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9WZWN0b3JDb2Nv YS5oPgogI2ltcG9ydCA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogCkBAIC01Nyw3ICs1OSw3 IEBAIFRFU1QoV2ViS2l0LCBPdmVycmlkZUFwcGxlTGFuZ3VhZ2VzUHJlZmVyZW5jZSkKIC8vIE9u IG9sZGVyIG1hY09TZXMsIENGUFJFRlNfRElSRUNUX01PREUgaXMgZGlzYWJsZWQgYW5kIHRoZSBX ZWJQcm9jZXNzIGRvZXMgbm90IHNlZSB0aGUgdXBkYXRlZCBBcHBsZUxhbmd1YWdlcwogLy8gYWZ0 ZXIgdGhlIEFwcGxlTGFuZ3VhZ2VQcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRpb24gbm90aWZp Y2F0aW9uLgogLy8gRklYTUU6IFRoaXMgdGVzdCBpcyBjdXJyZW50bHkgZGlzYWJsZWQgb24gQXBw bGUgU2lsaWNvbiBiZWNhdXNlIGl0IHRpbWVzIG91dCB0aGVyZSAoaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjYxOSkuCi0jaWYgUExBVEZPUk0oTUFDKSAmJiBfX01B Q19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMCAmJiBDUFUoWDg2XzY0KQorI2lm IFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpICYmIENQVShYODZf NjQpCiBjbGFzcyBBcHBsZUxhbmd1YWdlc1Rlc3QgOiBwdWJsaWMgdGVzdGluZzo6VGVzdCB7CiBw dWJsaWM6CiAgICAgQXBwbGVMYW5ndWFnZXNUZXN0KCkKQEAgLTg2LDE3ICs4OCw2MyBAQCBwcml2 YXRlOgogICAgIFN0cmluZyBtX3NhdmVkQXBwbGVMYW5ndWFnZXM7CiB9OwogCitzdGF0aWMgSU1Q IHNoYXJlZEluc3RhbmNlTWV0aG9kT3JpZ2luYWwgPSBuaWw7CitzdGF0aWMgSU1QIHByZWZlcmVu Y2VEaWRDaGFuZ2VNZXRob2RPcmlnaW5hbCA9IG5pbDsKK3N0YXRpYyBib29sIHByZWZlcmVuY2VP YnNlcnZlclNoYXJlZEluc3RhbmNlQ2FsbGVkID0gZmFsc2U7CitzdGF0aWMgYm9vbCBwcmVmZXJl bmNlT2JzZXJ2ZXJQcmVmZXJlbmNlRGlkQ2hhbmdlQ2FsbGVkID0gZmFsc2U7CisKK3N0YXRpYyBX S1ByZWZlcmVuY2VPYnNlcnZlciAqc2hhcmVkSW5zdGFuY2VNZXRob2RPdmVycmlkZShpZCBzZWxm LCBTRUwgc2VsZWN0b3IpCit7CisgICAgV0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKm9ic2VydmVyID0g d3RmQ2FsbElNUDxXS1ByZWZlcmVuY2VPYnNlcnZlciAqPihzaGFyZWRJbnN0YW5jZU1ldGhvZE9y aWdpbmFsLCBzZWxmLCBzZWxlY3Rvcik7CisgICAgcHJlZmVyZW5jZU9ic2VydmVyU2hhcmVkSW5z dGFuY2VDYWxsZWQgPSB0cnVlOworICAgIHJldHVybiBvYnNlcnZlcjsKK30KKworc3RhdGljIFdL UHJlZmVyZW5jZU9ic2VydmVyICpwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3ZlcnJpZGUoaWQg c2VsZiwgU0VMIHNlbGVjdG9yLCBOU1N0cmluZyAqZG9tYWluLCBOU1N0cmluZyAqa2V5LCBOU1N0 cmluZyAqZW5jb2RlZFZhbHVlKQoreworICAgIE5TTG9nKEAicHJlZmVyZW5jZURpZENoYW5nZU1l dGhvZE92ZXJyaWRlOiBkb21haW49JUAsIGtleT0lQCwgZW5jb2RlZFZhbHVlPSVAIiwgZG9tYWlu LCBrZXksIGVuY29kZWRWYWx1ZSk7CisgICAgaWYgKFtrZXkgaXNFcXVhbFRvU3RyaW5nOkAiQXBw bGVMYW5ndWFnZXMiXSkKKyAgICAgICAgcHJlZmVyZW5jZU9ic2VydmVyUHJlZmVyZW5jZURpZENo YW5nZUNhbGxlZCA9IHRydWU7CisgICAgV0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKm9ic2VydmVyID0g d3RmQ2FsbElNUDxXS1ByZWZlcmVuY2VPYnNlcnZlciAqPihwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0 aG9kT3JpZ2luYWwsIHNlbGYsIHNlbGVjdG9yLCBkb21haW4sIGtleSwgZW5jb2RlZFZhbHVlKTsK KyAgICByZXR1cm4gb2JzZXJ2ZXI7Cit9CisKIFRFU1RfRihBcHBsZUxhbmd1YWdlc1Rlc3QsIFVw ZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogeworICAgIHByZWZlcmVuY2VPYnNlcnZlclNoYXJlZEluc3Rh bmNlQ2FsbGVkID0gZmFsc2U7CisgICAgTWV0aG9kIHNoYXJlZEluc3RhbmNlTWV0aG9kID0gY2xh c3NfZ2V0Q2xhc3NNZXRob2Qob2JqY19nZXRDbGFzcygiV0tQcmVmZXJlbmNlT2JzZXJ2ZXIiKSwg QHNlbGVjdG9yKHNoYXJlZEluc3RhbmNlKSk7CisgICAgQVNTRVJUKHNoYXJlZEluc3RhbmNlTWV0 aG9kKTsKKyAgICBzaGFyZWRJbnN0YW5jZU1ldGhvZE9yaWdpbmFsID0gbWV0aG9kX3NldEltcGxl bWVudGF0aW9uKHNoYXJlZEluc3RhbmNlTWV0aG9kLCAoSU1QKXNoYXJlZEluc3RhbmNlTWV0aG9k T3ZlcnJpZGUpOworICAgIEFTU0VSVChzaGFyZWRJbnN0YW5jZU1ldGhvZE9yaWdpbmFsKTsKKyAg ICBNZXRob2QgcHJlZmVyZW5jZURpZENoYW5nZU1ldGhvZCA9IGNsYXNzX2dldEluc3RhbmNlTWV0 aG9kKG9iamNfZ2V0Q2xhc3MoIldLUHJlZmVyZW5jZU9ic2VydmVyIiksIEBzZWxlY3RvcihwcmVm ZXJlbmNlRGlkQ2hhbmdlOmtleTplbmNvZGVkVmFsdWU6KSk7CisgICAgQVNTRVJUKHByZWZlcmVu Y2VEaWRDaGFuZ2VNZXRob2QpOworICAgIHByZWZlcmVuY2VEaWRDaGFuZ2VNZXRob2RPcmlnaW5h bCA9IG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kLCAo SU1QKXByZWZlcmVuY2VEaWRDaGFuZ2VNZXRob2RPdmVycmlkZSk7CisgICAgQVNTRVJUKHByZWZl cmVuY2VEaWRDaGFuZ2VNZXRob2RPcmlnaW5hbCk7CisKICAgICAvLyBUZXN0cyB1c2VzICJlbi1H QiIgbGFuZ3VhZ2UgaW5pdGlhbGx5LgogICAgIHN5c3RlbShbTlNTdHJpbmcgc3RyaW5nV2l0aEZv cm1hdDpAImRlZmF1bHRzIHdyaXRlIE5TR2xvYmFsRG9tYWluIEFwcGxlTGFuZ3VhZ2VzICcoXCJl bi1HQlwiKSciXS5VVEY4U3RyaW5nKTsKIAorICAgIGF1dG8gZ2V0TGFuZ3VhZ2VGcm9tTlNVc2Vy RGVmYXVsdHMgPSBbXSB7CisgICAgICAgIGF1dG8gbGFuZ3VhZ2VzID0gbWFrZVZlY3RvcjxTdHJp bmc+KFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHZhbHVlRm9yS2V5OkAi QXBwbGVMYW5ndWFnZXMiXSk7CisgICAgICAgIHJldHVybiBsYW5ndWFnZXMuaXNFbXB0eSgpID8g ZW1wdHlTdHJpbmcoKSA6IGxhbmd1YWdlc1swXTsKKyAgICB9OworICAgIHVuc2lnbmVkIHRpbWVv dXQgPSAwOworICAgIHdoaWxlIChnZXRMYW5ndWFnZUZyb21OU1VzZXJEZWZhdWx0cygpICE9ICJl bi1HQiIgJiYgKyt0aW1lb3V0IDwgMTAwKQorICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpz bGVlcCgwLjEpOworICAgIEVYUEVDVF9XS19TVFJFUShAImVuLUdCIiwgZ2V0TGFuZ3VhZ2VGcm9t TlNVc2VyRGVmYXVsdHMoKSk7CisKICAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtb V0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOwogICAgIGF1dG8gd2ViVmlldyA9 IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3Qo MCwgMCwgMzAwLCAzMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKSBhZGRUb1dp bmRvdzpZRVNdKTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6 QCJzaW1wbGUiXTsKIAogICAgIC8vIFdlIG9ubHkgbGlzdGVuIGZvciBwcmVmZXJlbmNlIGNoYW5n ZXMgd2hlbiB0aGUgYXBwbGljYXRpb24gaXMgYWN0aXZlLgogICAgIFtbTlNOb3RpZmljYXRpb25D ZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6TlNBcHBsaWNhdGlvbkRp ZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbiBvYmplY3Q6TlNBcHAgdXNlckluZm86bmlsXTsKKyAg ICB0aW1lb3V0ID0gMDsKKyAgICB3aGlsZSAoIXByZWZlcmVuY2VPYnNlcnZlclNoYXJlZEluc3Rh bmNlQ2FsbGVkICYmICsrdGltZW91dCA8IDEwMCkKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRp bDo6c2xlZXAoMC4xKTsKKyAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJ bnN0YW5jZUNhbGxlZCk7CisgICAgaWYgKCFwcmVmZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJbnN0YW5j ZUNhbGxlZCkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBwcmVmZXJyZWRMYW5ndWFnZSA9 IFsmXSB7CiAgICAgICAgIHJldHVybiBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2Ny aXB0OkAibmF2aWdhdG9yLmxhbmd1YWdlIl07CkBAIC0xMDQsMTMgKzE1Miw2IEBAIFRFU1RfRihB cHBsZUxhbmd1YWdlc1Rlc3QsIFVwZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogICAgIEVYUEVDVF9XS19T VFJFUShAImVuLWdiIiwgcHJlZmVycmVkTGFuZ3VhZ2UoKSk7CiAKICAgICBfX2Jsb2NrIGJvb2wg ZG9uZSA9IGZhbHNlOwotICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAIm9ubGFuZ3Vh Z2VjaGFuZ2UgPSAoKSA9PiB7IHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9z dE1lc3NhZ2UobmF2aWdhdG9yLmxhbmd1YWdlKTsgfTsgdHJ1ZTsiIGNvbXBsZXRpb25IYW5kbGVy Ol4oaWQgdmFsdWUsIE5TRXJyb3IgKmVycm9yKSB7Ci0gICAgICAgIEVYUEVDVF9UUlVFKCFlcnJv cik7Ci0gICAgICAgIGRvbmUgPSB0cnVlOwotICAgIH1dOwotICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZG9uZSk7Ci0KLSAgICBkb25lID0gZmFsc2U7CiAgICAgX19ibG9jayBib29sIGRp ZENoYW5nZUxhbmd1YWdlID0gZmFsc2U7CiAgICAgW3dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2 aW5nQW55TWVzc2FnZTpeKE5TU3RyaW5nICpuZXdMYW5ndWFnZSkgewogICAgICAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJlbi11cyIsIG5ld0xhbmd1YWdlKTsKQEAgLTExOCwxMCArMTU5LDE2IEBAIFRF U1RfRihBcHBsZUxhbmd1YWdlc1Rlc3QsIFVwZGF0ZUFwcGxlTGFuZ3VhZ2VzKQogICAgICAgICBk b25lID0gdHJ1ZTsKICAgICB9XTsKIAorICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpA Im9ubGFuZ3VhZ2VjaGFuZ2UgPSAoKSA9PiB7IHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhh bmRsZXIucG9zdE1lc3NhZ2UobmF2aWdhdG9yLmxhbmd1YWdlKTsgfTsgdHJ1ZTsiIGNvbXBsZXRp b25IYW5kbGVyOl4oaWQgdmFsdWUsIE5TRXJyb3IgKmVycm9yKSB7CisgICAgICAgIEVYUEVDVF9U UlVFKCFlcnJvcik7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCiAgICAgLy8gU3dp dGNoIHN5c3RlbSBsYW5ndWFnZSBmcm9tICJlbi1HQiIgdG8gImVuLVVTIi4gTWFrZSBzdXJlIHRo YXQgd2UgZmlyZSBhIGxhbmd1YWdlY2hhbmdlIGV2ZW50IGF0IHRoZSBXaW5kb3cgYW5kIHRoYXQg bmF2aWdhdG9yLmxhbmd1YWdlCiAgICAgLy8gbm93IHJlcG9ydHMgImVuLWdiIi4KICAgICBzeXN0 ZW0oW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkZWZhdWx0cyB3cml0ZSBOU0dsb2JhbERv bWFpbiBBcHBsZUxhbmd1YWdlcyAnKFwiZW4tVVNcIiknIl0uVVRGOFN0cmluZyk7Ci0gICAgQ0ZO b3RpZmljYXRpb25DZW50ZXJQb3N0Tm90aWZpY2F0aW9uKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0 RGlzdHJpYnV0ZWRDZW50ZXIoKSwgQ0ZTVFIoIkFwcGxlTGFuZ3VhZ2VQcmVmZXJlbmNlc0NoYW5n ZWROb3RpZmljYXRpb24iKSwgbnVsbHB0ciwgbnVsbHB0ciwgdHJ1ZSk7CiAKICAgICAvLyBJbXBs ZW1lbnQgb3VyIG93biB0aW1lb3V0IGJlY2F1c2Ugd2Ugd291bGQgZmFpbCB0byByZXNldCB0aGUg bGFuZ3VhZ2UgaWYgd2UgbGV0IHRoZSB0ZXN0IGFjdHVhbGx5IHRpbWUgb3V0LgogICAgIGRpc3Bh dGNoX2FmdGVyKGRpc3BhdGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIDEwICogTlNFQ19QRVJf U0VDKSwgZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKQEAgLTEzMCw1ICsxNzcsMTAgQEAg VEVTVF9GKEFwcGxlTGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBwbGVMYW5ndWFnZXMpCiAKICAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwogICAgIEVYUEVDVF9UUlVFKGRpZENoYW5n ZUxhbmd1YWdlKTsKKyAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlT2JzZXJ2ZXJQcmVmZXJlbmNl RGlkQ2hhbmdlQ2FsbGVkKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlbi11cyIsIHByZWZlcnJl ZExhbmd1YWdlKCkpOworICAgIEVYUEVDVF9XS19TVFJFUShAImVuLVVTIiwgZ2V0TGFuZ3VhZ2VG cm9tTlNVc2VyRGVmYXVsdHMoKSk7CisKKyAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2hh cmVkSW5zdGFuY2VNZXRob2QsIChJTVApc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCk7CiB9 CiAjZW5kaWYK 428172 2021-05-10 08:38:00 -0700 2021-05-10 09:38:10 -0700 Patch bug-225429-20210510083759.patch text/plain 8604 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjJiNGI0Y2YzY2I3ZDMxYjI3ZjQyZGI3NzA1NDNlNWNi OWFiMGFhNC4uMzZjYjZkOTQyOTkzNDY2NjE5OWFlYWQwODMwZDFkZjkxNDYzMTQxMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTA1LTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgRml4IHBvdGVudGlhbCByYWNlcyBpbiBBcHBsZUxhbmd1YWdlc1Rlc3QuVXBkYXRlQXBwbGVM YW5ndWFnZXMgQVBJIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNTQyOQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisg ICAgICAgIENhbGxpbmcgW1Rlc3RXS1dlYlZpZXcgcGVyZm9ybUFmdGVyUmVjZWl2aW5nQW55TWVz c2FnZV0gcmVnaXN0ZXJzIGEgTWVzc2FnZUhhbmRsZXIgd2hpY2ggc2VuZHMgYW4KKyAgICAgICAg YXN5bmMgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpBZGRVc2VyU2NyaXB0TWVzc2FnZUhhbmRs ZXJzIElQQyB0byB0aGUgV2ViUHJvY2Vzcy4gV2Ugd2FudCB0bworICAgICAgICBtYWtlIHN1cmUg dGhhdCB0aGF0IG1lc3NhZ2UgaGFuZGxlciBpcyByZWdpc3RlcmVkIGluIHRoZSBXZWJQcm9jZXNz IGJlZm9yZSB0aGUgSlMgb24gdGhlIHBhZ2UKKyAgICAgICAgY2FsbHMgYHdlYmtpdC5tZXNzYWdl SGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoKWAuIFRvIGFkZHJlc3MgdGhpcyBpc3N1 ZSwgSSBtb3ZlZCB0aGUKKyAgICAgICAgY2FsbCB0byBgW1Rlc3RXS1dlYlZpZXcgcGVyZm9ybUFm dGVyUmVjZWl2aW5nQW55TWVzc2FnZV1gIGJlZm9yZSB0aGUgY2FsbCB0byBldmFsdWF0ZUphdmFT Y3JpcHQKKyAgICAgICAgdGhhdCByZWdpc3RlcnMgdGhlIGV2ZW50IGxpc3RlbmVyIHRoYXQgbWF5 IGNhbGwgYHdlYmtpdC5tZXNzYWdlSGFuZGxlcnMudGVzdEhhbmRsZXIucG9zdE1lc3NhZ2UoKWAu CisKKyAgICAgICAgQWxzbyBtYWtlIHN1cmUgdGhlIFByZWZlcmVuY2VPYnNlcnZlciBoYXMgYmVl biBhbGxvY2F0ZWQgYWZ0ZXIgc2VuZGluZyB0aGUKKyAgICAgICAgIk5TQXBwbGljYXRpb25EaWRC ZWNvbWVBY3RpdmVOb3RpZmljYXRpb24iIGFuZCBiZWZvcmUgcHJvY2VlZGluZyB3aXRoIHRoZSB0 ZXN0LgorCisgICAgICAgIEkgYW0gYWxzbyBhZGRpbmcgYW4gZXh0cmEgY2hlY2sgYXQgdGhlIGVu ZCB0byBtYWtlIHN1cmUgdGhhdCB0aGUgdmFsdWUgb2YgbmF2aWdhdG9yLmxhbmd1YWdlIGlzCisg ICAgICAgIGNvcnJlY3QgYW5kIHRvIG1ha2Ugc3VyZSB0aGF0IFdLUHJlZmVyZW5jZU9ic2VydmVy LnByZWZlcmVuY2VEaWRDaGFuZ2Ugd2FzIGNhbGxlZC4gVGhpcyB3YXMgZG9uZQorICAgICAgICB0 byBoZWxwIGRpYWdub3NlIGZsYWtpbmVzcyBpc3N1ZXMgb24gdGhlIGJvdHMgdGhhdCBJIGNhbm5v dCByZXByb2R1Y2UgbG9jYWxseS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0L092ZXJyaWRlQXBwbGVMYW5ndWFnZXNQcmVmZXJlbmNlLm1tOgorICAgICAgICAoVEVTVF9G KToKKwogMjAyMS0wNS0wOSAgS2hlbSBSYWogIDxyYWoua2hlbUBnbWFpbC5jb20+CiAKICAgICAg ICAgW1Rvb2xzXSBHZW5lcmF0ZSBtYXJzaGFsbGluZyBjb2RlIHdpdGhvdXQgc291cmNlIHJlZmVy ZW5jZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvT3ZlcnJp ZGVBcHBsZUxhbmd1YWdlc1ByZWZlcmVuY2UubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdC9PdmVycmlkZUFwcGxlTGFuZ3VhZ2VzUHJlZmVyZW5jZS5tbQppbmRleCAwMDVjZGY2 YTQ1MmFmODJjNzQyMzcxNDIxMTY0NDdlNmRjYTQ1M2UyLi5iZjliYzgwZDM3OTI3M2U4MzVkNjQy M2EzOTc2YzZiMmY2YWQ2MGUyIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdC9PdmVycmlkZUFwcGxlTGFuZ3VhZ2VzUHJlZmVyZW5jZS5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9PdmVycmlkZUFwcGxlTGFuZ3VhZ2VzUHJlZmVyZW5j ZS5tbQpAQCAtMjksNiArMjksOCBAQAogCiAjaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5oIgog I2ltcG9ydCAiVGVzdFdLV2ViVmlldy5oIgorI2ltcG9ydCA8V2ViS2l0L1ByZWZlcmVuY2VPYnNl cnZlci5oPgorI2ltcG9ydCA8d3RmL09iakNSdW50aW1lRXh0cmFzLmg+CiAjaW1wb3J0IDx3dGYv Y29jb2EvVmVjdG9yQ29jb2EuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4K IApAQCAtNTcsNyArNTksNyBAQCBURVNUKFdlYktpdCwgT3ZlcnJpZGVBcHBsZUxhbmd1YWdlc1By ZWZlcmVuY2UpCiAvLyBPbiBvbGRlciBtYWNPU2VzLCBDRlBSRUZTX0RJUkVDVF9NT0RFIGlzIGRp c2FibGVkIGFuZCB0aGUgV2ViUHJvY2VzcyBkb2VzIG5vdCBzZWUgdGhlIHVwZGF0ZWQgQXBwbGVM YW5ndWFnZXMKIC8vIGFmdGVyIHRoZSBBcHBsZUxhbmd1YWdlUHJlZmVyZW5jZXNDaGFuZ2VkTm90 aWZpY2F0aW9uIG5vdGlmaWNhdGlvbi4KIC8vIEZJWE1FOiBUaGlzIHRlc3QgaXMgY3VycmVudGx5 IGRpc2FibGVkIG9uIEFwcGxlIFNpbGljb24gYmVjYXVzZSBpdCB0aW1lcyBvdXQgdGhlcmUgKGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI2MTkpLgotI2lmIFBMQVRG T1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAgJiYg Q1BVKFg4Nl82NCkKKyNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShDRlBSRUZTX0RJUkVDVF9N T0RFKSAmJiBDUFUoWDg2XzY0KQogY2xhc3MgQXBwbGVMYW5ndWFnZXNUZXN0IDogcHVibGljIHRl c3Rpbmc6OlRlc3QgewogcHVibGljOgogICAgIEFwcGxlTGFuZ3VhZ2VzVGVzdCgpCkBAIC04Niwx NyArODgsNjMgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV9zYXZlZEFwcGxlTGFuZ3VhZ2VzOwog fTsKIAorc3RhdGljIElNUCBzaGFyZWRJbnN0YW5jZU1ldGhvZE9yaWdpbmFsID0gbmlsOworc3Rh dGljIElNUCBwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3JpZ2luYWwgPSBuaWw7CitzdGF0aWMg Ym9vbCBwcmVmZXJlbmNlT2JzZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCA9IGZhbHNlOworc3Rh dGljIGJvb2wgcHJlZmVyZW5jZU9ic2VydmVyUHJlZmVyZW5jZURpZENoYW5nZUNhbGxlZCA9IGZh bHNlOworCitzdGF0aWMgV0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKnNoYXJlZEluc3RhbmNlTWV0aG9k T3ZlcnJpZGUoaWQgc2VsZiwgU0VMIHNlbGVjdG9yKQoreworICAgIFdLUHJlZmVyZW5jZU9ic2Vy dmVyICpvYnNlcnZlciA9IHd0ZkNhbGxJTVA8V0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKj4oc2hhcmVk SW5zdGFuY2VNZXRob2RPcmlnaW5hbCwgc2VsZiwgc2VsZWN0b3IpOworICAgIHByZWZlcmVuY2VP YnNlcnZlclNoYXJlZEluc3RhbmNlQ2FsbGVkID0gdHJ1ZTsKKyAgICByZXR1cm4gb2JzZXJ2ZXI7 Cit9CisKK3N0YXRpYyBXS1ByZWZlcmVuY2VPYnNlcnZlciAqcHJlZmVyZW5jZURpZENoYW5nZU1l dGhvZE92ZXJyaWRlKGlkIHNlbGYsIFNFTCBzZWxlY3RvciwgTlNTdHJpbmcgKmRvbWFpbiwgTlNT dHJpbmcgKmtleSwgTlNTdHJpbmcgKmVuY29kZWRWYWx1ZSkKK3sKKyAgICBOU0xvZyhAInByZWZl cmVuY2VEaWRDaGFuZ2VNZXRob2RPdmVycmlkZTogZG9tYWluPSVALCBrZXk9JUAsIGVuY29kZWRW YWx1ZT0lQCIsIGRvbWFpbiwga2V5LCBlbmNvZGVkVmFsdWUpOworICAgIGlmIChba2V5IGlzRXF1 YWxUb1N0cmluZzpAIkFwcGxlTGFuZ3VhZ2VzIl0pCisgICAgICAgIHByZWZlcmVuY2VPYnNlcnZl clByZWZlcmVuY2VEaWRDaGFuZ2VDYWxsZWQgPSB0cnVlOworICAgIFdLUHJlZmVyZW5jZU9ic2Vy dmVyICpvYnNlcnZlciA9IHd0ZkNhbGxJTVA8V0tQcmVmZXJlbmNlT2JzZXJ2ZXIgKj4ocHJlZmVy ZW5jZURpZENoYW5nZU1ldGhvZE9yaWdpbmFsLCBzZWxmLCBzZWxlY3RvciwgZG9tYWluLCBrZXks IGVuY29kZWRWYWx1ZSk7CisgICAgcmV0dXJuIG9ic2VydmVyOworfQorCiBURVNUX0YoQXBwbGVM YW5ndWFnZXNUZXN0LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykKIHsKKyAgICBwcmVmZXJlbmNlT2Jz ZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCA9IGZhbHNlOworICAgIE1ldGhvZCBzaGFyZWRJbnN0 YW5jZU1ldGhvZCA9IGNsYXNzX2dldENsYXNzTWV0aG9kKG9iamNfZ2V0Q2xhc3MoIldLUHJlZmVy ZW5jZU9ic2VydmVyIiksIEBzZWxlY3RvcihzaGFyZWRJbnN0YW5jZSkpOworICAgIEFTU0VSVChz aGFyZWRJbnN0YW5jZU1ldGhvZCk7CisgICAgc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCA9 IG1ldGhvZF9zZXRJbXBsZW1lbnRhdGlvbihzaGFyZWRJbnN0YW5jZU1ldGhvZCwgKElNUClzaGFy ZWRJbnN0YW5jZU1ldGhvZE92ZXJyaWRlKTsKKyAgICBBU1NFUlQoc2hhcmVkSW5zdGFuY2VNZXRo b2RPcmlnaW5hbCk7CisgICAgTWV0aG9kIHByZWZlcmVuY2VEaWRDaGFuZ2VNZXRob2QgPSBjbGFz c19nZXRJbnN0YW5jZU1ldGhvZChvYmpjX2dldENsYXNzKCJXS1ByZWZlcmVuY2VPYnNlcnZlciIp LCBAc2VsZWN0b3IocHJlZmVyZW5jZURpZENoYW5nZTprZXk6ZW5jb2RlZFZhbHVlOikpOworICAg IEFTU0VSVChwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kKTsKKyAgICBwcmVmZXJlbmNlRGlkQ2hh bmdlTWV0aG9kT3JpZ2luYWwgPSBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24ocHJlZmVyZW5jZURp ZENoYW5nZU1ldGhvZCwgKElNUClwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3ZlcnJpZGUpOwor ICAgIEFTU0VSVChwcmVmZXJlbmNlRGlkQ2hhbmdlTWV0aG9kT3JpZ2luYWwpOworCiAgICAgLy8g VGVzdHMgdXNlcyAiZW4tR0IiIGxhbmd1YWdlIGluaXRpYWxseS4KICAgICBzeXN0ZW0oW05TU3Ry aW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkZWZhdWx0cyB3cml0ZSBOU0dsb2JhbERvbWFpbiBBcHBs ZUxhbmd1YWdlcyAnKFwiZW4tR0JcIiknIl0uVVRGOFN0cmluZyk7CiAKKyAgICBhdXRvIGdldExh bmd1YWdlRnJvbU5TVXNlckRlZmF1bHRzID0gW10geworICAgICAgICBhdXRvIGxhbmd1YWdlcyA9 IG1ha2VWZWN0b3I8U3RyaW5nPihbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRz XSB2YWx1ZUZvcktleTpAIkFwcGxlTGFuZ3VhZ2VzIl0pOworICAgICAgICByZXR1cm4gbGFuZ3Vh Z2VzLmlzRW1wdHkoKSA/IGVtcHR5U3RyaW5nKCkgOiBsYW5ndWFnZXNbMF07CisgICAgfTsKKyAg ICB1bnNpZ25lZCB0aW1lb3V0ID0gMDsKKyAgICB3aGlsZSAoZ2V0TGFuZ3VhZ2VGcm9tTlNVc2Vy RGVmYXVsdHMoKSAhPSAiZW4tR0IiICYmICsrdGltZW91dCA8IDEwMCkKKyAgICAgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6c2xlZXAoMC4xKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlbi1HQiIs IGdldExhbmd1YWdlRnJvbU5TVXNlckRlZmF1bHRzKCkpOworCiAgICAgYXV0byBjb25maWd1cmF0 aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKICAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpOU01ha2VSZWN0KDAsIDAsIDMwMCwgMzAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRp b24uZ2V0KCkgYWRkVG9XaW5kb3c6WUVTXSk7CiAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxv YWRUZXN0UGFnZU5hbWVkOkAic2ltcGxlIl07CiAKICAgICAvLyBXZSBvbmx5IGxpc3RlbiBmb3Ig cHJlZmVyZW5jZSBjaGFuZ2VzIHdoZW4gdGhlIGFwcGxpY2F0aW9uIGlzIGFjdGl2ZS4KICAgICBb W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHBvc3ROb3RpZmljYXRpb25OYW1l Ok5TQXBwbGljYXRpb25EaWRCZWNvbWVBY3RpdmVOb3RpZmljYXRpb24gb2JqZWN0Ok5TQXBwIHVz ZXJJbmZvOm5pbF07CisgICAgdGltZW91dCA9IDA7CisgICAgd2hpbGUgKCFwcmVmZXJlbmNlT2Jz ZXJ2ZXJTaGFyZWRJbnN0YW5jZUNhbGxlZCAmJiArK3RpbWVvdXQgPCAxMDApCisgICAgICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnNsZWVwKDAuMSk7CisgICAgRVhQRUNUX1RSVUUocHJlZmVyZW5j ZU9ic2VydmVyU2hhcmVkSW5zdGFuY2VDYWxsZWQpOworICAgIGlmICghcHJlZmVyZW5jZU9ic2Vy dmVyU2hhcmVkSW5zdGFuY2VDYWxsZWQpCisgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8gcHJl ZmVycmVkTGFuZ3VhZ2UgPSBbJl0gewogICAgICAgICByZXR1cm4gW3dlYlZpZXcgc3RyaW5nQnlF dmFsdWF0aW5nSmF2YVNjcmlwdDpAIm5hdmlnYXRvci5sYW5ndWFnZSJdOwpAQCAtMTA0LDEzICsx NTIsNiBAQCBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0LCBVcGRhdGVBcHBsZUxhbmd1YWdlcykK ICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlbi1HQiIsIHByZWZlcnJlZExhbmd1YWdlKCkpOwogCiAg ICAgX19ibG9jayBib29sIGRvbmUgPSBmYWxzZTsKLSAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFT Y3JpcHQ6QCJvbmxhbmd1YWdlY2hhbmdlID0gKCkgPT4geyB3ZWJraXQubWVzc2FnZUhhbmRsZXJz LnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKG5hdmlnYXRvci5sYW5ndWFnZSk7IH07IHRydWU7IiBj b21wbGV0aW9uSGFuZGxlcjpeKGlkIHZhbHVlLCBOU0Vycm9yICplcnJvcikgewotICAgICAgICBF WFBFQ1RfVFJVRSghZXJyb3IpOwotICAgICAgICBkb25lID0gdHJ1ZTsKLSAgICB9XTsKLSAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwotCi0gICAgZG9uZSA9IGZhbHNlOwogICAg IF9fYmxvY2sgYm9vbCBkaWRDaGFuZ2VMYW5ndWFnZSA9IGZhbHNlOwogICAgIFt3ZWJWaWV3IHBl cmZvcm1BZnRlclJlY2VpdmluZ0FueU1lc3NhZ2U6XihOU1N0cmluZyAqbmV3TGFuZ3VhZ2UpIHsK ICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiZW4tVVMiLCBuZXdMYW5ndWFnZSk7CkBAIC0xMTgs MTAgKzE1OSwxNiBAQCBURVNUX0YoQXBwbGVMYW5ndWFnZXNUZXN0LCBVcGRhdGVBcHBsZUxhbmd1 YWdlcykKICAgICAgICAgZG9uZSA9IHRydWU7CiAgICAgfV07CiAKKyAgICBbd2ViVmlldyBldmFs dWF0ZUphdmFTY3JpcHQ6QCJvbmxhbmd1YWdlY2hhbmdlID0gKCkgPT4geyB3ZWJraXQubWVzc2Fn ZUhhbmRsZXJzLnRlc3RIYW5kbGVyLnBvc3RNZXNzYWdlKG5hdmlnYXRvci5sYW5ndWFnZSk7IH07 IHRydWU7IiBjb21wbGV0aW9uSGFuZGxlcjpeKGlkIHZhbHVlLCBOU0Vycm9yICplcnJvcikgewor ICAgICAgICBFWFBFQ1RfVFJVRSghZXJyb3IpOworICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9 XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxz ZTsKKwogICAgIC8vIFN3aXRjaCBzeXN0ZW0gbGFuZ3VhZ2UgZnJvbSAiZW4tR0IiIHRvICJlbi1V UyIuIE1ha2Ugc3VyZSB0aGF0IHdlIGZpcmUgYSBsYW5ndWFnZWNoYW5nZSBldmVudCBhdCB0aGUg V2luZG93IGFuZCB0aGF0IG5hdmlnYXRvci5sYW5ndWFnZQotICAgIC8vIG5vdyByZXBvcnRzICJl bi1nYiIuCisgICAgLy8gbm93IHJlcG9ydHMgImVuLUdCIi4KICAgICBzeXN0ZW0oW05TU3RyaW5n IHN0cmluZ1dpdGhGb3JtYXQ6QCJkZWZhdWx0cyB3cml0ZSBOU0dsb2JhbERvbWFpbiBBcHBsZUxh bmd1YWdlcyAnKFwiZW4tVVNcIiknIl0uVVRGOFN0cmluZyk7Ci0gICAgQ0ZOb3RpZmljYXRpb25D ZW50ZXJQb3N0Tm90aWZpY2F0aW9uKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0RGlzdHJpYnV0ZWRD ZW50ZXIoKSwgQ0ZTVFIoIkFwcGxlTGFuZ3VhZ2VQcmVmZXJlbmNlc0NoYW5nZWROb3RpZmljYXRp b24iKSwgbnVsbHB0ciwgbnVsbHB0ciwgdHJ1ZSk7CiAKICAgICAvLyBJbXBsZW1lbnQgb3VyIG93 biB0aW1lb3V0IGJlY2F1c2Ugd2Ugd291bGQgZmFpbCB0byByZXNldCB0aGUgbGFuZ3VhZ2UgaWYg d2UgbGV0IHRoZSB0ZXN0IGFjdHVhbGx5IHRpbWUgb3V0LgogICAgIGRpc3BhdGNoX2FmdGVyKGRp c3BhdGNoX3RpbWUoRElTUEFUQ0hfVElNRV9OT1csIDEwICogTlNFQ19QRVJfU0VDKSwgZGlzcGF0 Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKQEAgLTEzMCw1ICsxNzcsMTAgQEAgVEVTVF9GKEFwcGxl TGFuZ3VhZ2VzVGVzdCwgVXBkYXRlQXBwbGVMYW5ndWFnZXMpCiAKICAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJmRvbmUpOwogICAgIEVYUEVDVF9UUlVFKGRpZENoYW5nZUxhbmd1YWdlKTsK KyAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlT2JzZXJ2ZXJQcmVmZXJlbmNlRGlkQ2hhbmdlQ2Fs bGVkKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJlbi1VUyIsIHByZWZlcnJlZExhbmd1YWdlKCkp OworICAgIEVYUEVDVF9XS19TVFJFUShAImVuLVVTIiwgZ2V0TGFuZ3VhZ2VGcm9tTlNVc2VyRGVm YXVsdHMoKSk7CisKKyAgICBtZXRob2Rfc2V0SW1wbGVtZW50YXRpb24oc2hhcmVkSW5zdGFuY2VN ZXRob2QsIChJTVApc2hhcmVkSW5zdGFuY2VNZXRob2RPcmlnaW5hbCk7CiB9CiAjZW5kaWYK