211920 2020-05-14 13:49:49 -0700 Make sure we use current data store in WKTR's TestController 2020-05-15 13:51:14 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen cdumez webkit-bug-importer wilander oldest_to_newest 1652784 0 cdumez 2020-05-14 13:49:49 -0700 Make sure we use current data store in WKTR's TestController. Currently, a lot of code uses defaultDataStore(), even though the test may be using another data store (e.g. an ephemeral one). I suspect this is contributing to test flakiness. 1652785 1 399404 cdumez 2020-05-14 13:51:04 -0700 Created attachment 399404 Patch 1652821 2 399417 cdumez 2020-05-14 15:27:49 -0700 Created attachment 399417 Patch 1652855 3 399424 cdumez 2020-05-14 16:16:44 -0700 Created attachment 399424 Patch 1652858 4 399425 cdumez 2020-05-14 16:22:59 -0700 Created attachment 399425 Patch 1652914 5 399440 cdumez 2020-05-14 18:55:16 -0700 Created attachment 399440 Patch 1653162 6 ews-feeder 2020-05-15 13:50:22 -0700 Committed r261758: <https://trac.webkit.org/changeset/261758> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399440. 1653164 7 webkit-bug-importer 2020-05-15 13:51:14 -0700 <rdar://problem/63287645> 399404 2020-05-14 13:51:04 -0700 2020-05-14 15:27:48 -0700 Patch bug-211920-20200514135103.patch text/plain 8641 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNjk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjhmMzVhYzJmYThhNGFlMjk0NzBiZTk0YjUwMzdkNWJh NDQ3YmEwOC4uYmU5OGFkYmRhNmM4MjdlOTVlNjA4MjQ2MzcwM2QwNzI0Y2I3OTY3ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDIwLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFrZSBzdXJlIHdlIHVzZSBjdXJyZW50IGRhdGEgc3RvcmUgaW4gV0tUUidzIFRlc3RDb250 cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTE5MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgd2UgdXNlIGN1cnJlbnQgZGF0YSBzdG9yZSBpbiBXS1RSJ3MgVGVzdENvbnRyb2xs ZXIuIEN1cnJlbnRseSwgYSBsb3Qgb2YgY29kZQorICAgICAgICB1c2VzIGRlZmF1bHREYXRhU3Rv cmUoKSwgZXZlbiB0aG91Z2ggdGhlIHRlc3QgbWF5IGJlIHVzaW5nIGFub3RoZXIgZGF0YSBzdG9y ZSAoZS5nLiBhbgorICAgICAgICBlcGhlbWVyYWwgb25lKS4gSSBzdXNwZWN0IHRoaXMgaXMgY29u dHJpYnV0aW5nIHRvIHRlc3QgZmxha2luZXNzLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpyZXNl dFByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRy b2xsZXI6OnJlc2V0U3RhdGVUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAoV1RSOjpUZXN0 Q29udHJvbGxlcjo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRs ZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjbGVhclNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25zKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmNsZWFyRE9NQ2FjaGUp OgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y2xlYXJET01DYWNoZXMpOgorICAgICAg ICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aGFzRE9NQ2FjaGUpOgorICAgICAgICAoV1RSOjpUZXN0 Q29udHJvbGxlcjo6ZG9tQ2FjaGVTaXplKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6 OmNsZWFyU3RhdGlzdGljc0RhdGFGb3JEb21haW4pOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvVGVzdEludm9jYXRpb24uY3BwOgorICAgICAgICAoV1RSOjpUZXN0SW52b2NhdGlvbjo6aW52 b2tlKToKKyAgICAgICAgKFdUUjo6VGVzdEludm9jYXRpb246OmRpZFJlY2VpdmVTeW5jaHJvbm91 c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUpOgorCiAyMDIwLTA1LTE0ICBNaWNoYWVsIENhdGFu emFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgogCiAgICAgICAgIHN0cmVzcy9hcnJheS1idWZm ZXItdmlldy13YXRjaHBvaW50LWNhbi1iZS1maXJlZC1pbi1yZWFsbHktYWRkLWluLWRmZy5qcyBm YWlsaW5nIG9uIHBwYzY0bGUgYW5kIHMzOTB4CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCmluZGV4IDQ3NDYwMzIyYzZmMGNiNTE0NzU2ZmFmNTMzNTA4OTI1ZDM2MDcx NDkuLjQzMzEyYjkyYmZmNGNiNDFiZGE3MWUzYzdhYjViODY5MzdhYTQ2ZmMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC05NDEsNyArOTQxLDcgQEAgdm9p ZCBUZXN0Q29udHJvbGxlcjo6cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyhjb25z dCBUZXN0T3B0aW9ucyYgb3B0aW8KICAgICBXS1ByZWZlcmVuY2VzU2V0QmVhY29uQVBJRW5hYmxl ZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldERpcmVjdG9yeVVwbG9h ZEVuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogCi0gICAgV0tIVFRQQ29va2llU3RvcmVEZWxl dGVBbGxDb29raWVzKFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBDb29raWVTdG9yZShUZXN0Q29u dHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSksIG51bGxwdHIsIG51bGxwdHIpOwor ICAgIFdLSFRUUENvb2tpZVN0b3JlRGVsZXRlQWxsQ29va2llcyhXS1dlYnNpdGVEYXRhU3RvcmVH ZXRIVFRQQ29va2llU3RvcmUod2Vic2l0ZURhdGFTdG9yZSgpKSwgbnVsbHB0ciwgbnVsbHB0cik7 CiAKICAgICBXS1ByZWZlcmVuY2VzU2V0TW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZChwcmVmZXJl bmNlcywgdHJ1ZSk7CiAgICAgCkBAIC0xMDI4LDcgKzEwMjgsNiBAQCBib29sIFRlc3RDb250cm9s bGVyOjpyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKGNvbnN0IFRlc3RPcHRpb25zJiBvcHRp b25zLCBSZQogICAgIFdLQ29udGV4dFJlc2V0U2VydmljZVdvcmtlckZldGNoVGltZW91dEZvclRl c3RpbmcoVGVzdENvbnRyb2xsZXI6OnNpbmdsZXRvbigpLmNvbnRleHQoKSk7CiAKICAgICBXS1dl YnNpdGVEYXRhU3RvcmVDbGVhckFsbERldmljZU9yaWVudGF0aW9uUGVybWlzc2lvbnMod2Vic2l0 ZURhdGFTdG9yZSgpKTsKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVDbGVhckFsbERldmljZU9yaWVu dGF0aW9uUGVybWlzc2lvbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3Jl KCkpOwogCiAgICAgY2xlYXJJbmRleGVkRGF0YWJhc2VzKCk7CiAgICAgY2xlYXJMb2NhbFN0b3Jh Z2UoKTsKQEAgLTIyMzMsNyArMjIzMiw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRpZFJlY2Vp dmVTeW5jaHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV0tTdHJpbmdSZWYKIAogICAg IGF1dG8gc2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSA9IFsmXSAoV0tIVFRQQ29va2llQWNjZXB0 UG9saWN5IHBvbGljeSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXS1R5cGVSZWYpPiYmIGNvbXBs ZXRpb25IYW5kbGVyKSB7CiAgICAgICAgIGF1dG8gY29udGV4dCA9IG5ldyBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKFdLVHlwZVJlZik+KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLSAgICAg ICAgV0tIVFRQQ29va2llU3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURh dGFTdG9yZUdldEhUVFBDb29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVE YXRhU3RvcmUoKSksIHBvbGljeSwgY29udGV4dCwgW10gKHZvaWQqIGNvbnRleHQpIHsKKyAgICAg ICAgV0tIVFRQQ29va2llU3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURh dGFTdG9yZUdldEhUVFBDb29raWVTdG9yZSh3ZWJzaXRlRGF0YVN0b3JlKCkpLCBwb2xpY3ksIGNv bnRleHQsIFtdICh2b2lkKiBjb250ZXh0KSB7CiAgICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25I YW5kbGVyUG9pbnRlciA9IHN0YXRpY19jYXN0PENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV0tUeXBl UmVmKT4qPihjb250ZXh0KTsKICAgICAgICAgICAgICgqY29tcGxldGlvbkhhbmRsZXJQb2ludGVy KShudWxscHRyKTsKICAgICAgICAgICAgIGRlbGV0ZSBjb21wbGV0aW9uSGFuZGxlclBvaW50ZXI7 CkBAIC0zMjE3LDcgKzMyMTYsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25zKCkKIHsKICAgICBDbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25zQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwogCi0gICAgV0tXZWJzaXRlRGF0YVN0 b3JlUmVtb3ZlQWxsU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbnMoVGVzdENvbnRyb2xsZXI6OmRl ZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBjbGVhclNlcnZpY2VXb3JrZXJSZWdp c3RyYXRpb25zQ2FsbGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbFNlcnZp Y2VXb3JrZXJSZWdpc3RyYXRpb25zKHdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGNsZWFy U2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbnNDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4 dC5kb25lLCBub1RpbWVvdXQpOwogfQogCkBAIC0zMjQzLDcgKzMyNDIsNyBAQCB2b2lkIFRlc3RD b250cm9sbGVyOjpjbGVhckRPTUNhY2hlKFdLU3RyaW5nUmVmIG9yaWdpbikKICAgICBDbGVhckRP TUNhY2hlQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwogCiAgICAgYXV0byBjYWNoZU9y aWdpbiA9IGFkb3B0V0soV0tTZWN1cml0eU9yaWdpbkNyZWF0ZUZyb21TdHJpbmcob3JpZ2luKSk7 Ci0gICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlRmV0Y2hDYWNoZUZvck9yaWdpbihUZXN0Q29u dHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSwgY2FjaGVPcmlnaW4uZ2V0KCksICZj b250ZXh0LCBjbGVhckRPTUNhY2hlQ2FsbGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJl bW92ZUZldGNoQ2FjaGVGb3JPcmlnaW4od2Vic2l0ZURhdGFTdG9yZSgpLCBjYWNoZU9yaWdpbi5n ZXQoKSwgJmNvbnRleHQsIGNsZWFyRE9NQ2FjaGVDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29u dGV4dC5kb25lLCBub1RpbWVvdXQpOwogfQogCkBAIC0zMjUxLDcgKzMyNTAsNyBAQCB2b2lkIFRl c3RDb250cm9sbGVyOjpjbGVhckRPTUNhY2hlcygpCiB7CiAgICAgQ2xlYXJET01DYWNoZUNhbGxi YWNrQ29udGV4dCBjb250ZXh0KCp0aGlzKTsKIAotICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92 ZUFsbEZldGNoQ2FjaGVzKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgp LCAmY29udGV4dCwgY2xlYXJET01DYWNoZUNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3Rv cmVSZW1vdmVBbGxGZXRjaENhY2hlcyh3ZWJzaXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBjbGVh ckRPTUNhY2hlQ2FsbGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0 KTsKIH0KIApAQCAtMzMzNSw3ICszMzM0LDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZU9yaWdp bnNDYWxsYmFjayhXS0FycmF5UmVmIG9yaWdpbnMsIHZvaWQqIHVzZXJEYXRhKQogYm9vbCBUZXN0 Q29udHJvbGxlcjo6aGFzRE9NQ2FjaGUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNo Q2FjaGVPcmlnaW5zQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMsIG9yaWdpbik7Ci0gICAg V0tXZWJzaXRlRGF0YVN0b3JlR2V0RmV0Y2hDYWNoZU9yaWdpbnMoVGVzdENvbnRyb2xsZXI6OmRl ZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxi YWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlT3JpZ2lucyh3ZWJzaXRl RGF0YVN0b3JlKCksICZjb250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKICAgICBy dW5VbnRpbChjb250ZXh0LmRvbmUsIG5vVGltZW91dCk7CiAgICAgcmV0dXJuIGNvbnRleHQucmVz dWx0OwogfQpAQCAtMzM2Myw3ICszMzYyLDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZVNpemVG b3JPcmlnaW5DYWxsYmFjayh1aW50NjRfdCBzaXplLCB2b2lkKiB1c2VyRGF0YSkKIHVpbnQ2NF90 IFRlc3RDb250cm9sbGVyOjpkb21DYWNoZVNpemUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAg IEZldGNoQ2FjaGVTaXplRm9yT3JpZ2luQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwot ICAgIFdLV2Vic2l0ZURhdGFTdG9yZUdldEZldGNoQ2FjaGVTaXplRm9yT3JpZ2luKFRlc3RDb250 cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCBvcmlnaW4sICZjb250ZXh0LCBmZXRj aENhY2hlU2l6ZUZvck9yaWdpbkNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVHZXRG ZXRjaENhY2hlU2l6ZUZvck9yaWdpbih3ZWJzaXRlRGF0YVN0b3JlKCksIG9yaWdpbiwgJmNvbnRl eHQsIGZldGNoQ2FjaGVTaXplRm9yT3JpZ2luQ2FsbGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRl eHQuZG9uZSwgbm9UaW1lb3V0KTsKICAgICByZXR1cm4gY29udGV4dC5yZXN1bHQ7CiB9CkBAIC0z NDIwLDcgKzM0MTksNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclN0YXRpc3RpY3NEYXRh Rm9yRG9tYWluKFdLU3RyaW5nUmVmIGRvbWFpbikKIHsKICAgICBSZXNvdXJjZVN0YXRpc3RpY3ND YWxsYmFja0NvbnRleHQgY29udGV4dCgqdGhpcyk7CiAKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVS ZW1vdmVJVFBEYXRhRm9yRG9tYWluKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFT dG9yZSgpLCBkb21haW4sICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2Fs bGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUlUUERhdGFGb3JEb21haW4od2Vi c2l0ZURhdGFTdG9yZSgpLCBkb21haW4sICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lk UmVzdWx0Q2FsbGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsK IH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5j cHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcAppbmRleCAyMDAx ZTYwYTI2MmU0YTU1ZTFkYzIwNTc0ZjFlNGJiMzM2MDExMjM0Li5lMzIyN2VlMDlkMzFhNzhhYjZl MGQ3YzQ3OWE1MTFiNmVlYzAzNGFmIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVy L1Rlc3RJbnZvY2F0aW9uLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZv Y2F0aW9uLmNwcApAQCAtMTY0LDcgKzE2NCw3IEBAIHZvaWQgVGVzdEludm9jYXRpb246Omludm9r ZSgpCiAKICAgICBUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkuc2V0U2hvdWxkTG9nSGlzdG9y eUNsaWVudENhbGxiYWNrcyhzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKCkpOwogCi0g ICAgV0tIVFRQQ29va2llU3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURh dGFTdG9yZUdldEhUVFBDb29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVE YXRhU3RvcmUoKSksIGtXS0hUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVu dERvbWFpbiwgbnVsbHB0ciwgbnVsbHB0cik7CisgICAgV0tIVFRQQ29va2llU3RvcmVTZXRIVFRQ Q29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBDb29raWVTdG9yZShU ZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkud2Vic2l0ZURhdGFTdG9yZSgpKSwga1dLSFRUUENv b2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluLCBudWxscHRyLCBudWxs cHRyKTsKIAogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgY2xlYXIgb3V0IHZpc2l0ZWQgbGlua3Mg aGVyZS4KIApAQCAtMTA4Miw3ICsxMDgyLDcgQEAgV0tSZXRhaW5QdHI8V0tUeXBlUmVmPiBUZXN0 SW52b2NhdGlvbjo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEIKICAg ICBpZiAoV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNzYWdlTmFtZSwgIlNldENhY2hl TW9kZWwiKSkgewogICAgICAgICBBU1NFUlQoV0tHZXRUeXBlSUQobWVzc2FnZUJvZHkpID09IFdL VUludDY0R2V0VHlwZUlEKCkpOwogICAgICAgICB1aW50NjRfdCBtb2RlbCA9IFdLVUludDY0R2V0 VmFsdWUoc3RhdGljX2Nhc3Q8V0tVSW50NjRSZWY+KG1lc3NhZ2VCb2R5KSk7Ci0gICAgICAgIFdL V2Vic2l0ZURhdGFTdG9yZVNldENhY2hlTW9kZWxTeW5jaHJvbm91c2x5Rm9yVGVzdGluZyhUZXN0 Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSwgbW9kZWwpOworICAgICAgICBX S1dlYnNpdGVEYXRhU3RvcmVTZXRDYWNoZU1vZGVsU3luY2hyb25vdXNseUZvclRlc3RpbmcoVGVz dENvbnRyb2xsZXI6OnNpbmdsZXRvbigpLndlYnNpdGVEYXRhU3RvcmUoKSwgbW9kZWwpOwogICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKQEAgLTExMzksNyArMTEzOSw3IEBAIFdLUmV0 YWluUHRyPFdLVHlwZVJlZj4gVGVzdEludm9jYXRpb246OmRpZFJlY2VpdmVTeW5jaHJvbm91c01l c3NhZ2VGcm9tSW5qZWN0ZWRCCiAgICAgfQogICAgIAogICAgIGlmIChXS1N0cmluZ0lzRXF1YWxU b1VURjhDU3RyaW5nKG1lc3NhZ2VOYW1lLCAiRGVsZXRlQWxsSW5kZXhlZERhdGFiYXNlcyIpKSB7 Ci0gICAgICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbEluZGV4ZWREYXRhYmFzZXMoVGVz dENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCksIG51bGxwdHIsIHsgfSk7Cisg ICAgICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbEluZGV4ZWREYXRhYmFzZXMoVGVzdENv bnRyb2xsZXI6OnNpbmdsZXRvbigpLndlYnNpdGVEYXRhU3RvcmUoKSwgbnVsbHB0ciwgeyB9KTsK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCg== 399417 2020-05-14 15:27:49 -0700 2020-05-14 16:16:43 -0700 Patch bug-211920-20200514152748.patch text/plain 7486 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTc4ZTFiYTVlYWFhNjllOWE5ZjIzY2Q3YTZkNTM1Yzcy OWM2ODY5OS4uYTkwNTVlYzYxOTIwMDZkMDgzZjBmMTFkYzIyYmNjZTQ0MTBlYmZjNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFrZSBzdXJlIHdlIHVzZSBjdXJyZW50IGRhdGEgc3RvcmUgaW4gV0tUUidzIFRlc3RDb250 cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTE5MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgd2UgdXNlIGN1cnJlbnQgZGF0YSBzdG9yZSBpbiBXS1RSJ3MgVGVzdENvbnRyb2xs ZXIuIEN1cnJlbnRseSwgYSBsb3Qgb2YgY29kZQorICAgICAgICB1c2VzIGRlZmF1bHREYXRhU3Rv cmUoKSwgZXZlbiB0aG91Z2ggdGhlIHRlc3QgbWF5IGJlIHVzaW5nIGFub3RoZXIgZGF0YSBzdG9y ZSAoZS5nLiBhbgorICAgICAgICBlcGhlbWVyYWwgb25lKS4gSSBzdXNwZWN0IHRoaXMgaXMgY29u dHJpYnV0aW5nIHRvIHRlc3QgZmxha2luZXNzLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkaWRS ZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKToKKyAgICAgICAgKFdU Ujo6VGVzdENvbnRyb2xsZXI6OmNsZWFyU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbnMpOgorICAg ICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y2xlYXJET01DYWNoZSk6CisgICAgICAgIChXVFI6 OlRlc3RDb250cm9sbGVyOjpjbGVhckRPTUNhY2hlcyk6CisgICAgICAgIChXVFI6OlRlc3RDb250 cm9sbGVyOjpoYXNET01DYWNoZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkb21D YWNoZVNpemUpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6Y2xlYXJTdGF0aXN0aWNz RGF0YUZvckRvbWFpbik6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlv bi5jcHA6CisgICAgICAgIChXVFI6OlRlc3RJbnZvY2F0aW9uOjppbnZva2UpOgorICAgICAgICAo V1RSOjpUZXN0SW52b2NhdGlvbjo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21Jbmpl Y3RlZEJ1bmRsZSk6CisKIDIwMjAtMDUtMTQgIEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJA YXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBmb3IgY3Jhc2hlcyBpbiBMYXlvdXRUZXN0cyByZWxh dGVkIHRvIFRleHRNYXJrZXJzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KZGlmZiAtLWdpdCBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggNDc0NjAzMjJjNmYwY2I1MTQ3NTZmYWY1 MzM1MDg5MjVkMzYwNzE0OS4uODAxMmViYjc3MTRjNjQ1MDdjMzQ0MzQxNDFhM2U2MzE3NzUxNWJk YSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAK KysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTIyMzMs NyArMjIzMyw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRpZFJlY2VpdmVTeW5jaHJvbm91c01l c3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV0tTdHJpbmdSZWYKIAogICAgIGF1dG8gc2V0SFRUUENv b2tpZUFjY2VwdFBvbGljeSA9IFsmXSAoV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSwg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChXS1R5cGVSZWYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKSB7 CiAgICAgICAgIGF1dG8gY29udGV4dCA9IG5ldyBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFdLVHlw ZVJlZik+KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLSAgICAgICAgV0tIVFRQQ29va2ll U3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBD b29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSksIHBv bGljeSwgY29udGV4dCwgW10gKHZvaWQqIGNvbnRleHQpIHsKKyAgICAgICAgV0tIVFRQQ29va2ll U3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBD b29raWVTdG9yZSh3ZWJzaXRlRGF0YVN0b3JlKCkpLCBwb2xpY3ksIGNvbnRleHQsIFtdICh2b2lk KiBjb250ZXh0KSB7CiAgICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyUG9pbnRlciA9 IHN0YXRpY19jYXN0PENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV0tUeXBlUmVmKT4qPihjb250ZXh0 KTsKICAgICAgICAgICAgICgqY29tcGxldGlvbkhhbmRsZXJQb2ludGVyKShudWxscHRyKTsKICAg ICAgICAgICAgIGRlbGV0ZSBjb21wbGV0aW9uSGFuZGxlclBvaW50ZXI7CkBAIC0zMjE3LDcgKzMy MTcsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25zKCkKIHsKICAgICBDbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zQ2FsbGJhY2tDb250 ZXh0IGNvbnRleHQoKnRoaXMpOwogCi0gICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxsU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0 YVN0b3JlKCksICZjb250ZXh0LCBjbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zQ2FsbGJh Y2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25zKHdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGNsZWFyU2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbnNDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25lLCBub1RpbWVv dXQpOwogfQogCkBAIC0zMjQzLDcgKzMyNDMsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVh ckRPTUNhY2hlKFdLU3RyaW5nUmVmIG9yaWdpbikKICAgICBDbGVhckRPTUNhY2hlQ2FsbGJhY2tD b250ZXh0IGNvbnRleHQoKnRoaXMpOwogCiAgICAgYXV0byBjYWNoZU9yaWdpbiA9IGFkb3B0V0so V0tTZWN1cml0eU9yaWdpbkNyZWF0ZUZyb21TdHJpbmcob3JpZ2luKSk7Ci0gICAgV0tXZWJzaXRl RGF0YVN0b3JlUmVtb3ZlRmV0Y2hDYWNoZUZvck9yaWdpbihUZXN0Q29udHJvbGxlcjo6ZGVmYXVs dFdlYnNpdGVEYXRhU3RvcmUoKSwgY2FjaGVPcmlnaW4uZ2V0KCksICZjb250ZXh0LCBjbGVhckRP TUNhY2hlQ2FsbGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVG b3JPcmlnaW4od2Vic2l0ZURhdGFTdG9yZSgpLCBjYWNoZU9yaWdpbi5nZXQoKSwgJmNvbnRleHQs IGNsZWFyRE9NQ2FjaGVDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25lLCBub1Rp bWVvdXQpOwogfQogCkBAIC0zMjUxLDcgKzMyNTEsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpj bGVhckRPTUNhY2hlcygpCiB7CiAgICAgQ2xlYXJET01DYWNoZUNhbGxiYWNrQ29udGV4dCBjb250 ZXh0KCp0aGlzKTsKIAotICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbEZldGNoQ2FjaGVz KFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCAmY29udGV4dCwgY2xl YXJET01DYWNoZUNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVBbGxGZXRj aENhY2hlcyh3ZWJzaXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBjbGVhckRPTUNhY2hlQ2FsbGJh Y2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKIH0KIApAQCAtMzMz NSw3ICszMzM1LDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZU9yaWdpbnNDYWxsYmFjayhXS0Fy cmF5UmVmIG9yaWdpbnMsIHZvaWQqIHVzZXJEYXRhKQogYm9vbCBUZXN0Q29udHJvbGxlcjo6aGFz RE9NQ2FjaGUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNoQ2FjaGVPcmlnaW5zQ2Fs bGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMsIG9yaWdpbik7Ci0gICAgV0tXZWJzaXRlRGF0YVN0 b3JlR2V0RmV0Y2hDYWNoZU9yaWdpbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0 YVN0b3JlKCksICZjb250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKKyAgICBXS1dl YnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlT3JpZ2lucyh3ZWJzaXRlRGF0YVN0b3JlKCksICZj b250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKICAgICBydW5VbnRpbChjb250ZXh0 LmRvbmUsIG5vVGltZW91dCk7CiAgICAgcmV0dXJuIGNvbnRleHQucmVzdWx0OwogfQpAQCAtMzM2 Myw3ICszMzYzLDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZVNpemVGb3JPcmlnaW5DYWxsYmFj ayh1aW50NjRfdCBzaXplLCB2b2lkKiB1c2VyRGF0YSkKIHVpbnQ2NF90IFRlc3RDb250cm9sbGVy Ojpkb21DYWNoZVNpemUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNoQ2FjaGVTaXpl Rm9yT3JpZ2luQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwotICAgIFdLV2Vic2l0ZURh dGFTdG9yZUdldEZldGNoQ2FjaGVTaXplRm9yT3JpZ2luKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0 V2Vic2l0ZURhdGFTdG9yZSgpLCBvcmlnaW4sICZjb250ZXh0LCBmZXRjaENhY2hlU2l6ZUZvck9y aWdpbkNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlU2l6ZUZv ck9yaWdpbih3ZWJzaXRlRGF0YVN0b3JlKCksIG9yaWdpbiwgJmNvbnRleHQsIGZldGNoQ2FjaGVT aXplRm9yT3JpZ2luQ2FsbGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1l b3V0KTsKICAgICByZXR1cm4gY29udGV4dC5yZXN1bHQ7CiB9CkBAIC0zNDIwLDcgKzM0MjAsNyBA QCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclN0YXRpc3RpY3NEYXRhRm9yRG9tYWluKFdLU3Ry aW5nUmVmIGRvbWFpbikKIHsKICAgICBSZXNvdXJjZVN0YXRpc3RpY3NDYWxsYmFja0NvbnRleHQg Y29udGV4dCgqdGhpcyk7CiAKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVJVFBEYXRhRm9y RG9tYWluKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCBkb21haW4s ICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2FsbGJhY2spOworICAgIFdL V2Vic2l0ZURhdGFTdG9yZVJlbW92ZUlUUERhdGFGb3JEb21haW4od2Vic2l0ZURhdGFTdG9yZSgp LCBkb21haW4sICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2FsbGJhY2sp OwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHAgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcAppbmRleCAyMDAxZTYwYTI2MmU0YTU1ZTFk YzIwNTc0ZjFlNGJiMzM2MDExMjM0Li5lMzIyN2VlMDlkMzFhNzhhYjZlMGQ3YzQ3OWE1MTFiNmVl YzAzNGFmIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9u LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcApAQCAt MTY0LDcgKzE2NCw3IEBAIHZvaWQgVGVzdEludm9jYXRpb246Omludm9rZSgpCiAKICAgICBUZXN0 Q29udHJvbGxlcjo6c2luZ2xldG9uKCkuc2V0U2hvdWxkTG9nSGlzdG9yeUNsaWVudENhbGxiYWNr cyhzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKCkpOwogCi0gICAgV0tIVFRQQ29va2ll U3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBD b29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSksIGtX S0hUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiwgbnVsbHB0 ciwgbnVsbHB0cik7CisgICAgV0tIVFRQQ29va2llU3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9s aWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBDb29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6 c2luZ2xldG9uKCkud2Vic2l0ZURhdGFTdG9yZSgpKSwga1dLSFRUUENvb2tpZUFjY2VwdFBvbGlj eU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluLCBudWxscHRyLCBudWxscHRyKTsKIAogICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgY2xlYXIgb3V0IHZpc2l0ZWQgbGlua3MgaGVyZS4KIApAQCAtMTA4 Miw3ICsxMDgyLDcgQEAgV0tSZXRhaW5QdHI8V0tUeXBlUmVmPiBUZXN0SW52b2NhdGlvbjo6ZGlk UmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEIKICAgICBpZiAoV0tTdHJpbmdJ c0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNzYWdlTmFtZSwgIlNldENhY2hlTW9kZWwiKSkgewogICAg ICAgICBBU1NFUlQoV0tHZXRUeXBlSUQobWVzc2FnZUJvZHkpID09IFdLVUludDY0R2V0VHlwZUlE KCkpOwogICAgICAgICB1aW50NjRfdCBtb2RlbCA9IFdLVUludDY0R2V0VmFsdWUoc3RhdGljX2Nh c3Q8V0tVSW50NjRSZWY+KG1lc3NhZ2VCb2R5KSk7Ci0gICAgICAgIFdLV2Vic2l0ZURhdGFTdG9y ZVNldENhY2hlTW9kZWxTeW5jaHJvbm91c2x5Rm9yVGVzdGluZyhUZXN0Q29udHJvbGxlcjo6ZGVm YXVsdFdlYnNpdGVEYXRhU3RvcmUoKSwgbW9kZWwpOworICAgICAgICBXS1dlYnNpdGVEYXRhU3Rv cmVTZXRDYWNoZU1vZGVsU3luY2hyb25vdXNseUZvclRlc3RpbmcoVGVzdENvbnRyb2xsZXI6OnNp bmdsZXRvbigpLndlYnNpdGVEYXRhU3RvcmUoKSwgbW9kZWwpOwogICAgICAgICByZXR1cm4gbnVs bHB0cjsKICAgICB9CiAKQEAgLTExMzksNyArMTEzOSw3IEBAIFdLUmV0YWluUHRyPFdLVHlwZVJl Zj4gVGVzdEludm9jYXRpb246OmRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0 ZWRCCiAgICAgfQogICAgIAogICAgIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKG1l c3NhZ2VOYW1lLCAiRGVsZXRlQWxsSW5kZXhlZERhdGFiYXNlcyIpKSB7Ci0gICAgICAgIFdLV2Vi c2l0ZURhdGFTdG9yZVJlbW92ZUFsbEluZGV4ZWREYXRhYmFzZXMoVGVzdENvbnRyb2xsZXI6OmRl ZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCksIG51bGxwdHIsIHsgfSk7CisgICAgICAgIFdLV2Vic2l0 ZURhdGFTdG9yZVJlbW92ZUFsbEluZGV4ZWREYXRhYmFzZXMoVGVzdENvbnRyb2xsZXI6OnNpbmds ZXRvbigpLndlYnNpdGVEYXRhU3RvcmUoKSwgbnVsbHB0ciwgeyB9KTsKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAgICAgfQogCg== 399424 2020-05-14 16:16:44 -0700 2020-05-14 16:22:58 -0700 Patch bug-211920-20200514161643.patch text/plain 14505 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTc4ZTFiYTVlYWFhNjllOWE5ZjIzY2Q3YTZkNTM1Yzcy OWM2ODY5OS4uYTg5YjcyMmU4MTMwNmVlZjQzYjdmNDRmODNlZGQwM2RkNTg0ODAxMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIwLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFrZSBzdXJlIHdlIHVzZSBjdXJyZW50IGRhdGEgc3RvcmUgaW4gV0tUUidzIFRlc3RDb250 cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTE5MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgd2UgdXNlIGN1cnJlbnQgZGF0YSBzdG9yZSBpbiBXS1RSJ3MgVGVzdENvbnRyb2xs ZXIuIEN1cnJlbnRseSwgYSBsb3Qgb2YgY29kZQorICAgICAgICB1c2VzIGRlZmF1bHREYXRhU3Rv cmUoKSwgZXZlbiB0aG91Z2ggdGhlIHRlc3QgbWF5IGJlIHVzaW5nIGFub3RoZXIgZGF0YSBzdG9y ZSAoZS5nLiBhbgorICAgICAgICBlcGhlbWVyYWwgb25lKS4gSSBzdXNwZWN0IHRoaXMgaXMgY29u dHJpYnV0aW5nIHRvIHRlc3QgZmxha2luZXNzLgorCisgICAgICAgIFdlIG5vdyBhbHNvIG1ha2Ug c3VyZSB0aGF0IFRlc3RDb250cm9sbGVyOjp3ZWJzaXRlRGF0YVN0b3JlKCkgcmV0dXJucyB0aGUg YWN0dWFsIHN0b3JlCisgICAgICAgIHRoYXQgd2lsbCBiZSB1c2VkIGJ5IHRoZSB0ZXN0IHdoZW4g cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcygpIGlzIGNhbGxlZC4KKyAgICAgICAg UHJldmlvdXNseSwgaXQgd291bGQgbm90IHNpbmNlIGl0IHdvdWxkIGdldCB0aGUgc3RvcmUgZnJv bSB0aGUgbV9tYWluVmlldyBhbmQgbV9tYWluVmlldworICAgICAgICB3b3VsZCBvbmx5IGdldCBp bml0aWFsaXplZCBhZnRlciBjYWxsaW5nIHJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1 ZXMoKS4gVG8gc3VwcG9ydAorICAgICAgICB0aGlzLCB3ZSBub3cgaW5pdGlhbGl6ZSBhIG1fd2Vi c2l0ZURhdGFTdG9yZSBtZW1iZXIgaW4gcGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKCksCisg ICAgICAgIHdoaWNoIGdldHMgY2FsbGVkIHJpZ2h0IGJlZm9yZSByZXNldFByZWZlcmVuY2VzVG9D b25zaXN0ZW50VmFsdWVzKCkuIFdoZW4KKyAgICAgICAgcGxhdGZvcm1DcmVhdGVXZWJWaWV3KCkg Z2V0cyBjYWxsZWQgcmlnaHQgYWZ0ZXIgcmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVl cygpLAorICAgICAgICBpdCBub3cgc2ltcGx5IHJlbGllcyBvbiBtX3dlYnNpdGVEYXRhU3RvcmUg aW5zdGVhZCBvZiBjcmVhdGluZyB0aGUgZGF0YSBzdG9yZSBhdCB0aGlzCisgICAgICAgIHBvaW50 LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJv bUluamVjdGVkQnVuZGxlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmNsZWFyU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnMpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6 Y2xlYXJET01DYWNoZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjbGVhckRPTUNh Y2hlcyk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpoYXNET01DYWNoZSk6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkb21DYWNoZVNpemUpOgorICAgICAgICAoV1RSOjpU ZXN0Q29udHJvbGxlcjo6Y2xlYXJTdGF0aXN0aWNzRGF0YUZvckRvbWFpbik6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgIChXVFI6OlRlc3RJ bnZvY2F0aW9uOjppbnZva2UpOgorICAgICAgICAoV1RSOjpUZXN0SW52b2NhdGlvbjo6ZGlkUmVj ZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisKIDIwMjAtMDUtMTQg IEFuZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBm b3IgY3Jhc2hlcyBpbiBMYXlvdXRUZXN0cyByZWxhdGVkIHRvIFRleHRNYXJrZXJzIGluIGlzb2xh dGVkIHRyZWUgbW9kZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAK aW5kZXggNDc0NjAzMjJjNmYwY2I1MTQ3NTZmYWY1MzM1MDg5MjVkMzYwNzE0OS4uZjdhMmY3MTll M2I3YTQ1MTU2NjgxOGI2MTdmZDg5ZDU3ODY0YzYxMCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTU1Niw3ICs1NTYsNyBAQCBXS1dlYnNpdGVEYXRhU3Rv cmVSZWYgVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCkKIAogV0tXZWJz aXRlRGF0YVN0b3JlUmVmIFRlc3RDb250cm9sbGVyOjp3ZWJzaXRlRGF0YVN0b3JlKCkKIHsKLSAg ICByZXR1cm4gV0tQYWdlQ29uZmlndXJhdGlvbkdldFdlYnNpdGVEYXRhU3RvcmUoYWRvcHRXSyhX S1BhZ2VDb3B5UGFnZUNvbmZpZ3VyYXRpb24obV9tYWluV2ViVmlldy0+cGFnZSgpKSkuZ2V0KCkp OworICAgIHJldHVybiBtX3dlYnNpdGVEYXRhU3RvcmUuZ2V0KCk7CiB9CiAKIFdLUmV0YWluUHRy PFdLUGFnZUNvbmZpZ3VyYXRpb25SZWY+IFRlc3RDb250cm9sbGVyOjpnZW5lcmF0ZVBhZ2VDb25m aWd1cmF0aW9uKGNvbnN0IFRlc3RPcHRpb25zJiBvcHRpb25zKQpAQCAtNjUwLDYgKzY1MCw3IEBA IHZvaWQgVGVzdENvbnRyb2xsZXI6OmNyZWF0ZVdlYlZpZXdXaXRoT3B0aW9ucyhjb25zdCBUZXN0 T3B0aW9ucyYgb3B0aW9ucykKICNlbmRpZgogCiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gZ2Vu ZXJhdGVQYWdlQ29uZmlndXJhdGlvbihvcHRpb25zKTsKKyAgICBwbGF0Zm9ybUluaXRpYWxpemVE YXRhU3RvcmUoY29uZmlndXJhdGlvbi5nZXQoKSwgb3B0aW9ucyk7CiAKICAgICAvLyBTb21lIHBy ZWZlcmVuY2VzIChub3RhYmx5IG1vY2sgc2Nyb2xsIGJhcnMgc2V0dGluZykgY3VycmVudGx5IGNh bm5vdCBiZSByZS1hcHBsaWVkIHRvIGFuIGV4aXN0aW5nIHZpZXcsIHNvIHdlIG5lZWQgdG8gc2V0 IHRoZW0gbm93LgogICAgIC8vIEZJWE1FOiBNaWdyYXRlIHRoZXNlIHByZWZlcmVuY2VzIHRvIFdL Q29udGV4dENvbmZpZ3VyYXRpb25SZWYuCkBAIC05NDEsNyArOTQyLDcgQEAgdm9pZCBUZXN0Q29u dHJvbGxlcjo6cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcyhjb25zdCBUZXN0T3B0 aW9ucyYgb3B0aW8KICAgICBXS1ByZWZlcmVuY2VzU2V0QmVhY29uQVBJRW5hYmxlZChwcmVmZXJl bmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldERpcmVjdG9yeVVwbG9hZEVuYWJsZWQo cHJlZmVyZW5jZXMsIHRydWUpOwogCi0gICAgV0tIVFRQQ29va2llU3RvcmVEZWxldGVBbGxDb29r aWVzKFdLV2Vic2l0ZURhdGFTdG9yZUdldEhUVFBDb29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6 ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSksIG51bGxwdHIsIG51bGxwdHIpOworICAgIFdLSFRU UENvb2tpZVN0b3JlRGVsZXRlQWxsQ29va2llcyhXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQQ29v a2llU3RvcmUod2Vic2l0ZURhdGFTdG9yZSgpKSwgbnVsbHB0ciwgbnVsbHB0cik7CiAKICAgICBX S1ByZWZlcmVuY2VzU2V0TW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1 ZSk7CiAgICAgCkBAIC0xMDI4LDcgKzEwMjksNiBAQCBib29sIFRlc3RDb250cm9sbGVyOjpyZXNl dFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKGNvbnN0IFRlc3RPcHRpb25zJiBvcHRpb25zLCBSZQog ICAgIFdLQ29udGV4dFJlc2V0U2VydmljZVdvcmtlckZldGNoVGltZW91dEZvclRlc3RpbmcoVGVz dENvbnRyb2xsZXI6OnNpbmdsZXRvbigpLmNvbnRleHQoKSk7CiAKICAgICBXS1dlYnNpdGVEYXRh U3RvcmVDbGVhckFsbERldmljZU9yaWVudGF0aW9uUGVybWlzc2lvbnMod2Vic2l0ZURhdGFTdG9y ZSgpKTsKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVDbGVhckFsbERldmljZU9yaWVudGF0aW9uUGVy bWlzc2lvbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCkpOwogCiAg ICAgY2xlYXJJbmRleGVkRGF0YWJhc2VzKCk7CiAgICAgY2xlYXJMb2NhbFN0b3JhZ2UoKTsKQEAg LTIyMzMsNyArMjIzMyw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmRpZFJlY2VpdmVTeW5jaHJv bm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV0tTdHJpbmdSZWYKIAogICAgIGF1dG8gc2V0 SFRUUENvb2tpZUFjY2VwdFBvbGljeSA9IFsmXSAoV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBv bGljeSwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXS1R5cGVSZWYpPiYmIGNvbXBsZXRpb25IYW5k bGVyKSB7CiAgICAgICAgIGF1dG8gY29udGV4dCA9IG5ldyBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KFdLVHlwZVJlZik+KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLSAgICAgICAgV0tIVFRQ Q29va2llU3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdl dEhUVFBDb29raWVTdG9yZShUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUo KSksIHBvbGljeSwgY29udGV4dCwgW10gKHZvaWQqIGNvbnRleHQpIHsKKyAgICAgICAgV0tIVFRQ Q29va2llU3RvcmVTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KFdLV2Vic2l0ZURhdGFTdG9yZUdl dEhUVFBDb29raWVTdG9yZSh3ZWJzaXRlRGF0YVN0b3JlKCkpLCBwb2xpY3ksIGNvbnRleHQsIFtd ICh2b2lkKiBjb250ZXh0KSB7CiAgICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyUG9p bnRlciA9IHN0YXRpY19jYXN0PENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV0tUeXBlUmVmKT4qPihj b250ZXh0KTsKICAgICAgICAgICAgICgqY29tcGxldGlvbkhhbmRsZXJQb2ludGVyKShudWxscHRy KTsKICAgICAgICAgICAgIGRlbGV0ZSBjb21wbGV0aW9uSGFuZGxlclBvaW50ZXI7CkBAIC0zMTE2 LDYgKzMxMTYsMTEgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1XaWxsUnVuVGVzdChj b25zdCBUZXN0SW52b2NhdGlvbiYpCiB7CiB9CiAKK3ZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRm b3JtSW5pdGlhbGl6ZURhdGFTdG9yZShXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRp b24sIGNvbnN0IFRlc3RPcHRpb25zJikKK3sKKyAgICBtX3dlYnNpdGVEYXRhU3RvcmUgPSBXS1Bh Z2VDb25maWd1cmF0aW9uR2V0V2Vic2l0ZURhdGFTdG9yZShjb25maWd1cmF0aW9uKTsKK30KKwog dm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1DcmVhdGVXZWJWaWV3KFdLUGFnZUNvbmZpZ3Vy YXRpb25SZWYgY29uZmlndXJhdGlvbiwgY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvbnMpCiB7CiAg ICAgbV9tYWluV2ViVmlldyA9IG1ha2VVbmlxdWU8UGxhdGZvcm1XZWJWaWV3Pihjb25maWd1cmF0 aW9uLCBvcHRpb25zKTsKQEAgLTMyMTcsNyArMzIyMiw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6 OmNsZWFyU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbnMoKQogewogICAgIENsZWFyU2VydmljZVdv cmtlclJlZ2lzdHJhdGlvbnNDYWxsYmFja0NvbnRleHQgY29udGV4dCgqdGhpcyk7CiAKLSAgICBX S1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVBbGxTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9ucyhUZXN0 Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGNsZWFyU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnNDYWxsYmFjayk7CisgICAgV0tXZWJzaXRlRGF0YVN0b3Jl UmVtb3ZlQWxsU2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbnMod2Vic2l0ZURhdGFTdG9yZSgpLCAm Y29udGV4dCwgY2xlYXJTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uc0NhbGxiYWNrKTsKICAgICBy dW5VbnRpbChjb250ZXh0LmRvbmUsIG5vVGltZW91dCk7CiB9CiAKQEAgLTMyNDMsNyArMzI0OCw3 IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmNsZWFyRE9NQ2FjaGUoV0tTdHJpbmdSZWYgb3JpZ2lu KQogICAgIENsZWFyRE9NQ2FjaGVDYWxsYmFja0NvbnRleHQgY29udGV4dCgqdGhpcyk7CiAKICAg ICBhdXRvIGNhY2hlT3JpZ2luID0gYWRvcHRXSyhXS1NlY3VyaXR5T3JpZ2luQ3JlYXRlRnJvbVN0 cmluZyhvcmlnaW4pKTsKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVGZXRjaENhY2hlRm9y T3JpZ2luKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCBjYWNoZU9y aWdpbi5nZXQoKSwgJmNvbnRleHQsIGNsZWFyRE9NQ2FjaGVDYWxsYmFjayk7CisgICAgV0tXZWJz aXRlRGF0YVN0b3JlUmVtb3ZlRmV0Y2hDYWNoZUZvck9yaWdpbih3ZWJzaXRlRGF0YVN0b3JlKCks IGNhY2hlT3JpZ2luLmdldCgpLCAmY29udGV4dCwgY2xlYXJET01DYWNoZUNhbGxiYWNrKTsKICAg ICBydW5VbnRpbChjb250ZXh0LmRvbmUsIG5vVGltZW91dCk7CiB9CiAKQEAgLTMyNTEsNyArMzI1 Niw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmNsZWFyRE9NQ2FjaGVzKCkKIHsKICAgICBDbGVh ckRPTUNhY2hlQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwogCi0gICAgV0tXZWJzaXRl RGF0YVN0b3JlUmVtb3ZlQWxsRmV0Y2hDYWNoZXMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJz aXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBjbGVhckRPTUNhY2hlQ2FsbGJhY2spOworICAgIFdL V2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbEZldGNoQ2FjaGVzKHdlYnNpdGVEYXRhU3RvcmUoKSwg JmNvbnRleHQsIGNsZWFyRE9NQ2FjaGVDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5k b25lLCBub1RpbWVvdXQpOwogfQogCkBAIC0zMzM1LDcgKzMzNDAsNyBAQCBzdGF0aWMgdm9pZCBm ZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKFdLQXJyYXlSZWYgb3JpZ2lucywgdm9pZCogdXNlckRh dGEpCiBib29sIFRlc3RDb250cm9sbGVyOjpoYXNET01DYWNoZShXS1N0cmluZ1JlZiBvcmlnaW4p CiB7CiAgICAgRmV0Y2hDYWNoZU9yaWdpbnNDYWxsYmFja0NvbnRleHQgY29udGV4dCgqdGhpcywg b3JpZ2luKTsKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlT3JpZ2lucyhUZXN0 Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGZldGNoQ2Fj aGVPcmlnaW5zQ2FsbGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZUdldEZldGNoQ2FjaGVP cmlnaW5zKHdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGZldGNoQ2FjaGVPcmlnaW5zQ2Fs bGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKICAgICByZXR1 cm4gY29udGV4dC5yZXN1bHQ7CiB9CkBAIC0zMzYzLDcgKzMzNjgsNyBAQCBzdGF0aWMgdm9pZCBm ZXRjaENhY2hlU2l6ZUZvck9yaWdpbkNhbGxiYWNrKHVpbnQ2NF90IHNpemUsIHZvaWQqIHVzZXJE YXRhKQogdWludDY0X3QgVGVzdENvbnRyb2xsZXI6OmRvbUNhY2hlU2l6ZShXS1N0cmluZ1JlZiBv cmlnaW4pCiB7CiAgICAgRmV0Y2hDYWNoZVNpemVGb3JPcmlnaW5DYWxsYmFja0NvbnRleHQgY29u dGV4dCgqdGhpcyk7Ci0gICAgV0tXZWJzaXRlRGF0YVN0b3JlR2V0RmV0Y2hDYWNoZVNpemVGb3JP cmlnaW4oVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCksIG9yaWdpbiwg JmNvbnRleHQsIGZldGNoQ2FjaGVTaXplRm9yT3JpZ2luQ2FsbGJhY2spOworICAgIFdLV2Vic2l0 ZURhdGFTdG9yZUdldEZldGNoQ2FjaGVTaXplRm9yT3JpZ2luKHdlYnNpdGVEYXRhU3RvcmUoKSwg b3JpZ2luLCAmY29udGV4dCwgZmV0Y2hDYWNoZVNpemVGb3JPcmlnaW5DYWxsYmFjayk7CiAgICAg cnVuVW50aWwoY29udGV4dC5kb25lLCBub1RpbWVvdXQpOwogICAgIHJldHVybiBjb250ZXh0LnJl c3VsdDsKIH0KQEAgLTM0MjAsNyArMzQyNSw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmNsZWFy U3RhdGlzdGljc0RhdGFGb3JEb21haW4oV0tTdHJpbmdSZWYgZG9tYWluKQogewogICAgIFJlc291 cmNlU3RhdGlzdGljc0NhbGxiYWNrQ29udGV4dCBjb250ZXh0KCp0aGlzKTsKIAotICAgIFdLV2Vi c2l0ZURhdGFTdG9yZVJlbW92ZUlUUERhdGFGb3JEb21haW4oVGVzdENvbnRyb2xsZXI6OmRlZmF1 bHRXZWJzaXRlRGF0YVN0b3JlKCksIGRvbWFpbiwgJmNvbnRleHQsIHJlc291cmNlU3RhdGlzdGlj c1ZvaWRSZXN1bHRDYWxsYmFjayk7CisgICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlSVRQRGF0 YUZvckRvbWFpbih3ZWJzaXRlRGF0YVN0b3JlKCksIGRvbWFpbiwgJmNvbnRleHQsIHJlc291cmNl U3RhdGlzdGljc1ZvaWRSZXN1bHRDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25l LCBub1RpbWVvdXQpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rl c3RDb250cm9sbGVyLmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgK aW5kZXggMDU0NjFjNGQ5MTdkYTBkZDkzNTczZmIzODFlOTM1MjUyNWIxYjgxNS4uZjRiNzhlYzk0 NTFkM2MwZDdiNTQ3MjUyZjY4NDZmNjUzNjY4NzJjYyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv VGVzdENvbnRyb2xsZXIuaApAQCAtMzcxLDYgKzM3MSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBo YW5kbGVDb250cm9sQ29tbWFuZChjb25zdCBjaGFyKiBjb21tYW5kKTsKIAogICAgIHZvaWQgcGxh dGZvcm1Jbml0aWFsaXplKCk7CisgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemVEYXRhU3RvcmUo V0tQYWdlQ29uZmlndXJhdGlvblJlZiwgY29uc3QgVGVzdE9wdGlvbnMmKTsKICAgICB2b2lkIHBs YXRmb3JtRGVzdHJveSgpOwogICAgIFdLQ29udGV4dFJlZiBwbGF0Zm9ybUFkanVzdENvbnRleHQo V0tDb250ZXh0UmVmLCBXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmKTsKICAgICB2b2lkIHBsYXRm b3JtSW5pdGlhbGl6ZUNvbnRleHQoKTsKQEAgLTYyMyw2ICs2MjQsNyBAQCBwcml2YXRlOgogI2Vu ZGlmCiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RXZlbnRTZW5kZXJQcm94eT4gbV9ldmVudFNlbmRl clByb3h5OworICAgIFJldGFpblB0cjxXS1dlYnNpdGVEYXRhU3RvcmVSZWY+IG1fd2Vic2l0ZURh dGFTdG9yZTsKIAogICAgIFdvcmtRdWV1ZU1hbmFnZXIgbV93b3JrUXVldWVNYW5hZ2VyOwogCmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCmluZGV4IDIwMDFlNjBhMjYy ZTRhNTVlMWRjMjA1NzRmMWU0YmIzMzYwMTEyMzQuLmUzMjI3ZWUwOWQzMWE3OGFiNmUwZDdjNDc5 YTUxMWI2ZWVjMDM0YWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdElu dm9jYXRpb24uY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24u Y3BwCkBAIC0xNjQsNyArMTY0LDcgQEAgdm9pZCBUZXN0SW52b2NhdGlvbjo6aW52b2tlKCkKIAog ICAgIFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5zZXRTaG91bGRMb2dIaXN0b3J5Q2xpZW50 Q2FsbGJhY2tzKHNob3VsZExvZ0hpc3RvcnlDbGllbnRDYWxsYmFja3MoKSk7CiAKLSAgICBXS0hU VFBDb29raWVTdG9yZVNldEhUVFBDb29raWVBY2NlcHRQb2xpY3koV0tXZWJzaXRlRGF0YVN0b3Jl R2V0SFRUUENvb2tpZVN0b3JlKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9y ZSgpKSwga1dLSFRUUENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWlu LCBudWxscHRyLCBudWxscHRyKTsKKyAgICBXS0hUVFBDb29raWVTdG9yZVNldEhUVFBDb29raWVB Y2NlcHRQb2xpY3koV0tXZWJzaXRlRGF0YVN0b3JlR2V0SFRUUENvb2tpZVN0b3JlKFRlc3RDb250 cm9sbGVyOjpzaW5nbGV0b24oKS53ZWJzaXRlRGF0YVN0b3JlKCkpLCBrV0tIVFRQQ29va2llQWNj ZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1lbnREb21haW4sIG51bGxwdHIsIG51bGxwdHIpOwog CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBjbGVhciBvdXQgdmlzaXRlZCBsaW5rcyBoZXJlLgog CkBAIC0xMDgyLDcgKzEwODIsNyBAQCBXS1JldGFpblB0cjxXS1R5cGVSZWY+IFRlc3RJbnZvY2F0 aW9uOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQgogICAgIGlmIChX S1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKG1lc3NhZ2VOYW1lLCAiU2V0Q2FjaGVNb2RlbCIp KSB7CiAgICAgICAgIEFTU0VSVChXS0dldFR5cGVJRChtZXNzYWdlQm9keSkgPT0gV0tVSW50NjRH ZXRUeXBlSUQoKSk7CiAgICAgICAgIHVpbnQ2NF90IG1vZGVsID0gV0tVSW50NjRHZXRWYWx1ZShz dGF0aWNfY2FzdDxXS1VJbnQ2NFJlZj4obWVzc2FnZUJvZHkpKTsKLSAgICAgICAgV0tXZWJzaXRl RGF0YVN0b3JlU2V0Q2FjaGVNb2RlbFN5bmNocm9ub3VzbHlGb3JUZXN0aW5nKFRlc3RDb250cm9s bGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCBtb2RlbCk7CisgICAgICAgIFdLV2Vic2l0 ZURhdGFTdG9yZVNldENhY2hlTW9kZWxTeW5jaHJvbm91c2x5Rm9yVGVzdGluZyhUZXN0Q29udHJv bGxlcjo6c2luZ2xldG9uKCkud2Vic2l0ZURhdGFTdG9yZSgpLCBtb2RlbCk7CiAgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIH0KIApAQCAtMTEzOSw3ICsxMTM5LDcgQEAgV0tSZXRhaW5QdHI8 V0tUeXBlUmVmPiBUZXN0SW52b2NhdGlvbjo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZy b21JbmplY3RlZEIKICAgICB9CiAgICAgCiAgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENT dHJpbmcobWVzc2FnZU5hbWUsICJEZWxldGVBbGxJbmRleGVkRGF0YWJhc2VzIikpIHsKLSAgICAg ICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxsSW5kZXhlZERhdGFiYXNlcyhUZXN0Q29udHJv bGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3RvcmUoKSwgbnVsbHB0ciwgeyB9KTsKKyAgICAgICAg V0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxsSW5kZXhlZERhdGFiYXNlcyhUZXN0Q29udHJvbGxl cjo6c2luZ2xldG9uKCkud2Vic2l0ZURhdGFTdG9yZSgpLCBudWxscHRyLCB7IH0pOwogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2NvYS5tbQppbmRleCBlOTRkMDYzMWQzYjhlNjI0MTlj M2I4NGI1NGFmZGI1ZmY3OTg0ZTIyLi43YTI4ODY1ZjY1YjI3ZjdhMTkzNGM2ZDcxMmMzMjU3MDM4 OTQxMzVhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250 cm9sbGVyQ29jb2EubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29u dHJvbGxlckNvY29hLm1tCkBAIC0xMzEsNiArMTMxLDE5IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6 OnBsYXRmb3JtQWRkVGVzdE9wdGlvbnMoVGVzdE9wdGlvbnMmIG9wdGlvbnMpIGNvbnN0CiAjZW5k aWYKIH0KIAordm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3Jl KFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNvbnN0IFRlc3RPcHRpb25zJiBvcHRpb25zKQorewor ICAgIGlmIChvcHRpb25zLnVzZUVwaGVtZXJhbFNlc3Npb24gfHwgb3B0aW9ucy5zdGFuZGFsb25l V2ViQXBwbGljYXRpb25VUkwubGVuZ3RoKCkpIHsKKyAgICAgICAgYXV0byB3ZWJzaXRlRGF0YVN0 b3JlQ29uZmlnID0gb3B0aW9ucy51c2VFcGhlbWVyYWxTZXNzaW9uID8gW1tbX1dLV2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXROb25QZXJzaXN0ZW50Q29uZmlndXJhdGlv bl0gYXV0b3JlbGVhc2VdIDogW1tbX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxs b2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgaWYgKCFvcHRpb25zLnVzZUVwaGVtZXJh bFNlc3Npb24pCisgICAgICAgICAgICBjb25maWd1cmVXZWJzaXRlRGF0YVN0b3JlVGVtcG9yYXJ5 RGlyZWN0b3JpZXMoKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYpd2Vic2l0ZURh dGFTdG9yZUNvbmZpZyk7CisgICAgICAgIGlmIChvcHRpb25zLnN0YW5kYWxvbmVXZWJBcHBsaWNh dGlvblVSTC5sZW5ndGgoKSkKKyAgICAgICAgICAgIFt3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnIHNl dFN0YW5kYWxvbmVBcHBsaWNhdGlvblVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcg c3RyaW5nV2l0aFVURjhTdHJpbmc6b3B0aW9ucy5zdGFuZGFsb25lV2ViQXBwbGljYXRpb25VUkwu Y19zdHIoKV1dXTsKKyAgICAgICAgbV93ZWJzaXRlRGF0YVN0b3JlID0gKF9fYnJpZGdlIFdLV2Vi c2l0ZURhdGFTdG9yZVJlZilbW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENv bmZpZ3VyYXRpb246d2Vic2l0ZURhdGFTdG9yZUNvbmZpZ10gYXV0b3JlbGVhc2VdOworICAgIH0g ZWxzZQorICAgICAgICBtX3dlYnNpdGVEYXRhU3RvcmUgPSAoX19icmlkZ2UgV0tXZWJzaXRlRGF0 YVN0b3JlUmVmKWdsb2JhbFdlYlZpZXdDb25maWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmU7Cit9 CisKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ3JlYXRlV2ViVmlldyhXS1BhZ2VDb25m aWd1cmF0aW9uUmVmLCBjb25zdCBUZXN0T3B0aW9ucyYgb3B0aW9ucykKIHsKICAgICBSZXRhaW5Q dHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29waWVkQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMo W2dsb2JhbFdlYlZpZXdDb25maWd1cmF0aW9uIGNvcHldKTsKQEAgLTE1NywxNiArMTcwLDcgQEAg dm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1DcmVhdGVXZWJWaWV3KFdLUGFnZUNvbmZpZ3Vy YXRpb25SZWYsIGNvbnN0IFRlc3RPcHQKICAgICBpZiAob3B0aW9ucy5lbmFibGVFZGl0YWJsZUlt YWdlcykKICAgICAgICAgW2NvcGllZENvbmZpZ3VyYXRpb24gX3NldEVkaXRhYmxlSW1hZ2VzRW5h YmxlZDpZRVNdOwogCi0gICAgaWYgKG9wdGlvbnMudXNlRXBoZW1lcmFsU2Vzc2lvbiB8fCBvcHRp b25zLnN0YW5kYWxvbmVXZWJBcHBsaWNhdGlvblVSTC5sZW5ndGgoKSkgewotICAgICAgICBhdXRv IHdlYnNpdGVEYXRhU3RvcmVDb25maWcgPSBvcHRpb25zLnVzZUVwaGVtZXJhbFNlc3Npb24gPyBb W1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdE5vblBlcnNpc3Rl bnRDb25maWd1cmF0aW9uXSBhdXRvcmVsZWFzZV0gOiBbW1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29u ZmlndXJhdGlvbiBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOwotICAgICAgICBpZiAoIW9wdGlv bnMudXNlRXBoZW1lcmFsU2Vzc2lvbikKLSAgICAgICAgICAgIGNvbmZpZ3VyZVdlYnNpdGVEYXRh U3RvcmVUZW1wb3JhcnlEaXJlY3RvcmllcygoV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv blJlZil3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnKTsKLSAgICAgICAgaWYgKG9wdGlvbnMuc3RhbmRh bG9uZVdlYkFwcGxpY2F0aW9uVVJMLmxlbmd0aCgpKQotICAgICAgICAgICAgW3dlYnNpdGVEYXRh U3RvcmVDb25maWcgc2V0U3RhbmRhbG9uZUFwcGxpY2F0aW9uVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOltOU1N0cmluZyBzdHJpbmdXaXRoVVRGOFN0cmluZzpvcHRpb25zLnN0YW5kYWxvbmVXZWJB cHBsaWNhdGlvblVSTC5jX3N0cigpXV1dOwotICAgICAgICBhdXRvIHdlYnNpdGVEYXRhU3RvcmUg PSBbW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246d2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ10gYXV0b3JlbGVhc2VdOwotICAgICAgICBbd2Vic2l0ZURhdGFT dG9yZSBfc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQ6WUVTXTsKLSAgICAgICAgW2Nv cGllZENvbmZpZ3VyYXRpb24gc2V0V2Vic2l0ZURhdGFTdG9yZTp3ZWJzaXRlRGF0YVN0b3JlXTsK LSAgICB9CisgICAgW2NvcGllZENvbmZpZ3VyYXRpb24gc2V0V2Vic2l0ZURhdGFTdG9yZTooV0tX ZWJzaXRlRGF0YVN0b3JlICopd2Vic2l0ZURhdGFTdG9yZSgpXTsKIAogICAgIFtjb3BpZWRDb25m aWd1cmF0aW9uIF9zZXRBbGxvd1RvcE5hdmlnYXRpb25Ub0RhdGFVUkxzOm9wdGlvbnMuYWxsb3dU b3BOYXZpZ2F0aW9uVG9EYXRhVVJMc107CiAK 399425 2020-05-14 16:22:59 -0700 2020-05-14 18:55:14 -0700 Patch bug-211920-20200514162258.patch text/plain 14478 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzc0YWZmMWQ2NWY1MWMzZWI1MDE0MjVkZmZiOTIzYzEy ZjBmZGIyYy4uODliNzBkNzM3MWYyMTA0YjllYzYwNjEzYWI2NDRmNGIzYmFiYjAyOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIwLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFrZSBzdXJlIHdlIHVzZSBjdXJyZW50IGRhdGEgc3RvcmUgaW4gV0tUUidzIFRlc3RDb250 cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTE5MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgd2UgdXNlIGN1cnJlbnQgZGF0YSBzdG9yZSBpbiBXS1RSJ3MgVGVzdENvbnRyb2xs ZXIuIEN1cnJlbnRseSwgYSBsb3Qgb2YgY29kZQorICAgICAgICB1c2VzIGRlZmF1bHREYXRhU3Rv cmUoKSwgZXZlbiB0aG91Z2ggdGhlIHRlc3QgbWF5IGJlIHVzaW5nIGFub3RoZXIgZGF0YSBzdG9y ZSAoZS5nLiBhbgorICAgICAgICBlcGhlbWVyYWwgb25lKS4gSSBzdXNwZWN0IHRoaXMgaXMgY29u dHJpYnV0aW5nIHRvIHRlc3QgZmxha2luZXNzLgorCisgICAgICAgIFdlIG5vdyBhbHNvIG1ha2Ug c3VyZSB0aGF0IFRlc3RDb250cm9sbGVyOjp3ZWJzaXRlRGF0YVN0b3JlKCkgcmV0dXJucyB0aGUg YWN0dWFsIHN0b3JlCisgICAgICAgIHRoYXQgd2lsbCBiZSB1c2VkIGJ5IHRoZSB0ZXN0IHdoZW4g cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcygpIGlzIGNhbGxlZC4KKyAgICAgICAg UHJldmlvdXNseSwgaXQgd291bGQgbm90IHNpbmNlIGl0IHdvdWxkIGdldCB0aGUgc3RvcmUgZnJv bSB0aGUgbV9tYWluVmlldyBhbmQgbV9tYWluVmlldworICAgICAgICB3b3VsZCBvbmx5IGdldCBp bml0aWFsaXplZCBhZnRlciBjYWxsaW5nIHJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1 ZXMoKS4gVG8gc3VwcG9ydAorICAgICAgICB0aGlzLCB3ZSBub3cgaW5pdGlhbGl6ZSBhIG1fd2Vi c2l0ZURhdGFTdG9yZSBtZW1iZXIgaW4gcGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKCksCisg ICAgICAgIHdoaWNoIGdldHMgY2FsbGVkIHJpZ2h0IGJlZm9yZSByZXNldFByZWZlcmVuY2VzVG9D b25zaXN0ZW50VmFsdWVzKCkuIFdoZW4KKyAgICAgICAgcGxhdGZvcm1DcmVhdGVXZWJWaWV3KCkg Z2V0cyBjYWxsZWQgcmlnaHQgYWZ0ZXIgcmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVl cygpLAorICAgICAgICBpdCBub3cgc2ltcGx5IHJlbGllcyBvbiBtX3dlYnNpdGVEYXRhU3RvcmUg aW5zdGVhZCBvZiBjcmVhdGluZyB0aGUgZGF0YSBzdG9yZSBhdCB0aGlzCisgICAgICAgIHBvaW50 LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJv bUluamVjdGVkQnVuZGxlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmNsZWFyU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnMpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6 Y2xlYXJET01DYWNoZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjbGVhckRPTUNh Y2hlcyk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpoYXNET01DYWNoZSk6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkb21DYWNoZVNpemUpOgorICAgICAgICAoV1RSOjpU ZXN0Q29udHJvbGxlcjo6Y2xlYXJTdGF0aXN0aWNzRGF0YUZvckRvbWFpbik6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgIChXVFI6OlRlc3RJ bnZvY2F0aW9uOjppbnZva2UpOgorICAgICAgICAoV1RSOjpUZXN0SW52b2NhdGlvbjo6ZGlkUmVj ZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisKIDIwMjAtMDUtMTQg IERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEluY2x1ZGUgTG9j YWxPdmVycmlkZXMueGNjb25maWcgaW4gYWxsIFRvb2xzIHByb2plY3RzCmRpZmYgLS1naXQgYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDQ3NDYwMzIyYzZmMGNiNTE0NzU2ZmFm NTMzNTA4OTI1ZDM2MDcxNDkuLmY3YTJmNzE5ZTNiN2E0NTE1NjY4MThiNjE3ZmQ4OWQ1Nzg2NGM2 MTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3Bw CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC01NTYs NyArNTU2LDcgQEAgV0tXZWJzaXRlRGF0YVN0b3JlUmVmIFRlc3RDb250cm9sbGVyOjpkZWZhdWx0 V2Vic2l0ZURhdGFTdG9yZSgpCiAKIFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBUZXN0Q29udHJvbGxl cjo6d2Vic2l0ZURhdGFTdG9yZSgpCiB7Ci0gICAgcmV0dXJuIFdLUGFnZUNvbmZpZ3VyYXRpb25H ZXRXZWJzaXRlRGF0YVN0b3JlKGFkb3B0V0soV0tQYWdlQ29weVBhZ2VDb25maWd1cmF0aW9uKG1f bWFpbldlYlZpZXctPnBhZ2UoKSkpLmdldCgpKTsKKyAgICByZXR1cm4gbV93ZWJzaXRlRGF0YVN0 b3JlLmdldCgpOwogfQogCiBXS1JldGFpblB0cjxXS1BhZ2VDb25maWd1cmF0aW9uUmVmPiBUZXN0 Q29udHJvbGxlcjo6Z2VuZXJhdGVQYWdlQ29uZmlndXJhdGlvbihjb25zdCBUZXN0T3B0aW9ucyYg b3B0aW9ucykKQEAgLTY1MCw2ICs2NTAsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjcmVhdGVX ZWJWaWV3V2l0aE9wdGlvbnMoY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvbnMpCiAjZW5kaWYKIAog ICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGdlbmVyYXRlUGFnZUNvbmZpZ3VyYXRpb24ob3B0aW9u cyk7CisgICAgcGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKGNvbmZpZ3VyYXRpb24uZ2V0KCks IG9wdGlvbnMpOwogCiAgICAgLy8gU29tZSBwcmVmZXJlbmNlcyAobm90YWJseSBtb2NrIHNjcm9s bCBiYXJzIHNldHRpbmcpIGN1cnJlbnRseSBjYW5ub3QgYmUgcmUtYXBwbGllZCB0byBhbiBleGlz dGluZyB2aWV3LCBzbyB3ZSBuZWVkIHRvIHNldCB0aGVtIG5vdy4KICAgICAvLyBGSVhNRTogTWln cmF0ZSB0aGVzZSBwcmVmZXJlbmNlcyB0byBXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLgpAQCAt OTQxLDcgKzk0Miw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0Nv bnNpc3RlbnRWYWx1ZXMoY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvCiAgICAgV0tQcmVmZXJlbmNl c1NldEJlYWNvbkFQSUVuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogICAgIFdLUHJlZmVyZW5j ZXNTZXREaXJlY3RvcnlVcGxvYWRFbmFibGVkKHByZWZlcmVuY2VzLCB0cnVlKTsKIAotICAgIFdL SFRUUENvb2tpZVN0b3JlRGVsZXRlQWxsQ29va2llcyhXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQ Q29va2llU3RvcmUoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCkpLCBu dWxscHRyLCBudWxscHRyKTsKKyAgICBXS0hUVFBDb29raWVTdG9yZURlbGV0ZUFsbENvb2tpZXMo V0tXZWJzaXRlRGF0YVN0b3JlR2V0SFRUUENvb2tpZVN0b3JlKHdlYnNpdGVEYXRhU3RvcmUoKSks IG51bGxwdHIsIG51bGxwdHIpOwogCiAgICAgV0tQcmVmZXJlbmNlc1NldE1vY2tDYXB0dXJlRGV2 aWNlc0VuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogICAgIApAQCAtMTAyOCw3ICsxMDI5LDYg QEAgYm9vbCBUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lzdGVudFZhbHVlcyhjb25z dCBUZXN0T3B0aW9ucyYgb3B0aW9ucywgUmUKICAgICBXS0NvbnRleHRSZXNldFNlcnZpY2VXb3Jr ZXJGZXRjaFRpbWVvdXRGb3JUZXN0aW5nKFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5jb250 ZXh0KCkpOwogCiAgICAgV0tXZWJzaXRlRGF0YVN0b3JlQ2xlYXJBbGxEZXZpY2VPcmllbnRhdGlv blBlcm1pc3Npb25zKHdlYnNpdGVEYXRhU3RvcmUoKSk7Ci0gICAgV0tXZWJzaXRlRGF0YVN0b3Jl Q2xlYXJBbGxEZXZpY2VPcmllbnRhdGlvblBlcm1pc3Npb25zKFRlc3RDb250cm9sbGVyOjpkZWZh dWx0V2Vic2l0ZURhdGFTdG9yZSgpKTsKIAogICAgIGNsZWFySW5kZXhlZERhdGFiYXNlcygpOwog ICAgIGNsZWFyTG9jYWxTdG9yYWdlKCk7CkBAIC0yMjMzLDcgKzIyMzMsNyBAQCB2b2lkIFRlc3RD b250cm9sbGVyOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxl KFdLU3RyaW5nUmVmCiAKICAgICBhdXRvIHNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kgPSBbJl0g KFdLSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xpY3ksIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo V0tUeXBlUmVmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgewogICAgICAgICBhdXRvIGNvbnRleHQg PSBuZXcgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXS1R5cGVSZWYpPihXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKSk7Ci0gICAgICAgIFdLSFRUUENvb2tpZVN0b3JlU2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeShXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQQ29va2llU3RvcmUoVGVzdENvbnRyb2xs ZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCkpLCBwb2xpY3ksIGNvbnRleHQsIFtdICh2b2lk KiBjb250ZXh0KSB7CisgICAgICAgIFdLSFRUUENvb2tpZVN0b3JlU2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeShXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQQ29va2llU3RvcmUod2Vic2l0ZURhdGFT dG9yZSgpKSwgcG9saWN5LCBjb250ZXh0LCBbXSAodm9pZCogY29udGV4dCkgewogICAgICAgICAg ICAgYXV0byBjb21wbGV0aW9uSGFuZGxlclBvaW50ZXIgPSBzdGF0aWNfY2FzdDxDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFdLVHlwZVJlZik+Kj4oY29udGV4dCk7CiAgICAgICAgICAgICAoKmNvbXBs ZXRpb25IYW5kbGVyUG9pbnRlcikobnVsbHB0cik7CiAgICAgICAgICAgICBkZWxldGUgY29tcGxl dGlvbkhhbmRsZXJQb2ludGVyOwpAQCAtMzExNiw2ICszMTE2LDExIEBAIHZvaWQgVGVzdENvbnRy b2xsZXI6OnBsYXRmb3JtV2lsbFJ1blRlc3QoY29uc3QgVGVzdEludm9jYXRpb24mKQogewogfQog Cit2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUluaXRpYWxpemVEYXRhU3RvcmUoV0tQYWdl Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBjb25zdCBUZXN0T3B0aW9ucyYpCit7Cisg ICAgbV93ZWJzaXRlRGF0YVN0b3JlID0gV0tQYWdlQ29uZmlndXJhdGlvbkdldFdlYnNpdGVEYXRh U3RvcmUoY29uZmlndXJhdGlvbik7Cit9CisKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3Jt Q3JlYXRlV2ViVmlldyhXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIGNvbnN0 IFRlc3RPcHRpb25zJiBvcHRpb25zKQogewogICAgIG1fbWFpbldlYlZpZXcgPSBtYWtlVW5pcXVl PFBsYXRmb3JtV2ViVmlldz4oY29uZmlndXJhdGlvbiwgb3B0aW9ucyk7CkBAIC0zMjE3LDcgKzMy MjIsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25zKCkKIHsKICAgICBDbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zQ2FsbGJhY2tDb250 ZXh0IGNvbnRleHQoKnRoaXMpOwogCi0gICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxsU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0 YVN0b3JlKCksICZjb250ZXh0LCBjbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zQ2FsbGJh Y2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25zKHdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGNsZWFyU2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbnNDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25lLCBub1RpbWVv dXQpOwogfQogCkBAIC0zMjQzLDcgKzMyNDgsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVh ckRPTUNhY2hlKFdLU3RyaW5nUmVmIG9yaWdpbikKICAgICBDbGVhckRPTUNhY2hlQ2FsbGJhY2tD b250ZXh0IGNvbnRleHQoKnRoaXMpOwogCiAgICAgYXV0byBjYWNoZU9yaWdpbiA9IGFkb3B0V0so V0tTZWN1cml0eU9yaWdpbkNyZWF0ZUZyb21TdHJpbmcob3JpZ2luKSk7Ci0gICAgV0tXZWJzaXRl RGF0YVN0b3JlUmVtb3ZlRmV0Y2hDYWNoZUZvck9yaWdpbihUZXN0Q29udHJvbGxlcjo6ZGVmYXVs dFdlYnNpdGVEYXRhU3RvcmUoKSwgY2FjaGVPcmlnaW4uZ2V0KCksICZjb250ZXh0LCBjbGVhckRP TUNhY2hlQ2FsbGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVG b3JPcmlnaW4od2Vic2l0ZURhdGFTdG9yZSgpLCBjYWNoZU9yaWdpbi5nZXQoKSwgJmNvbnRleHQs IGNsZWFyRE9NQ2FjaGVDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25lLCBub1Rp bWVvdXQpOwogfQogCkBAIC0zMjUxLDcgKzMyNTYsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpj bGVhckRPTUNhY2hlcygpCiB7CiAgICAgQ2xlYXJET01DYWNoZUNhbGxiYWNrQ29udGV4dCBjb250 ZXh0KCp0aGlzKTsKIAotICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbEZldGNoQ2FjaGVz KFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCAmY29udGV4dCwgY2xl YXJET01DYWNoZUNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVBbGxGZXRj aENhY2hlcyh3ZWJzaXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBjbGVhckRPTUNhY2hlQ2FsbGJh Y2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKIH0KIApAQCAtMzMz NSw3ICszMzQwLDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZU9yaWdpbnNDYWxsYmFjayhXS0Fy cmF5UmVmIG9yaWdpbnMsIHZvaWQqIHVzZXJEYXRhKQogYm9vbCBUZXN0Q29udHJvbGxlcjo6aGFz RE9NQ2FjaGUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNoQ2FjaGVPcmlnaW5zQ2Fs bGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMsIG9yaWdpbik7Ci0gICAgV0tXZWJzaXRlRGF0YVN0 b3JlR2V0RmV0Y2hDYWNoZU9yaWdpbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0 YVN0b3JlKCksICZjb250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKKyAgICBXS1dl YnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlT3JpZ2lucyh3ZWJzaXRlRGF0YVN0b3JlKCksICZj b250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKICAgICBydW5VbnRpbChjb250ZXh0 LmRvbmUsIG5vVGltZW91dCk7CiAgICAgcmV0dXJuIGNvbnRleHQucmVzdWx0OwogfQpAQCAtMzM2 Myw3ICszMzY4LDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZVNpemVGb3JPcmlnaW5DYWxsYmFj ayh1aW50NjRfdCBzaXplLCB2b2lkKiB1c2VyRGF0YSkKIHVpbnQ2NF90IFRlc3RDb250cm9sbGVy Ojpkb21DYWNoZVNpemUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNoQ2FjaGVTaXpl Rm9yT3JpZ2luQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwotICAgIFdLV2Vic2l0ZURh dGFTdG9yZUdldEZldGNoQ2FjaGVTaXplRm9yT3JpZ2luKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0 V2Vic2l0ZURhdGFTdG9yZSgpLCBvcmlnaW4sICZjb250ZXh0LCBmZXRjaENhY2hlU2l6ZUZvck9y aWdpbkNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlU2l6ZUZv ck9yaWdpbih3ZWJzaXRlRGF0YVN0b3JlKCksIG9yaWdpbiwgJmNvbnRleHQsIGZldGNoQ2FjaGVT aXplRm9yT3JpZ2luQ2FsbGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1l b3V0KTsKICAgICByZXR1cm4gY29udGV4dC5yZXN1bHQ7CiB9CkBAIC0zNDIwLDcgKzM0MjUsNyBA QCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclN0YXRpc3RpY3NEYXRhRm9yRG9tYWluKFdLU3Ry aW5nUmVmIGRvbWFpbikKIHsKICAgICBSZXNvdXJjZVN0YXRpc3RpY3NDYWxsYmFja0NvbnRleHQg Y29udGV4dCgqdGhpcyk7CiAKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVJVFBEYXRhRm9y RG9tYWluKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCBkb21haW4s ICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2FsbGJhY2spOworICAgIFdL V2Vic2l0ZURhdGFTdG9yZVJlbW92ZUlUUERhdGFGb3JEb21haW4od2Vic2l0ZURhdGFTdG9yZSgp LCBkb21haW4sICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2FsbGJhY2sp OwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCmluZGV4IDA1NDYxYzRkOTE3ZGEwZGQ5MzU3M2Zi MzgxZTkzNTI1MjViMWI4MTUuLjNjM2E1ZTE3NWIxYTgxNzcxODE1NjExMGNhNDZhNjNjM2M0OTg2 ZDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAor KysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKQEAgLTM3MSw2ICsz NzEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaGFuZGxlQ29udHJvbENvbW1hbmQoY29uc3QgY2hh ciogY29tbWFuZCk7CiAKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOworICAgIHZvaWQg cGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNvbnN0 IFRlc3RPcHRpb25zJik7CiAgICAgdm9pZCBwbGF0Zm9ybURlc3Ryb3koKTsKICAgICBXS0NvbnRl eHRSZWYgcGxhdGZvcm1BZGp1c3RDb250ZXh0KFdLQ29udGV4dFJlZiwgV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemVDb250ZXh0KCk7CkBAIC02 MjMsNiArNjI0LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEV2 ZW50U2VuZGVyUHJveHk+IG1fZXZlbnRTZW5kZXJQcm94eTsKKyAgICBXS1JldGFpblB0cjxXS1dl YnNpdGVEYXRhU3RvcmVSZWY+IG1fd2Vic2l0ZURhdGFTdG9yZTsKIAogICAgIFdvcmtRdWV1ZU1h bmFnZXIgbV93b3JrUXVldWVNYW5hZ2VyOwogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdElu dm9jYXRpb24uY3BwCmluZGV4IDIwMDFlNjBhMjYyZTRhNTVlMWRjMjA1NzRmMWU0YmIzMzYwMTEy MzQuLmUzMjI3ZWUwOWQzMWE3OGFiNmUwZDdjNDc5YTUxMWI2ZWVjMDM0YWYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCkBAIC0xNjQsNyArMTY0LDcgQEAgdm9p ZCBUZXN0SW52b2NhdGlvbjo6aW52b2tlKCkKIAogICAgIFRlc3RDb250cm9sbGVyOjpzaW5nbGV0 b24oKS5zZXRTaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKHNob3VsZExvZ0hpc3RvcnlD bGllbnRDYWxsYmFja3MoKSk7CiAKLSAgICBXS0hUVFBDb29raWVTdG9yZVNldEhUVFBDb29raWVB Y2NlcHRQb2xpY3koV0tXZWJzaXRlRGF0YVN0b3JlR2V0SFRUUENvb2tpZVN0b3JlKFRlc3RDb250 cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpKSwga1dLSFRUUENvb2tpZUFjY2VwdFBv bGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluLCBudWxscHRyLCBudWxscHRyKTsKKyAgICBX S0hUVFBDb29raWVTdG9yZVNldEhUVFBDb29raWVBY2NlcHRQb2xpY3koV0tXZWJzaXRlRGF0YVN0 b3JlR2V0SFRUUENvb2tpZVN0b3JlKFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS53ZWJzaXRl RGF0YVN0b3JlKCkpLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1l bnREb21haW4sIG51bGxwdHIsIG51bGxwdHIpOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBj bGVhciBvdXQgdmlzaXRlZCBsaW5rcyBoZXJlLgogCkBAIC0xMDgyLDcgKzEwODIsNyBAQCBXS1Jl dGFpblB0cjxXS1R5cGVSZWY+IFRlc3RJbnZvY2F0aW9uOjpkaWRSZWNlaXZlU3luY2hyb25vdXNN ZXNzYWdlRnJvbUluamVjdGVkQgogICAgIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5n KG1lc3NhZ2VOYW1lLCAiU2V0Q2FjaGVNb2RlbCIpKSB7CiAgICAgICAgIEFTU0VSVChXS0dldFR5 cGVJRChtZXNzYWdlQm9keSkgPT0gV0tVSW50NjRHZXRUeXBlSUQoKSk7CiAgICAgICAgIHVpbnQ2 NF90IG1vZGVsID0gV0tVSW50NjRHZXRWYWx1ZShzdGF0aWNfY2FzdDxXS1VJbnQ2NFJlZj4obWVz c2FnZUJvZHkpKTsKLSAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlU2V0Q2FjaGVNb2RlbFN5bmNo cm9ub3VzbHlGb3JUZXN0aW5nKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9y ZSgpLCBtb2RlbCk7CisgICAgICAgIFdLV2Vic2l0ZURhdGFTdG9yZVNldENhY2hlTW9kZWxTeW5j aHJvbm91c2x5Rm9yVGVzdGluZyhUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkud2Vic2l0ZURh dGFTdG9yZSgpLCBtb2RlbCk7CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIApAQCAt MTEzOSw3ICsxMTM5LDcgQEAgV0tSZXRhaW5QdHI8V0tUeXBlUmVmPiBUZXN0SW52b2NhdGlvbjo6 ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEIKICAgICB9CiAgICAgCiAg ICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcobWVzc2FnZU5hbWUsICJEZWxldGVB bGxJbmRleGVkRGF0YWJhc2VzIikpIHsKLSAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3Zl QWxsSW5kZXhlZERhdGFiYXNlcyhUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3Rv cmUoKSwgbnVsbHB0ciwgeyB9KTsKKyAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxs SW5kZXhlZERhdGFiYXNlcyhUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkud2Vic2l0ZURhdGFT dG9yZSgpLCBudWxscHRyLCB7IH0pOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJD b2NvYS5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2Nv YS5tbQppbmRleCBlOTRkMDYzMWQzYjhlNjI0MTljM2I4NGI1NGFmZGI1ZmY3OTg0ZTIyLi43YTI4 ODY1ZjY1YjI3ZjdhMTkzNGM2ZDcxMmMzMjU3MDM4OTQxMzVhIDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0KKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1tCkBAIC0xMzEsNiAr MTMxLDE5IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQWRkVGVzdE9wdGlvbnMoVGVz dE9wdGlvbnMmIG9wdGlvbnMpIGNvbnN0CiAjZW5kaWYKIH0KIAordm9pZCBUZXN0Q29udHJvbGxl cjo6cGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNv bnN0IFRlc3RPcHRpb25zJiBvcHRpb25zKQoreworICAgIGlmIChvcHRpb25zLnVzZUVwaGVtZXJh bFNlc3Npb24gfHwgb3B0aW9ucy5zdGFuZGFsb25lV2ViQXBwbGljYXRpb25VUkwubGVuZ3RoKCkp IHsKKyAgICAgICAgYXV0byB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnID0gb3B0aW9ucy51c2VFcGhl bWVyYWxTZXNzaW9uID8gW1tbX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2Nd IGluaXROb25QZXJzaXN0ZW50Q29uZmlndXJhdGlvbl0gYXV0b3JlbGVhc2VdIDogW1tbX1dLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAg ICAgICAgaWYgKCFvcHRpb25zLnVzZUVwaGVtZXJhbFNlc3Npb24pCisgICAgICAgICAgICBjb25m aWd1cmVXZWJzaXRlRGF0YVN0b3JlVGVtcG9yYXJ5RGlyZWN0b3JpZXMoKFdLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb25SZWYpd2Vic2l0ZURhdGFTdG9yZUNvbmZpZyk7CisgICAgICAgIGlm IChvcHRpb25zLnN0YW5kYWxvbmVXZWJBcHBsaWNhdGlvblVSTC5sZW5ndGgoKSkKKyAgICAgICAg ICAgIFt3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnIHNldFN0YW5kYWxvbmVBcHBsaWNhdGlvblVSTDpb TlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6b3B0aW9u cy5zdGFuZGFsb25lV2ViQXBwbGljYXRpb25VUkwuY19zdHIoKV1dXTsKKyAgICAgICAgbV93ZWJz aXRlRGF0YVN0b3JlID0gKF9fYnJpZGdlIFdLV2Vic2l0ZURhdGFTdG9yZVJlZilbW1tXS1dlYnNp dGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246d2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ10gYXV0b3JlbGVhc2VdOworICAgIH0gZWxzZQorICAgICAgICBtX3dlYnNpdGVEYXRh U3RvcmUgPSAoX19icmlkZ2UgV0tXZWJzaXRlRGF0YVN0b3JlUmVmKWdsb2JhbFdlYlZpZXdDb25m aWd1cmF0aW9uLndlYnNpdGVEYXRhU3RvcmU7Cit9CisKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBs YXRmb3JtQ3JlYXRlV2ViVmlldyhXS1BhZ2VDb25maWd1cmF0aW9uUmVmLCBjb25zdCBUZXN0T3B0 aW9ucyYgb3B0aW9ucykKIHsKICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4g Y29waWVkQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW2dsb2JhbFdlYlZpZXdDb25maWd1cmF0aW9u IGNvcHldKTsKQEAgLTE1NywxNiArMTcwLDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZv cm1DcmVhdGVXZWJWaWV3KFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNvbnN0IFRlc3RPcHQKICAg ICBpZiAob3B0aW9ucy5lbmFibGVFZGl0YWJsZUltYWdlcykKICAgICAgICAgW2NvcGllZENvbmZp Z3VyYXRpb24gX3NldEVkaXRhYmxlSW1hZ2VzRW5hYmxlZDpZRVNdOwogCi0gICAgaWYgKG9wdGlv bnMudXNlRXBoZW1lcmFsU2Vzc2lvbiB8fCBvcHRpb25zLnN0YW5kYWxvbmVXZWJBcHBsaWNhdGlv blVSTC5sZW5ndGgoKSkgewotICAgICAgICBhdXRvIHdlYnNpdGVEYXRhU3RvcmVDb25maWcgPSBv cHRpb25zLnVzZUVwaGVtZXJhbFNlc3Npb24gPyBbW1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmln dXJhdGlvbiBhbGxvY10gaW5pdE5vblBlcnNpc3RlbnRDb25maWd1cmF0aW9uXSBhdXRvcmVsZWFz ZV0gOiBbW1tfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0gYXV0 b3JlbGVhc2VdOwotICAgICAgICBpZiAoIW9wdGlvbnMudXNlRXBoZW1lcmFsU2Vzc2lvbikKLSAg ICAgICAgICAgIGNvbmZpZ3VyZVdlYnNpdGVEYXRhU3RvcmVUZW1wb3JhcnlEaXJlY3Rvcmllcygo V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblJlZil3ZWJzaXRlRGF0YVN0b3JlQ29uZmln KTsKLSAgICAgICAgaWYgKG9wdGlvbnMuc3RhbmRhbG9uZVdlYkFwcGxpY2F0aW9uVVJMLmxlbmd0 aCgpKQotICAgICAgICAgICAgW3dlYnNpdGVEYXRhU3RvcmVDb25maWcgc2V0U3RhbmRhbG9uZUFw cGxpY2F0aW9uVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoVVRG OFN0cmluZzpvcHRpb25zLnN0YW5kYWxvbmVXZWJBcHBsaWNhdGlvblVSTC5jX3N0cigpXV1dOwot ICAgICAgICBhdXRvIHdlYnNpdGVEYXRhU3RvcmUgPSBbW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxs b2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246d2Vic2l0ZURhdGFTdG9yZUNvbmZpZ10gYXV0b3Jl bGVhc2VdOwotICAgICAgICBbd2Vic2l0ZURhdGFTdG9yZSBfc2V0UmVzb3VyY2VMb2FkU3RhdGlz dGljc0VuYWJsZWQ6WUVTXTsKLSAgICAgICAgW2NvcGllZENvbmZpZ3VyYXRpb24gc2V0V2Vic2l0 ZURhdGFTdG9yZTp3ZWJzaXRlRGF0YVN0b3JlXTsKLSAgICB9CisgICAgW2NvcGllZENvbmZpZ3Vy YXRpb24gc2V0V2Vic2l0ZURhdGFTdG9yZTooV0tXZWJzaXRlRGF0YVN0b3JlICopd2Vic2l0ZURh dGFTdG9yZSgpXTsKIAogICAgIFtjb3BpZWRDb25maWd1cmF0aW9uIF9zZXRBbGxvd1RvcE5hdmln YXRpb25Ub0RhdGFVUkxzOm9wdGlvbnMuYWxsb3dUb3BOYXZpZ2F0aW9uVG9EYXRhVVJMc107CiAK 399440 2020-05-14 18:55:16 -0700 2020-05-15 13:50:23 -0700 Patch bug-211920-20200514185515.patch text/plain 14597 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzc0YWZmMWQ2NWY1MWMzZWI1MDE0MjVkZmZiOTIzYzEy ZjBmZGIyYy4uODliNzBkNzM3MWYyMTA0YjllYzYwNjEzYWI2NDRmNGIzYmFiYjAyOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIwLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFrZSBzdXJlIHdlIHVzZSBjdXJyZW50IGRhdGEgc3RvcmUgaW4gV0tUUidzIFRlc3RDb250 cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTE5MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHN1cmUgd2UgdXNlIGN1cnJlbnQgZGF0YSBzdG9yZSBpbiBXS1RSJ3MgVGVzdENvbnRyb2xs ZXIuIEN1cnJlbnRseSwgYSBsb3Qgb2YgY29kZQorICAgICAgICB1c2VzIGRlZmF1bHREYXRhU3Rv cmUoKSwgZXZlbiB0aG91Z2ggdGhlIHRlc3QgbWF5IGJlIHVzaW5nIGFub3RoZXIgZGF0YSBzdG9y ZSAoZS5nLiBhbgorICAgICAgICBlcGhlbWVyYWwgb25lKS4gSSBzdXNwZWN0IHRoaXMgaXMgY29u dHJpYnV0aW5nIHRvIHRlc3QgZmxha2luZXNzLgorCisgICAgICAgIFdlIG5vdyBhbHNvIG1ha2Ug c3VyZSB0aGF0IFRlc3RDb250cm9sbGVyOjp3ZWJzaXRlRGF0YVN0b3JlKCkgcmV0dXJucyB0aGUg YWN0dWFsIHN0b3JlCisgICAgICAgIHRoYXQgd2lsbCBiZSB1c2VkIGJ5IHRoZSB0ZXN0IHdoZW4g cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcygpIGlzIGNhbGxlZC4KKyAgICAgICAg UHJldmlvdXNseSwgaXQgd291bGQgbm90IHNpbmNlIGl0IHdvdWxkIGdldCB0aGUgc3RvcmUgZnJv bSB0aGUgbV9tYWluVmlldyBhbmQgbV9tYWluVmlldworICAgICAgICB3b3VsZCBvbmx5IGdldCBp bml0aWFsaXplZCBhZnRlciBjYWxsaW5nIHJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1 ZXMoKS4gVG8gc3VwcG9ydAorICAgICAgICB0aGlzLCB3ZSBub3cgaW5pdGlhbGl6ZSBhIG1fd2Vi c2l0ZURhdGFTdG9yZSBtZW1iZXIgaW4gcGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKCksCisg ICAgICAgIHdoaWNoIGdldHMgY2FsbGVkIHJpZ2h0IGJlZm9yZSByZXNldFByZWZlcmVuY2VzVG9D b25zaXN0ZW50VmFsdWVzKCkuIFdoZW4KKyAgICAgICAgcGxhdGZvcm1DcmVhdGVXZWJWaWV3KCkg Z2V0cyBjYWxsZWQgcmlnaHQgYWZ0ZXIgcmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVl cygpLAorICAgICAgICBpdCBub3cgc2ltcGx5IHJlbGllcyBvbiBtX3dlYnNpdGVEYXRhU3RvcmUg aW5zdGVhZCBvZiBjcmVhdGluZyB0aGUgZGF0YSBzdG9yZSBhdCB0aGlzCisgICAgICAgIHBvaW50 LgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJv bUluamVjdGVkQnVuZGxlKToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmNsZWFyU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnMpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6 Y2xlYXJET01DYWNoZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjbGVhckRPTUNh Y2hlcyk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpoYXNET01DYWNoZSk6CisgICAg ICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpkb21DYWNoZVNpemUpOgorICAgICAgICAoV1RSOjpU ZXN0Q29udHJvbGxlcjo6Y2xlYXJTdGF0aXN0aWNzRGF0YUZvckRvbWFpbik6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgIChXVFI6OlRlc3RJ bnZvY2F0aW9uOjppbnZva2UpOgorICAgICAgICAoV1RSOjpUZXN0SW52b2NhdGlvbjo6ZGlkUmVj ZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisKIDIwMjAtMDUtMTQg IERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEluY2x1ZGUgTG9j YWxPdmVycmlkZXMueGNjb25maWcgaW4gYWxsIFRvb2xzIHByb2plY3RzCmRpZmYgLS1naXQgYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDQ3NDYwMzIyYzZmMGNiNTE0NzU2ZmFm NTMzNTA4OTI1ZDM2MDcxNDkuLmY3YTJmNzE5ZTNiN2E0NTE1NjY4MThiNjE3ZmQ4OWQ1Nzg2NGM2 MTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3Bw CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC01NTYs NyArNTU2LDcgQEAgV0tXZWJzaXRlRGF0YVN0b3JlUmVmIFRlc3RDb250cm9sbGVyOjpkZWZhdWx0 V2Vic2l0ZURhdGFTdG9yZSgpCiAKIFdLV2Vic2l0ZURhdGFTdG9yZVJlZiBUZXN0Q29udHJvbGxl cjo6d2Vic2l0ZURhdGFTdG9yZSgpCiB7Ci0gICAgcmV0dXJuIFdLUGFnZUNvbmZpZ3VyYXRpb25H ZXRXZWJzaXRlRGF0YVN0b3JlKGFkb3B0V0soV0tQYWdlQ29weVBhZ2VDb25maWd1cmF0aW9uKG1f bWFpbldlYlZpZXctPnBhZ2UoKSkpLmdldCgpKTsKKyAgICByZXR1cm4gbV93ZWJzaXRlRGF0YVN0 b3JlLmdldCgpOwogfQogCiBXS1JldGFpblB0cjxXS1BhZ2VDb25maWd1cmF0aW9uUmVmPiBUZXN0 Q29udHJvbGxlcjo6Z2VuZXJhdGVQYWdlQ29uZmlndXJhdGlvbihjb25zdCBUZXN0T3B0aW9ucyYg b3B0aW9ucykKQEAgLTY1MCw2ICs2NTAsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjcmVhdGVX ZWJWaWV3V2l0aE9wdGlvbnMoY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvbnMpCiAjZW5kaWYKIAog ICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGdlbmVyYXRlUGFnZUNvbmZpZ3VyYXRpb24ob3B0aW9u cyk7CisgICAgcGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKGNvbmZpZ3VyYXRpb24uZ2V0KCks IG9wdGlvbnMpOwogCiAgICAgLy8gU29tZSBwcmVmZXJlbmNlcyAobm90YWJseSBtb2NrIHNjcm9s bCBiYXJzIHNldHRpbmcpIGN1cnJlbnRseSBjYW5ub3QgYmUgcmUtYXBwbGllZCB0byBhbiBleGlz dGluZyB2aWV3LCBzbyB3ZSBuZWVkIHRvIHNldCB0aGVtIG5vdy4KICAgICAvLyBGSVhNRTogTWln cmF0ZSB0aGVzZSBwcmVmZXJlbmNlcyB0byBXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLgpAQCAt OTQxLDcgKzk0Miw3IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0Nv bnNpc3RlbnRWYWx1ZXMoY29uc3QgVGVzdE9wdGlvbnMmIG9wdGlvCiAgICAgV0tQcmVmZXJlbmNl c1NldEJlYWNvbkFQSUVuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogICAgIFdLUHJlZmVyZW5j ZXNTZXREaXJlY3RvcnlVcGxvYWRFbmFibGVkKHByZWZlcmVuY2VzLCB0cnVlKTsKIAotICAgIFdL SFRUUENvb2tpZVN0b3JlRGVsZXRlQWxsQ29va2llcyhXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQ Q29va2llU3RvcmUoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCkpLCBu dWxscHRyLCBudWxscHRyKTsKKyAgICBXS0hUVFBDb29raWVTdG9yZURlbGV0ZUFsbENvb2tpZXMo V0tXZWJzaXRlRGF0YVN0b3JlR2V0SFRUUENvb2tpZVN0b3JlKHdlYnNpdGVEYXRhU3RvcmUoKSks IG51bGxwdHIsIG51bGxwdHIpOwogCiAgICAgV0tQcmVmZXJlbmNlc1NldE1vY2tDYXB0dXJlRGV2 aWNlc0VuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogICAgIApAQCAtMTAyOCw3ICsxMDI5LDYg QEAgYm9vbCBUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lzdGVudFZhbHVlcyhjb25z dCBUZXN0T3B0aW9ucyYgb3B0aW9ucywgUmUKICAgICBXS0NvbnRleHRSZXNldFNlcnZpY2VXb3Jr ZXJGZXRjaFRpbWVvdXRGb3JUZXN0aW5nKFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS5jb250 ZXh0KCkpOwogCiAgICAgV0tXZWJzaXRlRGF0YVN0b3JlQ2xlYXJBbGxEZXZpY2VPcmllbnRhdGlv blBlcm1pc3Npb25zKHdlYnNpdGVEYXRhU3RvcmUoKSk7Ci0gICAgV0tXZWJzaXRlRGF0YVN0b3Jl Q2xlYXJBbGxEZXZpY2VPcmllbnRhdGlvblBlcm1pc3Npb25zKFRlc3RDb250cm9sbGVyOjpkZWZh dWx0V2Vic2l0ZURhdGFTdG9yZSgpKTsKIAogICAgIGNsZWFySW5kZXhlZERhdGFiYXNlcygpOwog ICAgIGNsZWFyTG9jYWxTdG9yYWdlKCk7CkBAIC0yMjMzLDcgKzIyMzMsNyBAQCB2b2lkIFRlc3RD b250cm9sbGVyOjpkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxl KFdLU3RyaW5nUmVmCiAKICAgICBhdXRvIHNldEhUVFBDb29raWVBY2NlcHRQb2xpY3kgPSBbJl0g KFdLSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xpY3ksIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo V0tUeXBlUmVmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikgewogICAgICAgICBhdXRvIGNvbnRleHQg PSBuZXcgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXS1R5cGVSZWYpPihXVEZNb3ZlKGNvbXBsZXRp b25IYW5kbGVyKSk7Ci0gICAgICAgIFdLSFRUUENvb2tpZVN0b3JlU2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeShXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQQ29va2llU3RvcmUoVGVzdENvbnRyb2xs ZXI6OmRlZmF1bHRXZWJzaXRlRGF0YVN0b3JlKCkpLCBwb2xpY3ksIGNvbnRleHQsIFtdICh2b2lk KiBjb250ZXh0KSB7CisgICAgICAgIFdLSFRUUENvb2tpZVN0b3JlU2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeShXS1dlYnNpdGVEYXRhU3RvcmVHZXRIVFRQQ29va2llU3RvcmUod2Vic2l0ZURhdGFT dG9yZSgpKSwgcG9saWN5LCBjb250ZXh0LCBbXSAodm9pZCogY29udGV4dCkgewogICAgICAgICAg ICAgYXV0byBjb21wbGV0aW9uSGFuZGxlclBvaW50ZXIgPSBzdGF0aWNfY2FzdDxDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFdLVHlwZVJlZik+Kj4oY29udGV4dCk7CiAgICAgICAgICAgICAoKmNvbXBs ZXRpb25IYW5kbGVyUG9pbnRlcikobnVsbHB0cik7CiAgICAgICAgICAgICBkZWxldGUgY29tcGxl dGlvbkhhbmRsZXJQb2ludGVyOwpAQCAtMzExNiw2ICszMTE2LDExIEBAIHZvaWQgVGVzdENvbnRy b2xsZXI6OnBsYXRmb3JtV2lsbFJ1blRlc3QoY29uc3QgVGVzdEludm9jYXRpb24mKQogewogfQog Cit2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUluaXRpYWxpemVEYXRhU3RvcmUoV0tQYWdl Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBjb25zdCBUZXN0T3B0aW9ucyYpCit7Cisg ICAgbV93ZWJzaXRlRGF0YVN0b3JlID0gV0tQYWdlQ29uZmlndXJhdGlvbkdldFdlYnNpdGVEYXRh U3RvcmUoY29uZmlndXJhdGlvbik7Cit9CisKIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3Jt Q3JlYXRlV2ViVmlldyhXS1BhZ2VDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24sIGNvbnN0 IFRlc3RPcHRpb25zJiBvcHRpb25zKQogewogICAgIG1fbWFpbldlYlZpZXcgPSBtYWtlVW5pcXVl PFBsYXRmb3JtV2ViVmlldz4oY29uZmlndXJhdGlvbiwgb3B0aW9ucyk7CkBAIC0zMjE3LDcgKzMy MjIsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRp b25zKCkKIHsKICAgICBDbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zQ2FsbGJhY2tDb250 ZXh0IGNvbnRleHQoKnRoaXMpOwogCi0gICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxsU2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0 YVN0b3JlKCksICZjb250ZXh0LCBjbGVhclNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25zQ2FsbGJh Y2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbFNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25zKHdlYnNpdGVEYXRhU3RvcmUoKSwgJmNvbnRleHQsIGNsZWFyU2VydmljZVdvcmtlclJl Z2lzdHJhdGlvbnNDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25lLCBub1RpbWVv dXQpOwogfQogCkBAIC0zMjQzLDcgKzMyNDgsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVh ckRPTUNhY2hlKFdLU3RyaW5nUmVmIG9yaWdpbikKICAgICBDbGVhckRPTUNhY2hlQ2FsbGJhY2tD b250ZXh0IGNvbnRleHQoKnRoaXMpOwogCiAgICAgYXV0byBjYWNoZU9yaWdpbiA9IGFkb3B0V0so V0tTZWN1cml0eU9yaWdpbkNyZWF0ZUZyb21TdHJpbmcob3JpZ2luKSk7Ci0gICAgV0tXZWJzaXRl RGF0YVN0b3JlUmVtb3ZlRmV0Y2hDYWNoZUZvck9yaWdpbihUZXN0Q29udHJvbGxlcjo6ZGVmYXVs dFdlYnNpdGVEYXRhU3RvcmUoKSwgY2FjaGVPcmlnaW4uZ2V0KCksICZjb250ZXh0LCBjbGVhckRP TUNhY2hlQ2FsbGJhY2spOworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUZldGNoQ2FjaGVG b3JPcmlnaW4od2Vic2l0ZURhdGFTdG9yZSgpLCBjYWNoZU9yaWdpbi5nZXQoKSwgJmNvbnRleHQs IGNsZWFyRE9NQ2FjaGVDYWxsYmFjayk7CiAgICAgcnVuVW50aWwoY29udGV4dC5kb25lLCBub1Rp bWVvdXQpOwogfQogCkBAIC0zMjUxLDcgKzMyNTYsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpj bGVhckRPTUNhY2hlcygpCiB7CiAgICAgQ2xlYXJET01DYWNoZUNhbGxiYWNrQ29udGV4dCBjb250 ZXh0KCp0aGlzKTsKIAotICAgIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92ZUFsbEZldGNoQ2FjaGVz KFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCAmY29udGV4dCwgY2xl YXJET01DYWNoZUNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVBbGxGZXRj aENhY2hlcyh3ZWJzaXRlRGF0YVN0b3JlKCksICZjb250ZXh0LCBjbGVhckRPTUNhY2hlQ2FsbGJh Y2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKIH0KIApAQCAtMzMz NSw3ICszMzQwLDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZU9yaWdpbnNDYWxsYmFjayhXS0Fy cmF5UmVmIG9yaWdpbnMsIHZvaWQqIHVzZXJEYXRhKQogYm9vbCBUZXN0Q29udHJvbGxlcjo6aGFz RE9NQ2FjaGUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNoQ2FjaGVPcmlnaW5zQ2Fs bGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMsIG9yaWdpbik7Ci0gICAgV0tXZWJzaXRlRGF0YVN0 b3JlR2V0RmV0Y2hDYWNoZU9yaWdpbnMoVGVzdENvbnRyb2xsZXI6OmRlZmF1bHRXZWJzaXRlRGF0 YVN0b3JlKCksICZjb250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKKyAgICBXS1dl YnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlT3JpZ2lucyh3ZWJzaXRlRGF0YVN0b3JlKCksICZj b250ZXh0LCBmZXRjaENhY2hlT3JpZ2luc0NhbGxiYWNrKTsKICAgICBydW5VbnRpbChjb250ZXh0 LmRvbmUsIG5vVGltZW91dCk7CiAgICAgcmV0dXJuIGNvbnRleHQucmVzdWx0OwogfQpAQCAtMzM2 Myw3ICszMzY4LDcgQEAgc3RhdGljIHZvaWQgZmV0Y2hDYWNoZVNpemVGb3JPcmlnaW5DYWxsYmFj ayh1aW50NjRfdCBzaXplLCB2b2lkKiB1c2VyRGF0YSkKIHVpbnQ2NF90IFRlc3RDb250cm9sbGVy Ojpkb21DYWNoZVNpemUoV0tTdHJpbmdSZWYgb3JpZ2luKQogewogICAgIEZldGNoQ2FjaGVTaXpl Rm9yT3JpZ2luQ2FsbGJhY2tDb250ZXh0IGNvbnRleHQoKnRoaXMpOwotICAgIFdLV2Vic2l0ZURh dGFTdG9yZUdldEZldGNoQ2FjaGVTaXplRm9yT3JpZ2luKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0 V2Vic2l0ZURhdGFTdG9yZSgpLCBvcmlnaW4sICZjb250ZXh0LCBmZXRjaENhY2hlU2l6ZUZvck9y aWdpbkNhbGxiYWNrKTsKKyAgICBXS1dlYnNpdGVEYXRhU3RvcmVHZXRGZXRjaENhY2hlU2l6ZUZv ck9yaWdpbih3ZWJzaXRlRGF0YVN0b3JlKCksIG9yaWdpbiwgJmNvbnRleHQsIGZldGNoQ2FjaGVT aXplRm9yT3JpZ2luQ2FsbGJhY2spOwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1l b3V0KTsKICAgICByZXR1cm4gY29udGV4dC5yZXN1bHQ7CiB9CkBAIC0zNDIwLDcgKzM0MjUsNyBA QCB2b2lkIFRlc3RDb250cm9sbGVyOjpjbGVhclN0YXRpc3RpY3NEYXRhRm9yRG9tYWluKFdLU3Ry aW5nUmVmIGRvbWFpbikKIHsKICAgICBSZXNvdXJjZVN0YXRpc3RpY3NDYWxsYmFja0NvbnRleHQg Y29udGV4dCgqdGhpcyk7CiAKLSAgICBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVJVFBEYXRhRm9y RG9tYWluKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpLCBkb21haW4s ICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2FsbGJhY2spOworICAgIFdL V2Vic2l0ZURhdGFTdG9yZVJlbW92ZUlUUERhdGFGb3JEb21haW4od2Vic2l0ZURhdGFTdG9yZSgp LCBkb21haW4sICZjb250ZXh0LCByZXNvdXJjZVN0YXRpc3RpY3NWb2lkUmVzdWx0Q2FsbGJhY2sp OwogICAgIHJ1blVudGlsKGNvbnRleHQuZG9uZSwgbm9UaW1lb3V0KTsKIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCmluZGV4IDA1NDYxYzRkOTE3ZGEwZGQ5MzU3M2Zi MzgxZTkzNTI1MjViMWI4MTUuLjNjM2E1ZTE3NWIxYTgxNzcxODE1NjExMGNhNDZhNjNjM2M0OTg2 ZDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAor KysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKQEAgLTM3MSw2ICsz NzEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaGFuZGxlQ29udHJvbENvbW1hbmQoY29uc3QgY2hh ciogY29tbWFuZCk7CiAKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZSgpOworICAgIHZvaWQg cGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNvbnN0 IFRlc3RPcHRpb25zJik7CiAgICAgdm9pZCBwbGF0Zm9ybURlc3Ryb3koKTsKICAgICBXS0NvbnRl eHRSZWYgcGxhdGZvcm1BZGp1c3RDb250ZXh0KFdLQ29udGV4dFJlZiwgV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemVDb250ZXh0KCk7CkBAIC02 MjMsNiArNjI0LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEV2 ZW50U2VuZGVyUHJveHk+IG1fZXZlbnRTZW5kZXJQcm94eTsKKyAgICBXS1JldGFpblB0cjxXS1dl YnNpdGVEYXRhU3RvcmVSZWY+IG1fd2Vic2l0ZURhdGFTdG9yZTsKIAogICAgIFdvcmtRdWV1ZU1h bmFnZXIgbV93b3JrUXVldWVNYW5hZ2VyOwogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdElu dm9jYXRpb24uY3BwCmluZGV4IDIwMDFlNjBhMjYyZTRhNTVlMWRjMjA1NzRmMWU0YmIzMzYwMTEy MzQuLmUzMjI3ZWUwOWQzMWE3OGFiNmUwZDdjNDc5YTUxMWI2ZWVjMDM0YWYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uY3BwCkBAIC0xNjQsNyArMTY0LDcgQEAgdm9p ZCBUZXN0SW52b2NhdGlvbjo6aW52b2tlKCkKIAogICAgIFRlc3RDb250cm9sbGVyOjpzaW5nbGV0 b24oKS5zZXRTaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKHNob3VsZExvZ0hpc3RvcnlD bGllbnRDYWxsYmFja3MoKSk7CiAKLSAgICBXS0hUVFBDb29raWVTdG9yZVNldEhUVFBDb29raWVB Y2NlcHRQb2xpY3koV0tXZWJzaXRlRGF0YVN0b3JlR2V0SFRUUENvb2tpZVN0b3JlKFRlc3RDb250 cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9yZSgpKSwga1dLSFRUUENvb2tpZUFjY2VwdFBv bGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluLCBudWxscHRyLCBudWxscHRyKTsKKyAgICBX S0hUVFBDb29raWVTdG9yZVNldEhUVFBDb29raWVBY2NlcHRQb2xpY3koV0tXZWJzaXRlRGF0YVN0 b3JlR2V0SFRUUENvb2tpZVN0b3JlKFRlc3RDb250cm9sbGVyOjpzaW5nbGV0b24oKS53ZWJzaXRl RGF0YVN0b3JlKCkpLCBrV0tIVFRQQ29va2llQWNjZXB0UG9saWN5T25seUZyb21NYWluRG9jdW1l bnREb21haW4sIG51bGxwdHIsIG51bGxwdHIpOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBj bGVhciBvdXQgdmlzaXRlZCBsaW5rcyBoZXJlLgogCkBAIC0xMDgyLDcgKzEwODIsNyBAQCBXS1Jl dGFpblB0cjxXS1R5cGVSZWY+IFRlc3RJbnZvY2F0aW9uOjpkaWRSZWNlaXZlU3luY2hyb25vdXNN ZXNzYWdlRnJvbUluamVjdGVkQgogICAgIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5n KG1lc3NhZ2VOYW1lLCAiU2V0Q2FjaGVNb2RlbCIpKSB7CiAgICAgICAgIEFTU0VSVChXS0dldFR5 cGVJRChtZXNzYWdlQm9keSkgPT0gV0tVSW50NjRHZXRUeXBlSUQoKSk7CiAgICAgICAgIHVpbnQ2 NF90IG1vZGVsID0gV0tVSW50NjRHZXRWYWx1ZShzdGF0aWNfY2FzdDxXS1VJbnQ2NFJlZj4obWVz c2FnZUJvZHkpKTsKLSAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlU2V0Q2FjaGVNb2RlbFN5bmNo cm9ub3VzbHlGb3JUZXN0aW5nKFRlc3RDb250cm9sbGVyOjpkZWZhdWx0V2Vic2l0ZURhdGFTdG9y ZSgpLCBtb2RlbCk7CisgICAgICAgIFdLV2Vic2l0ZURhdGFTdG9yZVNldENhY2hlTW9kZWxTeW5j aHJvbm91c2x5Rm9yVGVzdGluZyhUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkud2Vic2l0ZURh dGFTdG9yZSgpLCBtb2RlbCk7CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIApAQCAt MTEzOSw3ICsxMTM5LDcgQEAgV0tSZXRhaW5QdHI8V0tUeXBlUmVmPiBUZXN0SW52b2NhdGlvbjo6 ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEIKICAgICB9CiAgICAgCiAg ICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcobWVzc2FnZU5hbWUsICJEZWxldGVB bGxJbmRleGVkRGF0YWJhc2VzIikpIHsKLSAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3Zl QWxsSW5kZXhlZERhdGFiYXNlcyhUZXN0Q29udHJvbGxlcjo6ZGVmYXVsdFdlYnNpdGVEYXRhU3Rv cmUoKSwgbnVsbHB0ciwgeyB9KTsKKyAgICAgICAgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlQWxs SW5kZXhlZERhdGFiYXNlcyhUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9uKCkud2Vic2l0ZURhdGFT dG9yZSgpLCBudWxscHRyLCB7IH0pOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJD b2NvYS5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVGVzdENvbnRyb2xsZXJDb2Nv YS5tbQppbmRleCBlOTRkMDYzMWQzYjhlNjI0MTljM2I4NGI1NGFmZGI1ZmY3OTg0ZTIyLi5jZTI3 NGM4YjFkYjFjNjI2MTA1ZWEwZjIwZjI0OGM1ODNlZjY2OWRkIDEwMDY0NAotLS0gYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL2NvY29hL1Rlc3RDb250cm9sbGVyQ29jb2EubW0KKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9UZXN0Q29udHJvbGxlckNvY29hLm1tCkBAIC0xMzEsNiAr MTMxLDIxIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQWRkVGVzdE9wdGlvbnMoVGVz dE9wdGlvbnMmIG9wdGlvbnMpIGNvbnN0CiAjZW5kaWYKIH0KIAordm9pZCBUZXN0Q29udHJvbGxl cjo6cGxhdGZvcm1Jbml0aWFsaXplRGF0YVN0b3JlKFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNv bnN0IFRlc3RPcHRpb25zJiBvcHRpb25zKQoreworICAgIGlmIChvcHRpb25zLnVzZUVwaGVtZXJh bFNlc3Npb24gfHwgb3B0aW9ucy5zdGFuZGFsb25lV2ViQXBwbGljYXRpb25VUkwubGVuZ3RoKCkp IHsKKyAgICAgICAgYXV0byB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnID0gb3B0aW9ucy51c2VFcGhl bWVyYWxTZXNzaW9uID8gW1tbX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2Nd IGluaXROb25QZXJzaXN0ZW50Q29uZmlndXJhdGlvbl0gYXV0b3JlbGVhc2VdIDogW1tbX1dLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAg ICAgICAgaWYgKCFvcHRpb25zLnVzZUVwaGVtZXJhbFNlc3Npb24pCisgICAgICAgICAgICBjb25m aWd1cmVXZWJzaXRlRGF0YVN0b3JlVGVtcG9yYXJ5RGlyZWN0b3JpZXMoKFdLV2Vic2l0ZURhdGFT dG9yZUNvbmZpZ3VyYXRpb25SZWYpd2Vic2l0ZURhdGFTdG9yZUNvbmZpZyk7CisgICAgICAgIGlm IChvcHRpb25zLnN0YW5kYWxvbmVXZWJBcHBsaWNhdGlvblVSTC5sZW5ndGgoKSkKKyAgICAgICAg ICAgIFt3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnIHNldFN0YW5kYWxvbmVBcHBsaWNhdGlvblVSTDpb TlNVUkwgVVJMV2l0aFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6b3B0aW9u cy5zdGFuZGFsb25lV2ViQXBwbGljYXRpb25VUkwuY19zdHIoKV1dXTsKKyAgICAgICAgYXV0byAq d2Vic2l0ZURhdGFTdG9yZSA9IFtbW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxvY10gX2luaXRXaXRo Q29uZmlndXJhdGlvbjp3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnXSBhdXRvcmVsZWFzZV07CisgICAg ICAgIFt3ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZDpZ RVNdOworICAgICAgICBtX3dlYnNpdGVEYXRhU3RvcmUgPSAoX19icmlkZ2UgV0tXZWJzaXRlRGF0 YVN0b3JlUmVmKXdlYnNpdGVEYXRhU3RvcmU7CisgICAgfSBlbHNlCisgICAgICAgIG1fd2Vic2l0 ZURhdGFTdG9yZSA9IChfX2JyaWRnZSBXS1dlYnNpdGVEYXRhU3RvcmVSZWYpZ2xvYmFsV2ViVmll d0NvbmZpZ3VyYXRpb24ud2Vic2l0ZURhdGFTdG9yZTsKK30KKwogdm9pZCBUZXN0Q29udHJvbGxl cjo6cGxhdGZvcm1DcmVhdGVXZWJWaWV3KFdLUGFnZUNvbmZpZ3VyYXRpb25SZWYsIGNvbnN0IFRl c3RPcHRpb25zJiBvcHRpb25zKQogewogICAgIFJldGFpblB0cjxXS1dlYlZpZXdDb25maWd1cmF0 aW9uPiBjb3BpZWRDb25maWd1cmF0aW9uID0gYWRvcHROUyhbZ2xvYmFsV2ViVmlld0NvbmZpZ3Vy YXRpb24gY29weV0pOwpAQCAtMTU3LDE2ICsxNzIsNyBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpw bGF0Zm9ybUNyZWF0ZVdlYlZpZXcoV0tQYWdlQ29uZmlndXJhdGlvblJlZiwgY29uc3QgVGVzdE9w dAogICAgIGlmIChvcHRpb25zLmVuYWJsZUVkaXRhYmxlSW1hZ2VzKQogICAgICAgICBbY29waWVk Q29uZmlndXJhdGlvbiBfc2V0RWRpdGFibGVJbWFnZXNFbmFibGVkOllFU107CiAKLSAgICBpZiAo b3B0aW9ucy51c2VFcGhlbWVyYWxTZXNzaW9uIHx8IG9wdGlvbnMuc3RhbmRhbG9uZVdlYkFwcGxp Y2F0aW9uVVJMLmxlbmd0aCgpKSB7Ci0gICAgICAgIGF1dG8gd2Vic2l0ZURhdGFTdG9yZUNvbmZp ZyA9IG9wdGlvbnMudXNlRXBoZW1lcmFsU2Vzc2lvbiA/IFtbW19XS1dlYnNpdGVEYXRhU3RvcmVD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0Tm9uUGVyc2lzdGVudENvbmZpZ3VyYXRpb25dIGF1dG9y ZWxlYXNlXSA6IFtbW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0 XSBhdXRvcmVsZWFzZV07Ci0gICAgICAgIGlmICghb3B0aW9ucy51c2VFcGhlbWVyYWxTZXNzaW9u KQotICAgICAgICAgICAgY29uZmlndXJlV2Vic2l0ZURhdGFTdG9yZVRlbXBvcmFyeURpcmVjdG9y aWVzKChXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmKXdlYnNpdGVEYXRhU3RvcmVD b25maWcpOwotICAgICAgICBpZiAob3B0aW9ucy5zdGFuZGFsb25lV2ViQXBwbGljYXRpb25VUkwu bGVuZ3RoKCkpCi0gICAgICAgICAgICBbd2Vic2l0ZURhdGFTdG9yZUNvbmZpZyBzZXRTdGFuZGFs b25lQXBwbGljYXRpb25VUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dp dGhVVEY4U3RyaW5nOm9wdGlvbnMuc3RhbmRhbG9uZVdlYkFwcGxpY2F0aW9uVVJMLmNfc3RyKCld XV07Ci0gICAgICAgIGF1dG8gd2Vic2l0ZURhdGFTdG9yZSA9IFtbW1dLV2Vic2l0ZURhdGFTdG9y ZSBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjp3ZWJzaXRlRGF0YVN0b3JlQ29uZmlnXSBh dXRvcmVsZWFzZV07Ci0gICAgICAgIFt3ZWJzaXRlRGF0YVN0b3JlIF9zZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRW5hYmxlZDpZRVNdOwotICAgICAgICBbY29waWVkQ29uZmlndXJhdGlvbiBzZXRX ZWJzaXRlRGF0YVN0b3JlOndlYnNpdGVEYXRhU3RvcmVdOwotICAgIH0KKyAgICBbY29waWVkQ29u ZmlndXJhdGlvbiBzZXRXZWJzaXRlRGF0YVN0b3JlOihXS1dlYnNpdGVEYXRhU3RvcmUgKil3ZWJz aXRlRGF0YVN0b3JlKCldOwogCiAgICAgW2NvcGllZENvbmZpZ3VyYXRpb24gX3NldEFsbG93VG9w TmF2aWdhdGlvblRvRGF0YVVSTHM6b3B0aW9ucy5hbGxvd1RvcE5hdmlnYXRpb25Ub0RhdGFVUkxz XTsKIAo=