217177 2020-10-01 05:17:48 -0700 WebDriver: check the right browser context is open in all commands 2020-10-02 04:55:21 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 166679 1 cgarcia webkit-unassigned aperez bburg clopez lmoura webkit-bug-importer oldest_to_newest 1693724 0 cgarcia 2020-10-01 05:17:48 -0700 We currently check the top level browsing context for all commands, but the current browsing context should be checked instead in some of them. New tests added to check this are now failing. 1693729 1 410222 cgarcia 2020-10-01 05:50:32 -0700 Created attachment 410222 Patch 1694019 2 cgarcia 2020-10-02 03:51:17 -0700 *** Bug 217206 has been marked as a duplicate of this bug. *** 1694047 3 cgarcia 2020-10-02 04:54:49 -0700 Committed r267872: <https://trac.webkit.org/changeset/267872> 1694048 4 webkit-bug-importer 2020-10-02 04:55:21 -0700 <rdar://problem/69876684> 410222 2020-10-01 05:50:32 -0700 2020-10-02 04:42:32 -0700 Patch wd-browsing-context.diff text/plain 18908 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggZDNlZTJjOGM0MDZmLi41ZjNjYmY3YmM3ZjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsNTQgQEAKKzIwMjAtMTAtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFdlYkRyaXZlcjogY2hlY2sgdGhlIHJpZ2h0 IGJyb3dzZXIgY29udGV4dCBpcyBvcGVuIGluIGFsbCBjb21tYW5kcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MTc3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY3VycmVudGx5IGNoZWNrIHRoZSB0 b3AgbGV2ZWwgYnJvd3NpbmcgY29udGV4dCBmb3IgYWxsIGNvbW1hbmRzLCBidXQgdGhlIGN1cnJl bnQgYnJvd3NpbmcgY29udGV4dCBzaG91bGQgYmUKKyAgICAgICAgY2hlY2tlZCBpbnN0ZWFkIGlu IHNvbWUgb2YgdGhlbS4gTmV3IHRlc3RzIGFkZGVkIHRvIGNoZWNrIHRoaXMgYXJlIG5vdyBmYWls aW5nLiBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIHdheSB3ZQorICAgICAgICB3ZXJlIGhhbmRsaW5n IHRoZSBjdXJyZW50IGJyb3dzaW5nIGNvbnRleHQsIGNvbnNpZGVyaW5nIG51bGxvcHQgdG8gYmUg dGhlIG1haW4gZnJhbWUgb2YgdGhlIGN1cnJlbnQgdG9wIGxldmVsCisgICAgICAgIGJyb3dzaW5n IGNvbnRleHQuIE5vdyB0aGUgbnVsbCBzdHJpbmcgaXMgdXNlZCBmb3IgdGhhdCwgbWF0Y2hpbmcg d2hhdCBhdXRvbWF0aW9uIGV4cGVjdHMgaW4gdGhlIGJyb3dzZXIgYW5kCisgICAgICAgIG51bGxv cHQgbWVhbnMgdGhlIGJyb3dzZXIgY29udGV4dCBpcyBjbG9zZWQuIFRoYXQgd2F5IHdlIGNhbiBj aGVjayBpZiB0aGUgY3VycmVudCBicm93c2VyIGNvbnRleHQgaGFzIGJlZW4KKyAgICAgICAgY2xv c2VkLgorCisgICAgICAgICogU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Np b246OmNsb3NlKTogQWxzbyBjbG9zZSB0aGUgY3VycmVudCBicm93c2luZyBjb250ZXh0LgorICAg ICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpzd2l0Y2hUb1RvcExldmVsQnJvd3NpbmdDb250ZXh0 KTogSW5pdGlhbGl6ZSB0aGUgY3VycmVudCBicm93c2luZyBjb250ZXh0IHRvIG51bGwgc3RyaW5n LgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpzd2l0Y2hUb0Jyb3dzaW5nQ29udGV4dCk6 IEp1c3Qgc2V0IHRoZSBnaXZlbiBjb250ZXh0IG5vdy4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vz c2lvbjo6Z28pOiBQYXNzIG51bGwgc3RyaW5nIHRvIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KCku CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmJhY2spOiBEaXR0by4KKyAgICAgICAgKFdl YkRyaXZlcjo6U2Vzc2lvbjo6Zm9yd2FyZCk6IERpdHRvLgorICAgICAgICAoV2ViRHJpdmVyOjpT ZXNzaW9uOjpyZWZyZXNoKTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmNs b3NlV2luZG93KTogQ2xvc2UgdGhlIGN1cnJlbnQgYnJvd3NpbmcgY29udGV4dCB0b28uCisgICAg ICAgIChXZWJEcml2ZXI6OlNlc3Npb246OnN3aXRjaFRvRnJhbWUpOiBJZiBmcmFtZSBpcyBudWxs IGNoZWNrIHRvcCBsZXZlbCBicm93c2luZyBjb250ZXh0IGlzIG9wZW4sIG90aGVyd2lzZSBjaGVj aworICAgICAgICBjdXJyZW50IGJyb3dzaW5nIGNvbnRleHQuCisgICAgICAgIChXZWJEcml2ZXI6 OlNlc3Npb246OmZpbmRFbGVtZW50cyk6IENoZWNrIGN1cnJlbnQgYnJvd3NpbmcgY29udGV4dCBp cyBvcGVuIGluc3RlYWQgb2YgdG9wbGV2ZWwgb25lLgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNz aW9uOjpnZXRBY3RpdmVFbGVtZW50KTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Np b246OmlzRWxlbWVudFNlbGVjdGVkKTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Np b246OmdldEVsZW1lbnRUZXh0KTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246 OmdldEVsZW1lbnRUYWdOYW1lKTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246 OmdldEVsZW1lbnRSZWN0KTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246Omlz RWxlbWVudEVuYWJsZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6Z2V0 RWxlbWVudEF0dHJpYnV0ZSk6IERpdHRvLgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpn ZXRFbGVtZW50UHJvcGVydHkpOiBEaXR0by4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6 Z2V0RWxlbWVudENTU1ZhbHVlKTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246 OndhaXRGb3JOYXZpZ2F0aW9uVG9Db21wbGV0ZSk6IERpdHRvLiBBbHNvIGNsb3NlIHRoZSBjdXJy ZW50IGJyb3dzaW5nIGNvbnRleHQgd2hlbiB0aGUKKyAgICAgICAgd2luZG93IG9yIHRoZSBmcmFt ZSBhcmUgY2xvc2VkIHRvIGRvIHRoZSBuYXZpZ2F0aW9uLgorICAgICAgICAoV2ViRHJpdmVyOjpT ZXNzaW9uOjplbGVtZW50Q2xpY2spOiBDaGVjayBjdXJyZW50IGJyb3dzaW5nIGNvbnRleHQgaXMg b3BlbiBpbnN0ZWFkIG9mIHRvcGxldmVsIG9uZS4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lv bjo6ZWxlbWVudENsZWFyKTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmVs ZW1lbnRTZW5kS2V5cyk6IERpdHRvLgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpnZXRQ YWdlU291cmNlKTogRGl0dG8uCisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmV4ZWN1dGVT Y3JpcHQpOiBEaXR0by4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6Z2V0QWxsQ29va2ll cyk6IERpdHRvLgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjphZGRDb29raWUpOiBEaXR0 by4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6ZGVsZXRlQ29va2llKTogRGl0dG8uCisg ICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmRlbGV0ZUFsbENvb2tpZXMpOiBEaXR0by4KKyAg ICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6cGVyZm9ybUFjdGlvbnMpOiBEaXR0by4KKyAgICAg ICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6dGFrZVNjcmVlbnNob3QpOiBDaGVjayBjdXJyZW50IGJy b3dzaW5nIGNvbnRleHQgaXMgb3BlbiBpbnN0ZWFkIG9mIHRvcGxldmVsIG9uZSB3aGVuIGFuCisg ICAgICAgIGVsZW1lbnQgaXMgZ2l2ZW4uCisgICAgICAgICogU2Vzc2lvbi5oOgorCiAyMDIwLTA5 LTMwICBCYXN1a2UgU3V6dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4KIAogICAgICAgICBb UGxheVN0YXRpb25dW1dpbkNhaXJvXSBFbmFibGUgV2ViRHJpdmVyIHRhcmdldCBvbiBQbGF5U3Rh dGlvbiBhbmQgY2xpZW50IGZvciBXaW5DYWlybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRyaXZl ci9TZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAKaW5kZXggZjNhNDg0 Nzc4NDJkLi5mMmM2MjMyMTkzMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmNwcApAQCAtMTEwLDYgKzExMCw3 IEBAIHZvaWQgU2Vzc2lvbjo6Y2xvc2VBbGxUb3BsZXZlbEJyb3dzaW5nQ29udGV4dHMoY29uc3Qg U3RyaW5nJiB0b3BsZXZlbEJyb3dzaW5nQ29uCiB2b2lkIFNlc3Npb246OmNsb3NlKEZ1bmN0aW9u PHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgbV90 b3BsZXZlbEJyb3dzaW5nQ29udGV4dCA9IFdURjo6bnVsbG9wdDsKKyAgICBtX2N1cnJlbnRCcm93 c2luZ0NvbnRleHQgPSBXVEY6Om51bGxvcHQ7CiAgICAgZ2V0V2luZG93SGFuZGxlcyhbdGhpcywg Y29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oQ29tbWFuZFJl c3VsdCYmIHJlc3VsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlmIChyZXN1bHQuaXNFcnJvcigpKSB7 CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKHJlc3VsdCkpOwpAQCAtMTQ2 LDE5ICsxNDcsMTUgQEAgdm9pZCBTZXNzaW9uOjpzZXRUaW1lb3V0cyhjb25zdCBUaW1lb3V0cyYg dGltZW91dHMsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQKICAgICBjb21wbGV0aW9uSGFu ZGxlcihDb21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOwogfQogCi12b2lkIFNlc3Npb246OnN3aXRj aFRvVG9wTGV2ZWxCcm93c2luZ0NvbnRleHQoT3B0aW9uYWw8U3RyaW5nPiB0b3BsZXZlbEJyb3dz aW5nQ29udGV4dCkKK3ZvaWQgU2Vzc2lvbjo6c3dpdGNoVG9Ub3BMZXZlbEJyb3dzaW5nQ29udGV4 dChjb25zdCBTdHJpbmcmIHRvcGxldmVsQnJvd3NpbmdDb250ZXh0KQogewogICAgIG1fdG9wbGV2 ZWxCcm93c2luZ0NvbnRleHQgPSB0b3BsZXZlbEJyb3dzaW5nQ29udGV4dDsKLSAgICBtX2N1cnJl bnRCcm93c2luZ0NvbnRleHQgPSBXVEY6Om51bGxvcHQ7CisgICAgbV9jdXJyZW50QnJvd3NpbmdD b250ZXh0ID0gU3RyaW5nKCk7CiB9CiAKLXZvaWQgU2Vzc2lvbjo6c3dpdGNoVG9Ccm93c2luZ0Nv bnRleHQoT3B0aW9uYWw8U3RyaW5nPiBicm93c2luZ0NvbnRleHQpCit2b2lkIFNlc3Npb246OnN3 aXRjaFRvQnJvd3NpbmdDb250ZXh0KGNvbnN0IFN0cmluZyYgYnJvd3NpbmdDb250ZXh0KQogewot ICAgIC8vIEF1dG9tYXRpb24gc2VuZHMgZW1wdHkgc3RyaW5ncyBmb3IgbWFpbiBmcmFtZS4KLSAg ICBpZiAoIWJyb3dzaW5nQ29udGV4dCB8fCBicm93c2luZ0NvbnRleHQudmFsdWUoKS5pc0VtcHR5 KCkpCi0gICAgICAgIG1fY3VycmVudEJyb3dzaW5nQ29udGV4dCA9IFdURjo6bnVsbG9wdDsKLSAg ICBlbHNlCi0gICAgICAgIG1fY3VycmVudEJyb3dzaW5nQ29udGV4dCA9IGJyb3dzaW5nQ29udGV4 dDsKKyAgICBtX2N1cnJlbnRCcm93c2luZ0NvbnRleHQgPSBicm93c2luZ0NvbnRleHQ7CiB9CiAK IE9wdGlvbmFsPFN0cmluZz4gU2Vzc2lvbjo6cGFnZUxvYWRTdHJhdGVneVN0cmluZygpIGNvbnN0 CkBAIC0zMTMsNyArMzEwLDcgQEAgdm9pZCBTZXNzaW9uOjpnbyhjb25zdCBTdHJpbmcmIHVybCwg RnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW8KICAgICAgICAgICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKFdURk1vdmUocmVzcG9u c2UucmVzcG9uc2VPYmplY3QpKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgfQotICAgICAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoV1RGOjpudWxsb3B0KTsK KyAgICAgICAgICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KHsgfSk7CiAgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOwogICAgICAgICB9KTsK ICAgICB9KTsKQEAgLTM3OSw3ICszNzYsNyBAQCB2b2lkIFNlc3Npb246OmJhY2soRnVuY3Rpb248 dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAgICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKFdURk1vdmUocmVzcG9u c2UucmVzcG9uc2VPYmplY3QpKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgfQotICAgICAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoV1RGOjpudWxsb3B0KTsK KyAgICAgICAgICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KHsgfSk7CiAgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOwogICAgICAgICB9KTsK ICAgICB9KTsKQEAgLTQwNyw3ICs0MDQsNyBAQCB2b2lkIFNlc3Npb246OmZvcndhcmQoRnVuY3Rp b248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAg ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKFdURk1vdmUocmVz cG9uc2UucmVzcG9uc2VPYmplY3QpKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgfQotICAgICAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoV1RGOjpudWxsb3B0 KTsKKyAgICAgICAgICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KHsgfSk7CiAgICAgICAgICAg ICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOwogICAgICAgICB9 KTsKICAgICB9KTsKQEAgLTQzNSw3ICs0MzIsNyBAQCB2b2lkIFNlc3Npb246OnJlZnJlc2goRnVu Y3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAg ICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKFdURk1vdmUo cmVzcG9uc2UucmVzcG9uc2VPYmplY3QpKSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgfQotICAgICAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoV1RGOjpudWxs b3B0KTsKKyAgICAgICAgICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KHsgfSk7CiAgICAgICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOwogICAgICAg ICB9KTsKICAgICB9KTsKQEAgLTU1MCw2ICs1NDcsNyBAQCB2b2lkIFNlc3Npb246OmNsb3NlV2lu ZG93KEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIp CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgYXV0byB0b3BsZXZlbEJy b3dzaW5nQ29udGV4dCA9IHN0ZDo6ZXhjaGFuZ2UobV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCwg V1RGOjpudWxsb3B0KTsKKyAgICAgICAgbV9jdXJyZW50QnJvd3NpbmdDb250ZXh0ID0gV1RGOjpu dWxsb3B0OwogICAgICAgICBjbG9zZVRvcExldmVsQnJvd3NpbmdDb250ZXh0KHRvcGxldmVsQnJv d3NpbmdDb250ZXh0LnZhbHVlKCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICB9 KTsKIH0KQEAgLTY0OCwxNCArNjQ2LDE4IEBAIHZvaWQgU2Vzc2lvbjo6bmV3V2luZG93KE9wdGlv bmFsPFN0cmluZz4gdHlwZUhpbnQsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmCiAKIHZv aWQgU2Vzc2lvbjo6c3dpdGNoVG9GcmFtZShSZWZQdHI8SlNPTjo6VmFsdWU+JiYgZnJhbWVJRCwg RnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsK LSAgICBpZiAoIW1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQpIHsKLSAgICAgICAgY29tcGxldGlv bkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6Ok5v U3VjaFdpbmRvdykpOworICAgIGlmIChmcmFtZUlELT5pc051bGwoKSkgeworICAgICAgICBpZiAo IW1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hX aW5kb3cpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBzd2l0Y2hU b0Jyb3dzaW5nQ29udGV4dCh7IH0pOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5k UmVzdWx0OjpzdWNjZXNzKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKGZy YW1lSUQtPmlzTnVsbCgpKSB7Ci0gICAgICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KFdURjo6 bnVsbG9wdCk7Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OnN1Y2Nl c3MoKSk7CisgICAgaWYgKCFtX2N1cnJlbnRCcm93c2luZ0NvbnRleHQpIHsKKyAgICAgICAgY29t cGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNv ZGU6Ok5vU3VjaFdpbmRvdykpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xMDU3LDcg KzEwNTksNyBAQCB2b2lkIFNlc3Npb246OmNvbXB1dGVFbGVtZW50TGF5b3V0KGNvbnN0IFN0cmlu ZyYgZWxlbWVudElELCBPcHRpb25TZXQ8RWxlbWVudExheQogCiB2b2lkIFNlc3Npb246OmZpbmRF bGVtZW50cyhjb25zdCBTdHJpbmcmIHN0cmF0ZWd5LCBjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBG aW5kRWxlbWVudHNNb2RlIG1vZGUsIGNvbnN0IFN0cmluZyYgcm9vdEVsZW1lbnRJRCwgRnVuY3Rp b248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBp ZiAoIW1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQpIHsKKyAgICBpZiAoIW1fY3VycmVudEJyb3dz aW5nQ29udGV4dCkgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0Ojpm YWlsKENvbW1hbmRSZXN1bHQ6OkVycm9yQ29kZTo6Tm9TdWNoV2luZG93KSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CkBAIC0xMTQwLDcgKzExNDIsNyBAQCB2b2lkIFNlc3Npb246OmZpbmRFbGVt ZW50cyhjb25zdCBTdHJpbmcmIHN0cmF0ZWd5LCBjb25zdCBTdHJpbmcmIHNlbGVjdG9yLCBGaW5k RQogCiB2b2lkIFNlc3Npb246OmdldEFjdGl2ZUVsZW1lbnQoRnVuY3Rpb248dm9pZCAoQ29tbWFu ZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBpZiAoIW1fdG9wbGV2ZWxC cm93c2luZ0NvbnRleHQpIHsKKyAgICBpZiAoIW1fY3VycmVudEJyb3dzaW5nQ29udGV4dCkgewog ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKENvbW1hbmRSZXN1 bHQ6OkVycm9yQ29kZTo6Tm9TdWNoV2luZG93KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC0xMTg0LDcgKzExODYsNyBAQCB2b2lkIFNlc3Npb246OmdldEFjdGl2ZUVsZW1lbnQoRnVuY3Rp b248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZAogCiB2b2lkIFNlc3Np b246OmlzRWxlbWVudFNlbGVjdGVkKGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBGdW5jdGlvbjx2 b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICgh bV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdD b250ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwo Q29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KQEAgLTEyNDAsNyArMTI0Miw3IEBAIHZvaWQgU2Vzc2lvbjo6aXNFbGVtZW50U2Vs ZWN0ZWQoY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSCiAK IHZvaWQgU2Vzc2lvbjo6Z2V0RWxlbWVudFRleHQoY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsIEZ1 bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0g ICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgaWYgKCFtX2N1cnJlbnRC cm93c2luZ0NvbnRleHQpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3Vs dDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6Ok5vU3VjaFdpbmRvdykpOwogICAgICAg ICByZXR1cm47CiAgICAgfQpAQCAtMTI4NSw3ICsxMjg3LDcgQEAgdm9pZCBTZXNzaW9uOjpnZXRF bGVtZW50VGV4dChjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgRnVuY3Rpb248dm9pZCAoQ29tbWFu ZFJlc3UKIAogdm9pZCBTZXNzaW9uOjpnZXRFbGVtZW50VGFnTmFtZShjb25zdCBTdHJpbmcmIGVs ZW1lbnRJRCwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKIHsKLSAgICBpZiAoIW1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQpIHsKKyAgICBpZiAo IW1fY3VycmVudEJyb3dzaW5nQ29udGV4dCkgewogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihD b21tYW5kUmVzdWx0OjpmYWlsKENvbW1hbmRSZXN1bHQ6OkVycm9yQ29kZTo6Tm9TdWNoV2luZG93 KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xMzI5LDcgKzEzMzEsNyBAQCB2b2lkIFNl c3Npb246OmdldEVsZW1lbnRUYWdOYW1lKGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBGdW5jdGlv bjx2b2lkIChDb21tYW5kUgogCiB2b2lkIFNlc3Npb246OmdldEVsZW1lbnRSZWN0KGNvbnN0IFN0 cmluZyYgZWxlbWVudElELCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgewor ICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1 Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTEzNTYsNyArMTM1OCw3IEBA IHZvaWQgU2Vzc2lvbjo6Z2V0RWxlbWVudFJlY3QoY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsIEZ1 bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1CiAKIHZvaWQgU2Vzc2lvbjo6aXNFbGVtZW50RW5hYmxl ZChjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYm KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBpZiAoIW1fdG9wbGV2ZWxCcm93c2luZ0Nv bnRleHQpIHsKKyAgICBpZiAoIW1fY3VycmVudEJyb3dzaW5nQ29udGV4dCkgewogICAgICAgICBj b21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKENvbW1hbmRSZXN1bHQ6OkVycm9y Q29kZTo6Tm9TdWNoV2luZG93KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xNDQ0LDcg KzE0NDYsNyBAQCB2b2lkIFNlc3Npb246OmlzRWxlbWVudERpc3BsYXllZChjb25zdCBTdHJpbmcm IGVsZW1lbnRJRCwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZAogCiB2b2lkIFNlc3Npb246OmdldEVs ZW1lbnRBdHRyaWJ1dGUoY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsIGNvbnN0IFN0cmluZyYgYXR0 cmlidXRlLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5k bGVyKQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgIGlmICgh bV9jdXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENv bW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE0ODksNyArMTQ5MSw3IEBAIHZvaWQgU2Vz c2lvbjo6Z2V0RWxlbWVudEF0dHJpYnV0ZShjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgY29uc3Qg U3RyaW5nJiBhdHRyaWJ1CiAKIHZvaWQgU2Vzc2lvbjo6Z2V0RWxlbWVudFByb3BlcnR5KGNvbnN0 IFN0cmluZyYgZWxlbWVudElELCBjb25zdCBTdHJpbmcmIHByb3BlcnR5LCBGdW5jdGlvbjx2b2lk IChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90 b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250 ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29t bWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KQEAgLTE1MzMsNyArMTUzNSw3IEBAIHZvaWQgU2Vzc2lvbjo6Z2V0RWxlbWVudFByb3Bl cnR5KGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBjb25zdCBTdHJpbmcmIHByb3BlcnR5CiAKIHZv aWQgU2Vzc2lvbjo6Z2V0RWxlbWVudENTU1ZhbHVlKGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBj b25zdCBTdHJpbmcmIGNzc1Byb3BlcnR5LCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYp PiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29u dGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JD b2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE1NzcsOCAr MTU3OSw4IEBAIHZvaWQgU2Vzc2lvbjo6Z2V0RWxlbWVudENTU1ZhbHVlKGNvbnN0IFN0cmluZyYg ZWxlbWVudElELCBjb25zdCBTdHJpbmcmIGNzc1Byb3BlCiAKIHZvaWQgU2Vzc2lvbjo6d2FpdEZv ck5hdmlnYXRpb25Ub0NvbXBsZXRlKEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0 KSB7Ci0gICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFu ZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKKyAgICBpZiAoIW1fY3VycmVudEJy b3dzaW5nQ29udGV4dCkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0 OjpzdWNjZXNzKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xNTk2LDEwICsxNTk4 LDExIEBAIHZvaWQgU2Vzc2lvbjo6d2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlKEZ1bmN0aW9u PHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tCiAgICAgICAgICAgICBjYXNlIENvbW1hbmRS ZXN1bHQ6OkVycm9yQ29kZTo6Tm9TdWNoV2luZG93OgogICAgICAgICAgICAgICAgIC8vIFdpbmRv dyB3YXMgY2xvc2VkLCByZXNldCB0aGUgdG9wIGxldmVsIGJyb3dzaW5nIGNvbnRleHQgYW5kIGln bm9yZSB0aGUgZXJyb3IuCiAgICAgICAgICAgICAgICAgbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4 dCA9IFdURjo6bnVsbG9wdDsKKyAgICAgICAgICAgICAgICBtX2N1cnJlbnRCcm93c2luZ0NvbnRl eHQgPSBXVEY6Om51bGxvcHQ7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBj YXNlIENvbW1hbmRSZXN1bHQ6OkVycm9yQ29kZTo6Tm9TdWNoRnJhbWU6Ci0gICAgICAgICAgICAg ICAgLy8gTmF2aWdhdGlvbiBkZXN0cm95ZWQgdGhlIGN1cnJlbnQgZnJhbWUsIHN3aXRjaCB0byB0 b3AgbGV2ZWwgYnJvd3NpbmcgY29udGV4dCBhbmQgaWdub3JlIHRoZSBlcnJvci4KLSAgICAgICAg ICAgICAgICBzd2l0Y2hUb0Jyb3dzaW5nQ29udGV4dChXVEY6Om51bGxvcHQpOworICAgICAgICAg ICAgICAgIC8vIE5hdmlnYXRpb24gZGVzdHJveWVkIHRoZSBjdXJyZW50IGZyYW1lLCByZXNldCB0 aGUgY3VycmVudCBicm93c2luZyBjb250ZXh0IGFuZCBpZ25vcmUgdGhlIGVycm9yLgorICAgICAg ICAgICAgICAgIG1fY3VycmVudEJyb3dzaW5nQ29udGV4dCA9IFdURjo6bnVsbG9wdDsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAg Y29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShyZXN1bHQpKTsKQEAgLTE2ODcsNyArMTY5MCw3IEBA IHZvaWQgU2Vzc2lvbjo6c2VsZWN0T3B0aW9uRWxlbWVudChjb25zdCBTdHJpbmcmIGVsZW1lbnRJ RCwgRnVuY3Rpb248dm9pZCAoQ29tbWFuCiAKIHZvaWQgU2Vzc2lvbjo6ZWxlbWVudENsaWNrKGNv bnN0IFN0cmluZyYgZWxlbWVudElELCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4 dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2Rl OjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE4MDAsNyArMTgw Myw3IEBAIHZvaWQgU2Vzc2lvbjo6ZWxlbWVudElzRWRpdGFibGUoY29uc3QgU3RyaW5nJiBlbGVt ZW50SUQsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSCiAKIHZvaWQgU2Vzc2lvbjo6ZWxlbWVudENs ZWFyKGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0 JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5n Q29udGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJy b3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIwMzEs NyArMjAzNCw3IEBAIFN0cmluZyBTZXNzaW9uOjp2aXJ0dWFsS2V5Rm9yS2V5KFVDaGFyIGtleSwg S2V5TW9kaWZpZXImIG1vZGlmaWVyKQogCiB2b2lkIFNlc3Npb246OmVsZW1lbnRTZW5kS2V5cyhj b25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBGdW5jdGlvbjx2b2lk IChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90 b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250 ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29t bWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KQEAgLTIxMzMsNyArMjEzNiw3IEBAIHZvaWQgU2Vzc2lvbjo6ZWxlbWVudFNlbmRLZXlz KGNvbnN0IFN0cmluZyYgZWxlbWVudElELCBjb25zdCBTdHJpbmcmIHRleHQsIEZ1bmN0CiAKIHZv aWQgU2Vzc2lvbjo6Z2V0UGFnZVNvdXJjZShGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYp PiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29u dGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JD b2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIxOTYsNyAr MjE5OSw3IEBAIFJlZjxKU09OOjpWYWx1ZT4gU2Vzc2lvbjo6aGFuZGxlU2NyaXB0UmVzdWx0KFJl ZjxKU09OOjpWYWx1ZT4mJiByZXN1bHRWYWx1ZSkKIAogdm9pZCBTZXNzaW9uOjpleGVjdXRlU2Ny aXB0KGNvbnN0IFN0cmluZyYgc2NyaXB0LCBSZWZQdHI8SlNPTjo6QXJyYXk+JiYgYXJndW1lbnRz QXJyYXksIEV4ZWN1dGVTY3JpcHRNb2RlIG1vZGUsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1 bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFtX3RvcGxldmVsQnJvd3Np bmdDb250ZXh0KSB7CisgICAgaWYgKCFtX2N1cnJlbnRCcm93c2luZ0NvbnRleHQpIHsKICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpF cnJvckNvZGU6Ok5vU3VjaFdpbmRvdykpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjQx MCw3ICsyNDEzLDcgQEAgc3RhdGljIFJlZjxKU09OOjpPYmplY3Q+IHNlcmlhbGl6ZUNvb2tpZShj b25zdCBTZXNzaW9uOjpDb29raWUmIGNvb2tpZSkKIAogdm9pZCBTZXNzaW9uOjpnZXRBbGxDb29r aWVzKEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIp CiB7Ci0gICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgaWYgKCFtX2N1 cnJlbnRCcm93c2luZ0NvbnRleHQpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFu ZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6Ok5vU3VjaFdpbmRvdykpOwog ICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjQ3OCw3ICsyNDgxLDcgQEAgdm9pZCBTZXNzaW9u OjpnZXROYW1lZENvb2tpZShjb25zdCBTdHJpbmcmIG5hbWUsIEZ1bmN0aW9uPHZvaWQgKENvbW1h bmRSZXN1bHQmJikKIAogdm9pZCBTZXNzaW9uOjphZGRDb29raWUoY29uc3QgQ29va2llJiBjb29r aWUsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIp CiB7Ci0gICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgaWYgKCFtX2N1 cnJlbnRCcm93c2luZ0NvbnRleHQpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFu ZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6Ok5vU3VjaFdpbmRvdykpOwog ICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjUwMyw3ICsyNTA2LDcgQEAgdm9pZCBTZXNzaW9u OjphZGRDb29raWUoY29uc3QgQ29va2llJiBjb29raWUsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRS ZXN1bHQmJik+JiYKIAogdm9pZCBTZXNzaW9uOjpkZWxldGVDb29raWUoY29uc3QgU3RyaW5nJiBu YW1lLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogewotICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgIGlmICghbV9j dXJyZW50QnJvd3NpbmdDb250ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1h bmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI1MjgsNyArMjUzMSw3IEBAIHZvaWQgU2Vzc2lv bjo6ZGVsZXRlQ29va2llKGNvbnN0IFN0cmluZyYgbmFtZSwgRnVuY3Rpb248dm9pZCAoQ29tbWFu ZFJlc3VsdCYmKT4mCiAKIHZvaWQgU2Vzc2lvbjo6ZGVsZXRlQWxsQ29va2llcyhGdW5jdGlvbjx2 b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGlmICgh bV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgIGlmICghbV9jdXJyZW50QnJvd3NpbmdD b250ZXh0KSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwo Q29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KQEAgLTI1OTEsNyArMjU5NCw3IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBhdXRvbWF0 aW9uT3JpZ2luVHlwZShQb2ludGVyT3JpZ2luOjpUeXBlIHR5cGUpCiAKIHZvaWQgU2Vzc2lvbjo6 cGVyZm9ybUFjdGlvbnMoVmVjdG9yPFZlY3RvcjxBY3Rpb24+PiYmIGFjdGlvbnNCeVRpY2ssIEZ1 bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0g ICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgaWYgKCFtX2N1cnJlbnRC cm93c2luZ0NvbnRleHQpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3Vs dDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6Ok5vU3VjaFdpbmRvdykpOwogICAgICAg ICByZXR1cm47CiAgICAgfQpAQCAtMjgzMCw3ICsyODMzLDcgQEAgdm9pZCBTZXNzaW9uOjpzZW5k QWxlcnRUZXh0KGNvbnN0IFN0cmluZyYgdGV4dCwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3Vs dCYmKT4KIAogdm9pZCBTZXNzaW9uOjp0YWtlU2NyZWVuc2hvdChPcHRpb25hbDxTdHJpbmc+IGVs ZW1lbnRJRCwgT3B0aW9uYWw8Ym9vbD4gc2Nyb2xsSW50b1ZpZXcsIEZ1bmN0aW9uPHZvaWQgKENv bW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgaWYgKCFtX3RvcGxl dmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgaWYgKChlbGVtZW50SUQgJiYgIW1fY3VycmVudEJy b3dzaW5nQ29udGV4dCkgfHwgKCFlbGVtZW50SUQgJiYgIW1fdG9wbGV2ZWxCcm93c2luZ0NvbnRl eHQpKSB7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29t bWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpOb1N1Y2hXaW5kb3cpKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5oIGIvU291cmNlL1dl YkRyaXZlci9TZXNzaW9uLmgKaW5kZXggYWQwNTYzYmI5MTlmLi42YjcwN2M0OTdlZDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIv U2Vzc2lvbi5oCkBAIC0xMjcsOCArMTI3LDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBTZXNz aW9uKHN0ZDo6dW5pcXVlX3B0cjxTZXNzaW9uSG9zdD4mJik7CiAKLSAgICB2b2lkIHN3aXRjaFRv VG9wTGV2ZWxCcm93c2luZ0NvbnRleHQoT3B0aW9uYWw8U3RyaW5nPik7Ci0gICAgdm9pZCBzd2l0 Y2hUb0Jyb3dzaW5nQ29udGV4dChPcHRpb25hbDxTdHJpbmc+KTsKKyAgICB2b2lkIHN3aXRjaFRv VG9wTGV2ZWxCcm93c2luZ0NvbnRleHQoY29uc3QgU3RyaW5nJik7CisgICAgdm9pZCBzd2l0Y2hU b0Jyb3dzaW5nQ29udGV4dChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIGNsb3NlVG9wTGV2ZWxC cm93c2luZ0NvbnRleHQoY29uc3QgU3RyaW5nJiB0b3BsZXZlbEJyb3dzaW5nQ29udGV4dCwgRnVu Y3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CiAgICAgdm9pZCBjbG9zZUFsbFRvcGxl dmVsQnJvd3NpbmdDb250ZXh0cyhjb25zdCBTdHJpbmcmIHRvcGxldmVsQnJvd3NpbmdDb250ZXh0 LCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmKTsKIAo=