189251 2018-09-03 16:42:57 -0700 Add helper function to create a potential CORS request 2018-09-04 10:13:02 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates aestes ddkilzer webkit-bug-importer youennf oldest_to_newest 1456232 0 dbates 2018-09-03 16:42:57 -0700 CachedResourceRequest::setAsPotentiallyCrossOrigin() mixes the concepts of CORS settings states (No CORS, Anonymous and Use Credentials) and module script credentials mode ("omit", "same-origin", and "include") into an algorithm that has a passing resemblance of the algorithm Create a potential-CORS request from the HTML standard: <https://html.spec.whatwg.org/multipage/urls-and-fetching.html#create-a-potential-cors-request> (31 August 2018). Although the standard describes a mapping between CORS settings states and module script credentials modes it is error prone and confusing for setAsPotentiallyCrossOrigin() to support both concepts, called a "cross origin mode", as input to it. We should separate these concepts and more closely implement the algorithm Create a potential-CORS request from the HTML standard. 1456238 1 348795 dbates 2018-09-03 16:56:40 -0700 Created attachment 348795 Patch 1456348 2 348795 dbates 2018-09-04 10:11:10 -0700 Comment on attachment 348795 Patch Clearing flags on attachment: 348795 Committed r235617: <https://trac.webkit.org/changeset/235617> 1456349 3 dbates 2018-09-04 10:11:11 -0700 All reviewed patches have been landed. Closing bug. 1456350 4 webkit-bug-importer 2018-09-04 10:13:02 -0700 <rdar://problem/44101478> 348795 2018-09-03 16:56:40 -0700 2018-09-04 10:11:10 -0700 Patch bug-189251-20180903165639.patch text/plain 18112 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZhZWU4NDEzNDFhOWFh ZmUxZWQ4OWRjNzIyMDAzNmUzOTdlYzRlZi4uYTI4NGQ4MWRlMThmODA4NjU5Y2EyNjYwMmIxMjgx MTg1NzFmMjVkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE4LTA5LTAzICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgaGVscGVyIGZ1bmN0 aW9uIHRvIGNyZWF0ZSBhIHBvdGVudGlhbCBDT1JTIHJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTI1MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5ldyBmdW5jdGlvbiwgY3JlYXRl UG90ZW50aWFsQWNjZXNzQ29udHJvbFJlcXVlc3QsIHRoYXQgd2Ugd2lsbCB1c2UgdG8gaW1wbGVt ZW50IHRoZSBhbGdvcml0aG0gQ3JlYXRlIGEgcG90ZW50aWFsLQorICAgICAgICBDT1JTIHJlcXVl c3QgZnJvbSB0aGUgSFRNTCBzdGFuZGFyZDogPGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcv bXVsdGlwYWdlL3VybHMtYW5kLWZldGNoaW5nLmh0bWwjY3JlYXRlLWEtcG90ZW50aWFsLWNvcnMt cmVxdWVzdD4gKDMxIEF1Z3VzdCAyMDE4KS4KKyAgICAgICAgVGhpcyBmdW5jdGlvbiByZXBsYWNl cyBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbigpIGFu ZCBpcyB0aGUgZmlyc3Qgc3RlcCB0b3dhcmRzIHNlcGFyYXRpbmcKKyAgICAgICAgdGhlIGNvbmNl cHRzIG9mIENPUlMgc2V0dGluZ3Mgc3RhdGVzIGFuZCBtb2R1bGUgc2NyaXB0IGNyZWRlbnRpYWxz IG1vZGUgYXMgd2VsbCBhcyBpbXBsZW1lbnRpbmcgdGhlIGFmb3JlbWVudGlvbmVkCisgICAgICAg IGFsZ29yaXRobS4gUmVuYW1lIENhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0QXNQb3RlbnRpYWxs eUNyb3NzT3JpZ2luKCkgdG8gZGVwcmVjYXRlZFNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbigp CisgICAgICAgIGFuZCBzd2l0Y2ggZXhpc3RpbmcgY2FsbGVycyB0byB1c2UgY3JlYXRlUG90ZW50 aWFsQWNjZXNzQ29udHJvbFJlcXVlc3QoKS4gRm9yIG5vdywgY3JlYXRlUG90ZW50aWFsQWNjZXNz Q29udHJvbFJlcXVlc3QoKQorICAgICAgICBpcyBpbXBsZW1lbnRlZCBpbiB0ZXJtcyBvZiBkZXBy ZWNhdGVkU2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKCkuCisKKyAgICAgICAgTm8gZnVuY3Rp b25hbGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogYmluZGluZ3Mv anMvQ2FjaGVkU2NyaXB0RmV0Y2hlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRTY3Jp cHRGZXRjaGVyOjpyZXF1ZXN0U2NyaXB0V2l0aENhY2hlIGNvbnN0KTogV3JpdGUgaW4gdGVybXMg b2YgV2ViQ29yZTo6Y3JlYXRlUG90ZW50aWFsQWNjZXNzQ29udHJvbFJlcXVlc3QoKS4KKyAgICAg ICAgKiBodG1sL0hUTUxMaW5rRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTGlu a0VsZW1lbnQ6OnByb2Nlc3MpOiBEaXR0by4KKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUmVz b3VyY2VQcmVsb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHJlbG9hZFJlcXVlc3Q6OnJl c291cmNlUmVxdWVzdCk6IERpdHRvLgorICAgICAgICAqIGxvYWRlci9Dcm9zc09yaWdpbkFjY2Vz c0NvbnRyb2wuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlUG90ZW50aWFsQWNjZXNzQ29u dHJvbFJlcXVlc3QpOiBGb3Igbm93LCBpbXBsZW1lbnRlZCBpbiB0ZXJtcyBvZiBDYWNoZWRSZXNv dXJjZVJlcXVlc3Q6OmRlcHJlY2F0ZWRTZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4oKS4KKyAg ICAgICAgKiBsb2FkZXIvQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9sLmg6CisgICAgICAgICogbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjp1cGRh dGVGcm9tRWxlbWVudCk6IFdyaXRlIGluIHRlcm1zIG9mIFdlYkNvcmU6OmNyZWF0ZVBvdGVudGlh bEFjY2Vzc0NvbnRyb2xSZXF1ZXN0KCkuCisgICAgICAgICogbG9hZGVyL0xpbmtMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGlua0xvYWRlcjo6cHJlbG9hZElmTmVlZGVkKTogRGl0dG8u CisgICAgICAgICogbG9hZGVyL01lZGlhUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKTogRGl0dG8uIEFsc28g cmVuYW1lZCBsb2NhbCB2YXJpYWJsZSBjYWNoZVJlcXVlc3QgdG8gY2FjaGVkUmVxdWVzdC4KKyAg ICAgICAgKiBsb2FkZXIvVGV4dFRyYWNrTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRl eHRUcmFja0xvYWRlcjo6bG9hZCk6IFdyaXRlIGluIHRlcm1zIG9mIFdlYkNvcmU6OmNyZWF0ZVBv dGVudGlhbEFjY2Vzc0NvbnRyb2xSZXF1ZXN0KCkuIEFsc28gY2hhbmdlIGxvY2FsIHZhcmlhYmxl CisgICAgICAgIGRvY3VtZW50IGZyb20gYSBwb2ludGVyIHRvIGEgcmVmZXJlbmNlIHNpbmNlIHRo aXMgZnVuY3Rpb24gYXNzZXJ0cyB0aGF0IHRoZSBzY3JpcHQgZXhlY3V0aW9uIGNvbnRleHQgaXMg YSBub24tbnVsbCBEb2N1bWVudC4KKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6 ZGVwcmVjYXRlZFNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbik6IFJlbmFtZWQ7IGZvcm1lcmx5 IG5hbWVkIHNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbi4KKyAgICAgICAgKFdlYkNvcmU6OkNh Y2hlZFJlc291cmNlUmVxdWVzdDo6c2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKTogRGVsZXRl ZC4KKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAg ICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OnNldFByaW9yaXR5KTogQWRkZWQu CisKIDIwMTgtMDgtMjIgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIEhUTUx7SW1hZ2UsIExpbmssIFNjcmlwdH1FbGVtZW50Ojpjcm9zc09yaWdpbigpIHNob3Vs ZCByZXR1cm4gYW4gQXRvbWljU3RyaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9DYWNoZWRTY3JpcHRGZXRjaGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0NhY2hlZFNjcmlwdEZldGNoZXIuY3BwCmluZGV4IGZlMmVlYWM0N2YyOTk4OTEwMjBiOWQ3 Njk0YmVkYjQ0YmQ2MmIyMGEuLjdjODdiMjM5MzhlNDMzZTUwOGMwZmI4MGJlOWM5ZTZmZGUzODIx MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0NhY2hlZFNjcmlwdEZl dGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0NhY2hlZFNjcmlwdEZl dGNoZXIuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuaCIKICNpbmNsdWRlICJDYWNoZWRTY3JpcHQuaCIKICNpbmNsdWRlICJDb250ZW50U2VjdXJp dHlQb2xpY3kuaCIKKyNpbmNsdWRlICJDcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuaCIKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKQEAgLTU2LDE0ICs1Nywx MSBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRTY3JpcHQ+IENhY2hlZFNjcmlwdEZldGNo ZXI6OnJlcXVlc3RTY3JpcHRXaXRoQ2FjaGUoRAogICAgIG9wdGlvbnMuc2FtZU9yaWdpbkRhdGFV UkxGbGFnID0gU2FtZU9yaWdpbkRhdGFVUkxGbGFnOjpTZXQ7CiAgICAgb3B0aW9ucy5pbnRlZ3Jp dHkgPSBXVEZNb3ZlKGludGVncml0eSk7CiAKLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgcmVx dWVzdChSZXNvdXJjZVJlcXVlc3Qoc291cmNlVVJMKSwgb3B0aW9ucyk7Ci0gICAgcmVxdWVzdC5z ZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4oY3Jvc3NPcmlnaW5Nb2RlLCBkb2N1bWVudCk7Cisg ICAgYXV0byByZXF1ZXN0ID0gY3JlYXRlUG90ZW50aWFsQWNjZXNzQ29udHJvbFJlcXVlc3Qoc291 cmNlVVJMLCBkb2N1bWVudCwgY3Jvc3NPcmlnaW5Nb2RlLCBXVEZNb3ZlKG9wdGlvbnMpKTsKICAg ICByZXF1ZXN0LnVwZ3JhZGVJbnNlY3VyZVJlcXVlc3RJZk5lZWRlZChkb2N1bWVudCk7Ci0KICAg ICByZXF1ZXN0LnNldENoYXJzZXQobV9jaGFyc2V0KTsKICAgICBpZiAoIW1faW5pdGlhdG9yTmFt ZS5pc051bGwoKSkKICAgICAgICAgcmVxdWVzdC5zZXRJbml0aWF0b3IobV9pbml0aWF0b3JOYW1l KTsKLQogICAgIHJldHVybiBkb2N1bWVudC5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLnJlcXVlc3RT Y3JpcHQoV1RGTW92ZShyZXF1ZXN0KSkudmFsdWVfb3IobnVsbHB0cik7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTExpbmtFbGVtZW50LmNwcAppbmRleCAxNTZlNWIyYjEwNDM1MzEyNjEwOTVm M2U2OWFhNWRmZGRlYzc4ZWM0Li44Njc3MzA4YmNkYjIyODU5OTY3MGIwNzI4NWZlNTAxY2FlNWQ5 M2U2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxMaW5rRWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTGlua0VsZW1lbnQuY3BwCkBAIC0zMSw2ICsz MSw3IEBACiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCIKICNpbmNsdWRlICJDYWNo ZWRSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJDb250ZW50U2VjdXJpdHlQb2xpY3kuaCIK KyNpbmNsdWRlICJDcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuaCIKICNpbmNsdWRlICJET01Ub2tl bkxpc3QuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50LmgiCkBAIC0z MTQsOSArMzE1LDExIEBAIHZvaWQgSFRNTExpbmtFbGVtZW50Ojpwcm9jZXNzKCkKICAgICAgICAg aWYgKGRvY3VtZW50KCkuY29udGVudFNlY3VyaXR5UG9saWN5KCktPmFsbG93U3R5bGVXaXRoTm9u Y2UoYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6Om5vbmNlQXR0cikp KQogICAgICAgICAgICAgb3B0aW9ucy5jb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uID0g Q29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbjo6U2tpcFBvbGljeUNoZWNrOwogICAgICAg ICBvcHRpb25zLmludGVncml0eSA9IG1faW50ZWdyaXR5TWV0YWRhdGFGb3JQZW5kaW5nU2hlZXRS ZXF1ZXN0OwotICAgICAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCh1cmwsIG9wdGlv bnMsIHByaW9yaXR5LCBXVEZNb3ZlKGNoYXJzZXQpKTsKKworICAgICAgICBhdXRvIHJlcXVlc3Qg PSBjcmVhdGVQb3RlbnRpYWxBY2Nlc3NDb250cm9sUmVxdWVzdChXVEZNb3ZlKHVybCksIGRvY3Vt ZW50KCksIGNyb3NzT3JpZ2luKCksIFdURk1vdmUob3B0aW9ucykpOworICAgICAgICByZXF1ZXN0 LnNldFByaW9yaXR5KFdURk1vdmUocHJpb3JpdHkpKTsKKyAgICAgICAgcmVxdWVzdC5zZXRDaGFy c2V0KFdURk1vdmUoY2hhcnNldCkpOwogICAgICAgICByZXF1ZXN0LnNldEluaXRpYXRvcigqdGhp cyk7Ci0gICAgICAgIHJlcXVlc3Quc2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKGNyb3NzT3Jp Z2luKCksIGRvY3VtZW50KCkpOwogCiAgICAgICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJ Q0FUSU9OKCFtX2NhY2hlZFNoZWV0KTsKICAgICAgICAgbV9jYWNoZWRTaGVldCA9IGRvY3VtZW50 KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5yZXF1ZXN0Q1NTU3R5bGVTaGVldChXVEZNb3ZlKHJl cXVlc3QpKS52YWx1ZV9vcihudWxscHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxSZXNvdXJjZVByZWxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MUmVzb3VyY2VQcmVsb2FkZXIuY3BwCmluZGV4IDcyMjFhOGIzNzQ3OWY5ZWI3 NTQ3NGU3YWZjNDE2MWU2MjliNTBmZjguLjNkMDA2YWIwNGJmNTI4NzY0ZjlmMGM4NDRhYmY0NmUw ZDYzNjMxZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxSZXNv dXJjZVByZWxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFJl c291cmNlUHJlbG9hZGVyLmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIkhUTUxSZXNv dXJjZVByZWxvYWRlci5oIgogCiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCIKKyNp bmNsdWRlICJDcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuaCIKICNpbmNsdWRlICJEb2N1bWVudC5o IgogCiAjaW5jbHVkZSAiTWVkaWFRdWVyeUV2YWx1YXRvci5oIgpAQCAtNTMsMTQgKzU0LDEzIEBA IENhY2hlZFJlc291cmNlUmVxdWVzdCBQcmVsb2FkUmVxdWVzdDo6cmVzb3VyY2VSZXF1ZXN0KERv Y3VtZW50JiBkb2N1bWVudCkKICAgICBpZiAoc2tpcENvbnRlbnRTZWN1cml0eVBvbGljeUNoZWNr KQogICAgICAgICBvcHRpb25zLmNvbnRlbnRTZWN1cml0eVBvbGljeUltcG9zaXRpb24gPSBDb250 ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpTa2lwUG9saWN5Q2hlY2s7CiAKLSAgICBDYWNo ZWRSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCB7IGNvbXBsZXRlVVJMKGRvY3VtZW50KSwgb3B0aW9u cyB9OwotICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKG1faW5pdGlhdG9yKTsKICAgICBTdHJpbmcg Y3Jvc3NPcmlnaW5Nb2RlID0gbV9jcm9zc09yaWdpbk1vZGU7CiAgICAgaWYgKG1fbW9kdWxlU2Ny aXB0ID09IE1vZHVsZVNjcmlwdDo6WWVzKSB7CiAgICAgICAgIGlmIChjcm9zc09yaWdpbk1vZGUu aXNOdWxsKCkpCiAgICAgICAgICAgICBjcm9zc09yaWdpbk1vZGUgPSAib21pdCJfczsKICAgICB9 Ci0gICAgcmVxdWVzdC5zZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4oY3Jvc3NPcmlnaW5Nb2Rl LCBkb2N1bWVudCk7CisgICAgYXV0byByZXF1ZXN0ID0gY3JlYXRlUG90ZW50aWFsQWNjZXNzQ29u dHJvbFJlcXVlc3QoY29tcGxldGVVUkwoZG9jdW1lbnQpLCBkb2N1bWVudCwgY3Jvc3NPcmlnaW5N b2RlLCBXVEZNb3ZlKG9wdGlvbnMpKTsKKyAgICByZXF1ZXN0LnNldEluaXRpYXRvcihtX2luaXRp YXRvcik7CiAgICAgcmV0dXJuIHJlcXVlc3Q7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Dcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0Nyb3NzT3JpZ2luQWNjZXNzQ29udHJvbC5jcHAKaW5kZXggNjkwODI3NjJiYjc4NzAy OTA2OWI3YTRkYTI4ZWUxMTIzZTBhMWE1Yi4uMGQyNmExZmFhYzE4MzU3NDA0M2ZhYTdiNGE5ZWM2 ZDExMTgwYjgxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nyb3NzT3JpZ2lu QWNjZXNzQ29udHJvbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nyb3NzT3JpZ2lu QWNjZXNzQ29udHJvbC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJDcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuaCIKIAorI2luY2x1ZGUgIkNhY2hl ZFJlc291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgIkNyb3NzT3JpZ2luUHJlZmxpZ2h0UmVzdWx0 Q2FjaGUuaCIKICNpbmNsdWRlICJIVFRQSGVhZGVyTmFtZXMuaCIKICNpbmNsdWRlICJIVFRQUGFy c2Vycy5oIgpAQCAtMTE3LDYgKzExOCwxNSBAQCBSZXNvdXJjZVJlcXVlc3QgY3JlYXRlQWNjZXNz Q29udHJvbFByZWZsaWdodFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZQogICAg IHJldHVybiBwcmVmbGlnaHRSZXF1ZXN0OwogfQogCitDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY3Jl YXRlUG90ZW50aWFsQWNjZXNzQ29udHJvbFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVz dCwgRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBTdHJpbmcmIGNyb3NzT3JpZ2luQXR0cmlidXRl LCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmJiBvcHRpb25zKQoreworICAgIC8vIEZJWE1FOiBUaGlz IGRvZXMgbm90IG1hdGNoIHRoZSBhbGdvcml0aG0gImNyZWF0ZSBhIHBvdGVudGlhbC1DT1JTIHJl cXVlc3QiOgorICAgIC8vIDxodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS91 cmxzLWFuZC1mZXRjaGluZy5odG1sI2NyZWF0ZS1hLXBvdGVudGlhbC1jb3JzLXJlcXVlc3Q+ICgz MSBBdWd1c3QgMjAxOCkuCisgICAgYXV0byBjYWNoZWRSZXF1ZXN0ID0gQ2FjaGVkUmVzb3VyY2VS ZXF1ZXN0IHsgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShvcHRpb25zKSB9OworICAgIGNhY2hl ZFJlcXVlc3QuZGVwcmVjYXRlZFNldEFzUG90ZW50aWFsbHlDcm9zc09yaWdpbihjcm9zc09yaWdp bkF0dHJpYnV0ZSwgZG9jdW1lbnQpOworICAgIHJldHVybiBjYWNoZWRSZXF1ZXN0OworfQorCiBi b29sIGlzVmFsaWRDcm9zc09yaWdpblJlZGlyZWN0aW9uVVJMKGNvbnN0IFVSTCYgcmVkaXJlY3RV UkwpCiB7CiAgICAgcmV0dXJuIFNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFz Q09SU0VuYWJsZWQocmVkaXJlY3RVUkwucHJvdG9jb2woKS50b1N0cmluZ1dpdGhvdXRDb3B5aW5n KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmlnaW5BY2Nlc3ND b250cm9sLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9s LmgKaW5kZXggMmM2NzU0YjEwZjYyZTgxN2NjZTc2OWFhNTNlOGQ1YjYwYjEzMTAxZi4uZDJiMDli ZDVkYjU2NzZjMDFhYmY4MjNkM2YwNzIyYTc3MGVhNTQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0Nyb3NzT3JpZ2luQWNjZXNzQ29udHJvbC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Dcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuaApAQCAtMzMsNiArMzMsOCBAQAog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIENhY2hlZFJlc291cmNlUmVxdWVzdDsKK2Ns YXNzIERvY3VtZW50OwogY2xhc3MgSFRUUEhlYWRlck1hcDsKIGNsYXNzIFJlc291cmNlRXJyb3I7 CiBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CkBAIC00MCwxMyArNDIsMTcgQEAgY2xhc3MgUmVzb3Vy Y2VSZXNwb25zZTsKIGNsYXNzIFNlY3VyaXR5T3JpZ2luOwogY2xhc3MgVVJMOwogCitzdHJ1Y3Qg UmVzb3VyY2VMb2FkZXJPcHRpb25zOworCiBXRUJDT1JFX0VYUE9SVCBib29sIGlzU2ltcGxlQ3Jv c3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KGNvbnN0IFN0cmluZyYgbWV0aG9kLCBjb25zdCBIVFRQSGVh ZGVyTWFwJik7CiBib29sIGlzT25BY2Nlc3NDb250cm9sU2ltcGxlUmVxdWVzdE1ldGhvZFdoaXRl bGlzdChjb25zdCBTdHJpbmcmKTsKIAogdm9pZCB1cGRhdGVSZXF1ZXN0UmVmZXJyZXIoUmVzb3Vy Y2VSZXF1ZXN0JiwgUmVmZXJyZXJQb2xpY3ksIGNvbnN0IFN0cmluZyYpOwogICAgIAogV0VCQ09S RV9FWFBPUlQgdm9pZCB1cGRhdGVSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbChSZXNvdXJjZVJlcXVl c3QmLCBTZWN1cml0eU9yaWdpbiYsIFN0b3JlZENyZWRlbnRpYWxzUG9saWN5KTsKKwogV0VCQ09S RV9FWFBPUlQgUmVzb3VyY2VSZXF1ZXN0IGNyZWF0ZUFjY2Vzc0NvbnRyb2xQcmVmbGlnaHRSZXF1 ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFNlY3VyaXR5T3JpZ2luJiwgY29uc3QgU3RyaW5n Jik7CitDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY3JlYXRlUG90ZW50aWFsQWNjZXNzQ29udHJvbFJl cXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYsIERvY3VtZW50JiwgY29uc3QgU3RyaW5nJiBjcm9zc09y aWdpbkF0dHJpYnV0ZSwgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiYpOwogCiBib29sIGlzVmFsaWRD cm9zc09yaWdpblJlZGlyZWN0aW9uVVJMKGNvbnN0IFVSTCYpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ltYWdlTG9hZGVyLmNwcAppbmRleCAzYzQ5OWFhNzE4Y2I2ODRjNzY2NTllMjIzZjMwNGQ3NWZi ODY1MzJkLi41YzI4ZjgyNjEzMzU4NThmMjhhN2ZlMjliYmUyZDZlYjI2MDMxNGMyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAKQEAgLTE3OCwxMSArMTc4LDEwIEBAIHZvaWQg SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKICAgICAgICAgb3B0aW9ucy5jb250ZW50 U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uID0gZWxlbWVudCgpLmlzSW5Vc2VyQWdlbnRTaGFkb3dU cmVlKCkgPyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpTa2lwUG9saWN5Q2hlY2sg OiBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrOwogICAgICAg ICBvcHRpb25zLnNhbWVPcmlnaW5EYXRhVVJMRmxhZyA9IFNhbWVPcmlnaW5EYXRhVVJMRmxhZzo6 U2V0OwogCi0gICAgICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVx dWVzdChkb2N1bWVudC5jb21wbGV0ZVVSTChzb3VyY2VVUkkoYXR0cikpKSwgb3B0aW9ucyk7Cisg ICAgICAgIGF1dG8gY3Jvc3NPcmlnaW5BdHRyaWJ1dGUgPSBlbGVtZW50KCkuYXR0cmlidXRlV2l0 aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OmNyb3Nzb3JpZ2luQXR0cik7CisgICAgICAg IGF1dG8gcmVxdWVzdCA9IGNyZWF0ZVBvdGVudGlhbEFjY2Vzc0NvbnRyb2xSZXF1ZXN0KGRvY3Vt ZW50LmNvbXBsZXRlVVJMKHNvdXJjZVVSSShhdHRyKSksIGRvY3VtZW50LCBjcm9zc09yaWdpbkF0 dHJpYnV0ZSwgV1RGTW92ZShvcHRpb25zKSk7CiAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9y KGVsZW1lbnQoKSk7CiAKLSAgICAgICAgcmVxdWVzdC5zZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmln aW4oZWxlbWVudCgpLmF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjpj cm9zc29yaWdpbkF0dHIpLCBkb2N1bWVudCk7Ci0KICAgICAgICAgaWYgKG1fbG9hZE1hbnVhbGx5 KSB7CiAgICAgICAgICAgICBib29sIGF1dG9Mb2FkT3RoZXJJbWFnZXMgPSBkb2N1bWVudC5jYWNo ZWRSZXNvdXJjZUxvYWRlcigpLmF1dG9Mb2FkSW1hZ2VzKCk7CiAgICAgICAgICAgICBkb2N1bWVu dC5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLnNldEF1dG9Mb2FkSW1hZ2VzKGZhbHNlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9MaW5rTG9hZGVyLmNwcAppbmRleCBiOTM1ZDIyNDExOTk3MTlmNDliNDlmYzdh M2Y2YjM1MzI0MDAzMjU3Li5iZTVkYjRkN2U2YjFmN2U4MDA0MmJiZDIxYmEyNzM5NWNjMWI5MjVj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTGlua0xvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0xpbmtMb2FkZXIuY3BwCkBAIC0yNDYsMTIgKzI0NiwxMyBA QCBzdGQ6OnVuaXF1ZV9wdHI8TGlua1ByZWxvYWRSZXNvdXJjZUNsaWVudD4gTGlua0xvYWRlcjo6 cHJlbG9hZElmTmVlZGVkKGNvbnN0IExpbgogICAgIGlmICghaXNTdXBwb3J0ZWRUeXBlKHR5cGUu dmFsdWUoKSwgbWltZVR5cGUpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIENhY2hl ZFJlc291cmNlUmVxdWVzdCBsaW5rUmVxdWVzdChkb2N1bWVudC5jb21wbGV0ZVVSTChocmVmKSwg Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRlZmF1bHRDYWNoZWRSZXNvdXJjZU9wdGlvbnMoKSwgQ2Fj aGVkUmVzb3VyY2U6OmRlZmF1bHRQcmlvcml0eUZvclJlc291cmNlVHlwZSh0eXBlLnZhbHVlKCkp KTsKKyAgICBhdXRvIG9wdGlvbnMgPSBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6ZGVmYXVsdENhY2hl ZFJlc291cmNlT3B0aW9ucygpOworICAgIGF1dG8gbGlua1JlcXVlc3QgPSBjcmVhdGVQb3RlbnRp YWxBY2Nlc3NDb250cm9sUmVxdWVzdChkb2N1bWVudC5jb21wbGV0ZVVSTChocmVmKSwgZG9jdW1l bnQsIGNyb3NzT3JpZ2luTW9kZSwgV1RGTW92ZShvcHRpb25zKSk7CisgICAgbGlua1JlcXVlc3Qu c2V0UHJpb3JpdHkoQ2FjaGVkUmVzb3VyY2U6OmRlZmF1bHRQcmlvcml0eUZvclJlc291cmNlVHlw ZSh0eXBlLnZhbHVlKCkpKTsKICAgICBsaW5rUmVxdWVzdC5zZXRJbml0aWF0b3IoImxpbmsiKTsK ICAgICBsaW5rUmVxdWVzdC5zZXRJZ25vcmVGb3JSZXF1ZXN0Q291bnQodHJ1ZSk7CiAgICAgbGlu a1JlcXVlc3Quc2V0SXNMaW5rUHJlbG9hZCgpOwogCi0gICAgbGlua1JlcXVlc3Quc2V0QXNQb3Rl bnRpYWxseUNyb3NzT3JpZ2luKGNyb3NzT3JpZ2luTW9kZSwgZG9jdW1lbnQpOwogICAgIGF1dG8g Y2FjaGVkTGlua1Jlc291cmNlID0gZG9jdW1lbnQuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS5wcmVs b2FkKHR5cGUudmFsdWUoKSwgV1RGTW92ZShsaW5rUmVxdWVzdCkpLnZhbHVlX29yKG51bGxwdHIp OwogCiAgICAgaWYgKGNhY2hlZExpbmtSZXNvdXJjZSAmJiBjYWNoZWRMaW5rUmVzb3VyY2UtPnR5 cGUoKSAhPSAqdHlwZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJl c291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9h ZGVyLmNwcAppbmRleCA2NDM5Njc2ZmVkMjQ0NWE5NmNjYThlNThhMWFlYWMwNzhmNmE5YWNiLi5i MTE5MTMzYzhjODNiNmIxNDRhMzM0OTVmZGRmYjkzOWZmZjM0ZDcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvTWVkaWFSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL01lZGlhUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC05MCwxMiArOTAsMTEgQEAg UmVmUHRyPFBsYXRmb3JtTWVkaWFSZXNvdXJjZT4gTWVkaWFSZXNvdXJjZUxvYWRlcjo6cmVxdWVz dFJlc291cmNlKFJlc291cmNlUmVxdWUKICAgICAgICAgRGVmZXJzTG9hZGluZ1BvbGljeTo6QWxs b3dEZWZlcnNMb2FkaW5nLAogICAgICAgICBjYWNoaW5nUG9saWN5IH07CiAgICAgbG9hZGVyT3B0 aW9ucy5kZXN0aW5hdGlvbiA9IG1fbWVkaWFFbGVtZW50ICYmICFtX21lZGlhRWxlbWVudC0+aXNW aWRlbygpID8gRmV0Y2hPcHRpb25zOjpEZXN0aW5hdGlvbjo6QXVkaW8gOiBGZXRjaE9wdGlvbnM6 OkRlc3RpbmF0aW9uOjpWaWRlbzsKLSAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVSZXF1 ZXN0IHsgV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShsb2FkZXJPcHRpb25zKSB9OwotICAgIGNh Y2hlUmVxdWVzdC5zZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4obV9jcm9zc09yaWdpbk1vZGUs ICptX2RvY3VtZW50KTsKKyAgICBhdXRvIGNhY2hlZFJlcXVlc3QgPSBjcmVhdGVQb3RlbnRpYWxB Y2Nlc3NDb250cm9sUmVxdWVzdChXVEZNb3ZlKHJlcXVlc3QpLCAqbV9kb2N1bWVudCwgbV9jcm9z c09yaWdpbk1vZGUsIFdURk1vdmUobG9hZGVyT3B0aW9ucykpOwogICAgIGlmIChtX21lZGlhRWxl bWVudCkKLSAgICAgICAgY2FjaGVSZXF1ZXN0LnNldEluaXRpYXRvcigqbV9tZWRpYUVsZW1lbnQu Z2V0KCkpOworICAgICAgICBjYWNoZWRSZXF1ZXN0LnNldEluaXRpYXRvcigqbV9tZWRpYUVsZW1l bnQuZ2V0KCkpOwogCi0gICAgYXV0byByZXNvdXJjZSA9IG1fZG9jdW1lbnQtPmNhY2hlZFJlc291 cmNlTG9hZGVyKCkucmVxdWVzdE1lZGlhKFdURk1vdmUoY2FjaGVSZXF1ZXN0KSkudmFsdWVfb3Io bnVsbHB0cik7CisgICAgYXV0byByZXNvdXJjZSA9IG1fZG9jdW1lbnQtPmNhY2hlZFJlc291cmNl TG9hZGVyKCkucmVxdWVzdE1lZGlhKFdURk1vdmUoY2FjaGVkUmVxdWVzdCkpLnZhbHVlX29yKG51 bGxwdHIpOwogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGV4dFRyYWNrTG9hZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9UZXh0VHJhY2tMb2FkZXIuY3BwCmluZGV4IGZmMTQzNmQ4YzI4 ZmU3NWJkNzRhMzM3NGQ2YjVkNTY5MjI3ODgzODMuLmE3MmQwYjQzMzZiOGFhODI3OTZmZDJjNDdj OTA3YzZhNDUwNjg3NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UZXh0VHJh Y2tMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UZXh0VHJhY2tMb2FkZXIu Y3BwCkBAIC0xNDcsMjAgKzE0NywxNiBAQCBib29sIFRleHRUcmFja0xvYWRlcjo6bG9hZChjb25z dCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBjcm9zc09yaWdpbk1vZGUsIGJvb2wgaQogICAgIGNh bmNlbExvYWQoKTsKIAogICAgIEFTU0VSVChpczxEb2N1bWVudD4obV9zY3JpcHRFeGVjdXRpb25D b250ZXh0KSk7Ci0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZG93bmNhc3Q8RG9jdW1lbnQ+KG1f c2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAgRG9jdW1lbnQmIGRvY3VtZW50ID0gZG93bmNh c3Q8RG9jdW1lbnQ+KCptX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOwogCiAgICAgUmVzb3VyY2VM b2FkZXJPcHRpb25zIG9wdGlvbnMgPSBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6ZGVmYXVsdENhY2hl ZFJlc291cmNlT3B0aW9ucygpOwogICAgIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9saWN5SW1w b3NpdGlvbiA9IGlzSW5pdGlhdGluZ0VsZW1lbnRJblVzZXJBZ2VudFNoYWRvd1RyZWUgPyBDb250 ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpTa2lwUG9saWN5Q2hlY2sgOiBDb250ZW50U2Vj dXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrOwogCi0gICAgQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0IGN1ZVJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KGRvY3VtZW50LT5jb21wbGV0ZVVS TCh1cmwpKSwgb3B0aW9ucyk7Ci0gICAgY3VlUmVxdWVzdC5zZXRBc1BvdGVudGlhbGx5Q3Jvc3NP cmlnaW4oY3Jvc3NPcmlnaW5Nb2RlLCAqZG9jdW1lbnQpOwotCi0gICAgbV9yZXNvdXJjZSA9IGRv Y3VtZW50LT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLnJlcXVlc3RUZXh0VHJhY2soV1RGTW92ZShj dWVSZXF1ZXN0KSkudmFsdWVfb3IobnVsbHB0cik7CisgICAgYXV0byBjdWVSZXF1ZXN0ID0gY3Jl YXRlUG90ZW50aWFsQWNjZXNzQ29udHJvbFJlcXVlc3QoZG9jdW1lbnQuY29tcGxldGVVUkwodXJs KSwgZG9jdW1lbnQsIGNyb3NzT3JpZ2luTW9kZSwgV1RGTW92ZShvcHRpb25zKSk7CisgICAgbV9y ZXNvdXJjZSA9IGRvY3VtZW50LmNhY2hlZFJlc291cmNlTG9hZGVyKCkucmVxdWVzdFRleHRUcmFj ayhXVEZNb3ZlKGN1ZVJlcXVlc3QpKS52YWx1ZV9vcihudWxscHRyKTsKICAgICBpZiAoIW1fcmVz b3VyY2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIG1fcmVzb3VyY2UtPmFkZENsaWVu dCgqdGhpcyk7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAppbmRleCBkOGRkYzMx Y2MwOTM1NmU0NjZkOGM2NjA3ZDM2Njg0NDVjNGRjM2Y3Li43MjBlYWQxOTdlYzk5ZjM1MzM4Mjc1 MWYxZmI1Y2ZkZTU5YzhmZmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcApAQCAtODUsNyArODUsNyBAQCBjb25zdCBB dG9taWNTdHJpbmcmIENhY2hlZFJlc291cmNlUmVxdWVzdDo6aW5pdGlhdG9yTmFtZSgpIGNvbnN0 CiAgICAgcmV0dXJuIGRlZmF1bHROYW1lOwogfQogCi12b2lkIENhY2hlZFJlc291cmNlUmVxdWVz dDo6c2V0QXNQb3RlbnRpYWxseUNyb3NzT3JpZ2luKGNvbnN0IFN0cmluZyYgbW9kZSwgRG9jdW1l bnQmIGRvY3VtZW50KQordm9pZCBDYWNoZWRSZXNvdXJjZVJlcXVlc3Q6OmRlcHJlY2F0ZWRTZXRB c1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4oY29uc3QgU3RyaW5nJiBtb2RlLCBEb2N1bWVudCYgZG9j dW1lbnQpCiB7CiAgICAgQVNTRVJUKG1fb3B0aW9ucy5tb2RlID09IEZldGNoT3B0aW9uczo6TW9k ZTo6Tm9Db3JzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZFJlc291cmNlUmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlUmVxdWVzdC5oCmluZGV4IGNiMzdkMGM1ZjI3ODQ3NjEyNmExYjNiNDQ2NmZkZWQ2 ZDg2YzM3YzcuLjg5Y2NhNjliYzcxZWY0MmU4ZmI2ZDU0MmQwNmUwNDM3ODQ0ZTUwMDYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0 LmgKQEAgLTU1LDE0ICs1NSwyMCBAQCBwdWJsaWM6CiAgICAgUmVzb3VyY2VSZXF1ZXN0JiYgcmVs ZWFzZVJlc291cmNlUmVxdWVzdCgpIHsgcmV0dXJuIFdURk1vdmUobV9yZXNvdXJjZVJlcXVlc3Qp OyB9CiAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QoKSBjb25zdCB7 IHJldHVybiBtX3Jlc291cmNlUmVxdWVzdDsgfQogICAgIFJlc291cmNlUmVxdWVzdCYgcmVzb3Vy Y2VSZXF1ZXN0KCkgeyByZXR1cm4gbV9yZXNvdXJjZVJlcXVlc3Q7IH0KKwogICAgIGNvbnN0IFN0 cmluZyYgY2hhcnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fY2hhcnNldDsgfQogICAgIHZvaWQgc2V0 Q2hhcnNldChjb25zdCBTdHJpbmcmIGNoYXJzZXQpIHsgbV9jaGFyc2V0ID0gY2hhcnNldDsgfQor CiAgICAgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiBvcHRpb25zKCkgY29uc3QgeyByZXR1 cm4gbV9vcHRpb25zOyB9CiAgICAgdm9pZCBzZXRPcHRpb25zKGNvbnN0IFJlc291cmNlTG9hZGVy T3B0aW9ucyYgb3B0aW9ucykgeyBtX29wdGlvbnMgPSBvcHRpb25zOyB9CisKICAgICBjb25zdCBz dGQ6Om9wdGlvbmFsPFJlc291cmNlTG9hZFByaW9yaXR5PiYgcHJpb3JpdHkoKSBjb25zdCB7IHJl dHVybiBtX3ByaW9yaXR5OyB9CisgICAgdm9pZCBzZXRQcmlvcml0eShzdGQ6Om9wdGlvbmFsPFJl c291cmNlTG9hZFByaW9yaXR5PiYmIHByaW9yaXR5KSB7IG1fcHJpb3JpdHkgPSBXVEZNb3ZlKHBy aW9yaXR5KTsgfQorCiAgICAgdm9pZCBzZXRJbml0aWF0b3IoRWxlbWVudCYpOwogICAgIHZvaWQg c2V0SW5pdGlhdG9yKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSk7CiAgICAgY29uc3QgQXRvbWlj U3RyaW5nJiBpbml0aWF0b3JOYW1lKCkgY29uc3Q7CisKICAgICBib29sIGFsbG93c0NhY2hpbmco KSBjb25zdCB7IHJldHVybiBtX29wdGlvbnMuY2FjaGluZ1BvbGljeSA9PSBDYWNoaW5nUG9saWN5 OjpBbGxvd0NhY2hpbmc7IH0KICAgICB2b2lkIHNldENhY2hpbmdQb2xpY3koQ2FjaGluZ1BvbGlj eSBwb2xpY3kpIHsgbV9vcHRpb25zLmNhY2hpbmdQb2xpY3kgPSBwb2xpY3k7ICB9CiAKQEAgLTcy LDcgKzc4LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXREZXN0aW5hdGlvbklmTm90U2V0KEZl dGNoT3B0aW9uczo6RGVzdGluYXRpb24pOwogCi0gICAgdm9pZCBzZXRBc1BvdGVudGlhbGx5Q3Jv c3NPcmlnaW4oY29uc3QgU3RyaW5nJiwgRG9jdW1lbnQmKTsKKyAgICB2b2lkIGRlcHJlY2F0ZWRT ZXRBc1BvdGVudGlhbGx5Q3Jvc3NPcmlnaW4oY29uc3QgU3RyaW5nJiwgRG9jdW1lbnQmKTsgLy8g VXNlIFdlYkNvcmU6OmNyZWF0ZVBvdGVudGlhbEFjY2Vzc0NvbnRyb2xSZXF1ZXN0KCkgaW5zdGVh ZC4KKwogICAgIHZvaWQgdXBkYXRlRm9yQWNjZXNzQ29udHJvbChEb2N1bWVudCYpOwogCiAgICAg dm9pZCB1cGRhdGVSZWZlcnJlclBvbGljeShSZWZlcnJlclBvbGljeSk7Cg==