107789 2013-01-23 22:45:43 -0800 [V8] Pass an Isolate to GetTemplate() in v8/*.cpp 2013-01-24 14:59:29 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth webkit.review.bot oldest_to_newest 815097 0 haraken 2013-01-23 22:45:43 -0800 [V8] Pass an Isolate to GetTemplate() in v8/*.cpp. 815098 1 184406 haraken 2013-01-23 22:47:04 -0800 Created attachment 184406 Patch 815871 2 184406 webkit.review.bot 2013-01-24 14:59:26 -0800 Comment on attachment 184406 Patch Clearing flags on attachment: 184406 Committed r140729: <http://trac.webkit.org/changeset/140729> 815872 3 webkit.review.bot 2013-01-24 14:59:29 -0800 All reviewed patches have been landed. Closing bug. 184406 2013-01-23 22:47:04 -0800 2013-01-24 14:59:26 -0800 Patch bug-107789-20130124154356.patch text/plain 22916 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjljNDBjMzhlN2I5ZGIz NDA2M2Q3YjUxNjg1NzBkNTBhMDI0NzVlZC4uZmMxZGI3ZDM5M2E2MzgxNmM1NjU0ZGI1N2YwOWNm MzgyYjE4NDc0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDEzLTAxLTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgYW4g SXNvbGF0ZSB0byBHZXRUZW1wbGF0ZSgpIGluIHY4LyouY3BwCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc3ODkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2 aW9yLgorCisgICAgICAgICogYmluZGluZ3MvdjgvRGljdGlvbmFyeS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEaWN0aW9uYXJ5OjpnZXQpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1BhZ2VTY3Jp cHREZWJ1Z1NlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZXRyaWV2ZUZyYW1lV2l0aEds b2JhbE9iamVjdENoZWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6dG9ET01XaW5kb3cpOgorICAgICAgICAoV2ViQ29yZTo6dG9TY3Jp cHRFeGVjdXRpb25Db250ZXh0KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERPTVdpbmRvd1No ZWxsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93U2hlbGw6OmNsZWFyRm9yTmF2 aWdhdGlvbik6CisgICAgICAgICogYmluZGluZ3MvdjgvVjhJbml0aWFsaXplci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpmaW5kRnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6ZmFpbGVkQWNjZXNz Q2hlY2tDYWxsYmFja0luTWFpblRocmVhZCk6CisgICAgICAgICogYmluZGluZ3MvdjgvV29ya2Vy U2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250 cm9sbGVyOjpjb250cm9sbGVyRm9yQ29udGV4dCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3Vz dG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93 OjpldmVudEFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93Ojpl dmVudEFjY2Vzc29yU2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9NV2luZG93Ojp0b1N0 cmluZ0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnRvVjgpOgorICAgICAgICAqIGJpbmRp bmdzL3Y4L2N1c3RvbS9WOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpWOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rvcjo6R2V0VGVtcGxhdGUpOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0TWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVJbmplY3RlZFNjcmlwdEhvc3RWOFdyYXBwZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjpjcmVhdGVJbmplY3RlZFNj cmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmNhbkFjY2Vz c0luc3BlY3RlZFdpbmRvdyk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4TG9jYXRp b25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhMb2NhdGlvbjo6cmVsb2FkQWNjZXNz b3JHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhMb2NhdGlvbjo6cmVwbGFjZUFjY2Vzc29y R2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlY4TG9jYXRpb246OmFzc2lnbkFjY2Vzc29yR2V0 dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhNZXNzYWdlRXZlbnQ6OmluaXRNZXNzYWdlRXZlbnRD YWxsYmFjayk6CisKIDIwMTMtMDEtMjMgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIEFkZCBmb3JtLXJlbGF0ZWQgaW5zdHJ1bWVudGF0aW9ucywgYW5kIHN1cHBv cnQgMzMrIGZlYXR1cmVzIGluIEZlYXR1cmVPYnNlcnZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvRGljdGlvbmFyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9EaWN0aW9uYXJ5LmNwcAppbmRleCA3OTM2Yjg3MjFhNWYzYjFiMGEzMTgyMTdjYmIyZmVl NDAzNmMwOTlkLi5hYzk4M2IzYzcwY2VlM2ZhNjUyZWJmMDdjN2ZlNDRlOWQ3NTdjNDVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EaWN0aW9uYXJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9EaWN0aW9uYXJ5LmNwcApAQCAtMjU2LDcgKzI1Niw3 IEBAIGJvb2wgRGljdGlvbmFyeTo6Z2V0KGNvbnN0IFN0cmluZyYga2V5LCBSZWZQdHI8RE9NV2lu ZG93PiYgdmFsdWUpIGNvbnN0CiAgICAgRE9NV2luZG93KiBzb3VyY2UgPSAwOwogICAgIGlmICh2 OFZhbHVlLT5Jc09iamVjdCgpKSB7CiAgICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3Jh cHBlciA9IHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QodjhWYWx1ZSk7Ci0gICAgICAgIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4gd2luZG93ID0gd3JhcHBlci0+RmluZEluc3RhbmNlSW5Qcm90 b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUoKSk7CisgICAgICAgIHY4OjpIYW5k bGU8djg6Ok9iamVjdD4gd2luZG93ID0gd3JhcHBlci0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVD aGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUobV9pc29sYXRlKSk7CiAgICAgICAgIGlmICgh d2luZG93LklzRW1wdHkoKSkKICAgICAgICAgICAgIHNvdXJjZSA9IFY4RE9NV2luZG93Ojp0b05h dGl2ZSh3aW5kb3cpOwogICAgIH0KQEAgLTI3Myw3ICsyNzMsNyBAQCBib29sIERpY3Rpb25hcnk6 OmdldChjb25zdCBTdHJpbmcmIGtleSwgUmVmUHRyPFN0b3JhZ2U+JiB2YWx1ZSkgY29uc3QKICAg ICBTdG9yYWdlKiBzb3VyY2UgPSAwOwogICAgIGlmICh2OFZhbHVlLT5Jc09iamVjdCgpKSB7CiAg ICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciA9IHY4OjpIYW5kbGU8djg6Ok9i amVjdD46OkNhc3QodjhWYWx1ZSk7Ci0gICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gc3Rv cmFnZSA9IHdyYXBwZXItPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhTdG9yYWdlOjpH ZXRUZW1wbGF0ZSgpKTsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBzdG9yYWdlID0g d3JhcHBlci0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOFN0b3JhZ2U6OkdldFRlbXBs YXRlKG1faXNvbGF0ZSkpOwogICAgICAgICBpZiAoIXN0b3JhZ2UuSXNFbXB0eSgpKQogICAgICAg ICAgICAgc291cmNlID0gVjhTdG9yYWdlOjp0b05hdGl2ZShzdG9yYWdlKTsKICAgICB9CkBAIC0z MzYsNyArMzM2LDcgQEAgYm9vbCBEaWN0aW9uYXJ5OjpnZXQoY29uc3QgU3RyaW5nJiBrZXksIFJl ZlB0cjxVaW50OEFycmF5PiYgdmFsdWUpIGNvbnN0CiAgICAgVWludDhBcnJheSogc291cmNlID0g MDsKICAgICBpZiAodjhWYWx1ZS0+SXNPYmplY3QoKSkgewogICAgICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IHdyYXBwZXIgPSB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHY4VmFsdWUp OwotICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGFycmF5ID0gd3JhcHBlci0+RmluZElu c3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOFVpbnQ4QXJyYXk6OkdldFRlbXBsYXRlKCkpOworICAg ICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGFycmF5ID0gd3JhcHBlci0+RmluZEluc3RhbmNl SW5Qcm90b3R5cGVDaGFpbihWOFVpbnQ4QXJyYXk6OkdldFRlbXBsYXRlKG1faXNvbGF0ZSkpOwog ICAgICAgICBpZiAoIWFycmF5LklzRW1wdHkoKSkKICAgICAgICAgICAgIHNvdXJjZSA9IFY4VWlu dDhBcnJheTo6dG9OYXRpdmUoYXJyYXkpOwogICAgIH0KQEAgLTM1NCw3ICszNTQsNyBAQCBib29s IERpY3Rpb25hcnk6OmdldChjb25zdCBTdHJpbmcmIGtleSwgUmVmUHRyPE1lZGlhS2V5RXJyb3I+ JiB2YWx1ZSkgY29uc3QKICAgICBNZWRpYUtleUVycm9yKiBzb3VyY2UgPSAwOwogICAgIGlmICh2 OFZhbHVlLT5Jc09iamVjdCgpKSB7CiAgICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3Jh cHBlciA9IHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QodjhWYWx1ZSk7Ci0gICAgICAgIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4gZXJyb3IgPSB3cmFwcGVyLT5GaW5kSW5zdGFuY2VJblByb3Rv dHlwZUNoYWluKFY4TWVkaWFLZXlFcnJvcjo6R2V0VGVtcGxhdGUoKSk7CisgICAgICAgIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gZXJyb3IgPSB3cmFwcGVyLT5GaW5kSW5zdGFuY2VJblByb3RvdHlw ZUNoYWluKFY4TWVkaWFLZXlFcnJvcjo6R2V0VGVtcGxhdGUobV9pc29sYXRlKSk7CiAgICAgICAg IGlmICghZXJyb3IuSXNFbXB0eSgpKQogICAgICAgICAgICAgc291cmNlID0gVjhNZWRpYUtleUVy cm9yOjp0b05hdGl2ZShlcnJvcik7CiAgICAgfQpAQCAtMzc2LDcgKzM3Niw3IEBAIGJvb2wgRGlj dGlvbmFyeTo6Z2V0KGNvbnN0IFN0cmluZyYga2V5LCBSZWZQdHI8VHJhY2tCYXNlPiYgdmFsdWUp IGNvbnN0CiAKICAgICAgICAgLy8gRklYTUU6IHRoaXMgd2lsbCBuZWVkIHRvIGJlIGNoYW5nZWQg c28gaXQgY2FuIGFsc28gcmV0dXJuIGFuIEF1ZGlvVHJhY2sgb3IgYSBWaWRlb1RyYWNrIG9uY2UK ICAgICAgICAgLy8gd2UgYWRkIHRoZW0uCi0gICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4g dHJhY2sgPSB3cmFwcGVyLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNoYWluKFY4VGV4dFRyYWNr OjpHZXRUZW1wbGF0ZSgpKTsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB0cmFjayA9 IHdyYXBwZXItPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhUZXh0VHJhY2s6OkdldFRl bXBsYXRlKG1faXNvbGF0ZSkpOwogICAgICAgICBpZiAoIXRyYWNrLklzRW1wdHkoKSkKICAgICAg ICAgICAgIHNvdXJjZSA9IFY4VGV4dFRyYWNrOjp0b05hdGl2ZSh0cmFjayk7CiAgICAgfQpAQCAt Mzk1LDcgKzM5NSw3IEBAIGJvb2wgRGljdGlvbmFyeTo6Z2V0KGNvbnN0IFN0cmluZyYga2V5LCBS ZWZQdHI8U3BlZWNoUmVjb2duaXRpb25FcnJvcj4mIHZhbHVlKSBjCiAgICAgU3BlZWNoUmVjb2du aXRpb25FcnJvciogc291cmNlID0gMDsKICAgICBpZiAodjhWYWx1ZS0+SXNPYmplY3QoKSkgewog ICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHdyYXBwZXIgPSB2ODo6SGFuZGxlPHY4OjpP YmplY3Q+OjpDYXN0KHY4VmFsdWUpOwotICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHNw ZWVjaFJlY29nbml0aW9uRXJyb3IgPSB3cmFwcGVyLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNo YWluKFY4U3BlZWNoUmVjb2duaXRpb25FcnJvcjo6R2V0VGVtcGxhdGUoKSk7CisgICAgICAgIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4gc3BlZWNoUmVjb2duaXRpb25FcnJvciA9IHdyYXBwZXItPkZp bmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhTcGVlY2hSZWNvZ25pdGlvbkVycm9yOjpHZXRU ZW1wbGF0ZShtX2lzb2xhdGUpKTsKICAgICAgICAgaWYgKCFzcGVlY2hSZWNvZ25pdGlvbkVycm9y LklzRW1wdHkoKSkKICAgICAgICAgICAgIHNvdXJjZSA9IFY4U3BlZWNoUmVjb2duaXRpb25FcnJv cjo6dG9OYXRpdmUoc3BlZWNoUmVjb2duaXRpb25FcnJvcik7CiAgICAgfQpAQCAtNDEyLDcgKzQx Miw3IEBAIGJvb2wgRGljdGlvbmFyeTo6Z2V0KGNvbnN0IFN0cmluZyYga2V5LCBSZWZQdHI8U3Bl ZWNoUmVjb2duaXRpb25SZXN1bHQ+JiB2YWx1ZSkKICAgICBTcGVlY2hSZWNvZ25pdGlvblJlc3Vs dCogc291cmNlID0gMDsKICAgICBpZiAodjhWYWx1ZS0+SXNPYmplY3QoKSkgewogICAgICAgICB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHdyYXBwZXIgPSB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpD YXN0KHY4VmFsdWUpOwotICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHNwZWVjaFJlY29n bml0aW9uUmVzdWx0ID0gd3JhcHBlci0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOFNw ZWVjaFJlY29nbml0aW9uUmVzdWx0OjpHZXRUZW1wbGF0ZSgpKTsKKyAgICAgICAgdjg6OkhhbmRs ZTx2ODo6T2JqZWN0PiBzcGVlY2hSZWNvZ25pdGlvblJlc3VsdCA9IHdyYXBwZXItPkZpbmRJbnN0 YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhTcGVlY2hSZWNvZ25pdGlvblJlc3VsdDo6R2V0VGVtcGxh dGUobV9pc29sYXRlKSk7CiAgICAgICAgIGlmICghc3BlZWNoUmVjb2duaXRpb25SZXN1bHQuSXNF bXB0eSgpKQogICAgICAgICAgICAgc291cmNlID0gVjhTcGVlY2hSZWNvZ25pdGlvblJlc3VsdDo6 dG9OYXRpdmUoc3BlZWNoUmVjb2duaXRpb25SZXN1bHQpOwogICAgIH0KQEAgLTQyOSw3ICs0Mjks NyBAQCBib29sIERpY3Rpb25hcnk6OmdldChjb25zdCBTdHJpbmcmIGtleSwgUmVmUHRyPFNwZWVj aFJlY29nbml0aW9uUmVzdWx0TGlzdD4mIHZhbAogICAgIFNwZWVjaFJlY29nbml0aW9uUmVzdWx0 TGlzdCogc291cmNlID0gMDsKICAgICBpZiAodjhWYWx1ZS0+SXNPYmplY3QoKSkgewogICAgICAg ICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHdyYXBwZXIgPSB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+ OjpDYXN0KHY4VmFsdWUpOwotICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHNwZWVjaFJl Y29nbml0aW9uUmVzdWx0TGlzdCA9IHdyYXBwZXItPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hh aW4oVjhTcGVlY2hSZWNvZ25pdGlvblJlc3VsdExpc3Q6OkdldFRlbXBsYXRlKCkpOworICAgICAg ICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHNwZWVjaFJlY29nbml0aW9uUmVzdWx0TGlzdCA9IHdy YXBwZXItPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhTcGVlY2hSZWNvZ25pdGlvblJl c3VsdExpc3Q6OkdldFRlbXBsYXRlKG1faXNvbGF0ZSkpOwogICAgICAgICBpZiAoIXNwZWVjaFJl Y29nbml0aW9uUmVzdWx0TGlzdC5Jc0VtcHR5KCkpCiAgICAgICAgICAgICBzb3VyY2UgPSBWOFNw ZWVjaFJlY29nbml0aW9uUmVzdWx0TGlzdDo6dG9OYXRpdmUoc3BlZWNoUmVjb2duaXRpb25SZXN1 bHRMaXN0KTsKICAgICB9CkBAIC00NDksNyArNDQ5LDcgQEAgYm9vbCBEaWN0aW9uYXJ5OjpnZXQo Y29uc3QgU3RyaW5nJiBrZXksIFJlZlB0cjxNZWRpYVN0cmVhbT4mIHZhbHVlKSBjb25zdAogICAg IE1lZGlhU3RyZWFtKiBzdHJlYW0gPSAwOwogICAgIGlmICh2OFZhbHVlLT5Jc09iamVjdCgpKSB7 CiAgICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciA9IHY4OjpIYW5kbGU8djg6 Ok9iamVjdD46OkNhc3QodjhWYWx1ZSk7Ci0gICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4g ZXJyb3IgPSB3cmFwcGVyLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNoYWluKFY4TWVkaWFTdHJl YW06OkdldFRlbXBsYXRlKCkpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGVycm9y ID0gd3JhcHBlci0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOE1lZGlhU3RyZWFtOjpH ZXRUZW1wbGF0ZShtX2lzb2xhdGUpKTsKICAgICAgICAgaWYgKCFlcnJvci5Jc0VtcHR5KCkpCiAg ICAgICAgICAgICBzdHJlYW0gPSBWOE1lZGlhU3RyZWFtOjp0b05hdGl2ZShlcnJvcik7CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvUGFnZVNjcmlwdERlYnVn U2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1BhZ2VTY3JpcHREZWJ1Z1Nl cnZlci5jcHAKaW5kZXggYjE5NTk3NmU3YzdlYjY0OWIzYzYwYTlkMWNiN2U4Y2I2NjUxZTc5Mi4u YmE2ZTVmOGM4Yzk2MDQxZDhhNzNkNzY4ZmIzODZjNmFkNTMwNTE5OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvUGFnZVNjcmlwdERlYnVnU2VydmVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9QYWdlU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCkBAIC01 Niw3ICs1Niw3IEBAIHN0YXRpYyBGcmFtZSogcmV0cmlldmVGcmFtZVdpdGhHbG9iYWxPYmplY3RD aGVjayh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0CiAgICAgaWYgKGdsb2JhbC5Jc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgZ2xvYmFsID0gZ2xvYmFsLT5GaW5kSW5z dGFuY2VJblByb3RvdHlwZUNoYWluKFY4RE9NV2luZG93OjpHZXRUZW1wbGF0ZSgpKTsKKyAgICBn bG9iYWwgPSBnbG9iYWwtPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhET01XaW5kb3c6 OkdldFRlbXBsYXRlKGNvbnRleHQtPkdldElzb2xhdGUoKSkpOwogICAgIGlmIChnbG9iYWwuSXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 QmluZGluZy5jcHAKaW5kZXggMzEyMTFmNTY2M2NhY2FjNDg1NzJkNmIxZjQ0OTUyMmM3MzAzYzhh ZC4uNGJkMmU1ZWE4YjBhNTkzMjkwY2ZlN2EwMWRlZDg4NGJlNTYwM2FjNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwCkBAIC0yMjEsNyArMjIxLDcgQEAgRE9NV2lu ZG93KiB0b0RPTVdpbmRvdyh2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0KQogewogICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsID0gY29udGV4dC0+R2xvYmFsKCk7CiAgICAg QVNTRVJUKCFnbG9iYWwuSXNFbXB0eSgpKTsKLSAgICBnbG9iYWwgPSBnbG9iYWwtPkZpbmRJbnN0 YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhET01XaW5kb3c6OkdldFRlbXBsYXRlKCkpOworICAgIGds b2JhbCA9IGdsb2JhbC0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6 R2V0VGVtcGxhdGUoY29udGV4dC0+R2V0SXNvbGF0ZSgpKSk7CiAgICAgQVNTRVJUKCFnbG9iYWwu SXNFbXB0eSgpKTsKICAgICByZXR1cm4gVjhET01XaW5kb3c6OnRvTmF0aXZlKGdsb2JhbCk7CiB9 CkBAIC0yMjksMTEgKzIyOSwxMSBAQCBET01XaW5kb3cqIHRvRE9NV2luZG93KHY4OjpIYW5kbGU8 djg6OkNvbnRleHQ+IGNvbnRleHQpCiBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiB0b1NjcmlwdEV4 ZWN1dGlvbkNvbnRleHQodjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCkKIHsKICAgICB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGdsb2JhbCA9IGNvbnRleHQtPkdsb2JhbCgpOwotICAgIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4gd2luZG93V3JhcHBlciA9IGdsb2JhbC0+RmluZEluc3RhbmNl SW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUoKSk7CisgICAgdjg6Okhh bmRsZTx2ODo6T2JqZWN0PiB3aW5kb3dXcmFwcGVyID0gZ2xvYmFsLT5GaW5kSW5zdGFuY2VJblBy b3RvdHlwZUNoYWluKFY4RE9NV2luZG93OjpHZXRUZW1wbGF0ZShjb250ZXh0LT5HZXRJc29sYXRl KCkpKTsKICAgICBpZiAoIXdpbmRvd1dyYXBwZXIuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g VjhET01XaW5kb3c6OnRvTmF0aXZlKHdpbmRvd1dyYXBwZXIpLT5zY3JpcHRFeGVjdXRpb25Db250 ZXh0KCk7CiAjaWYgRU5BQkxFKFdPUktFUlMpCi0gICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3 b3JrZXJXcmFwcGVyID0gZ2xvYmFsLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNoYWluKFY4V29y a2VyQ29udGV4dDo6R2V0VGVtcGxhdGUoKSk7CisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3 b3JrZXJXcmFwcGVyID0gZ2xvYmFsLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNoYWluKFY4V29y a2VyQ29udGV4dDo6R2V0VGVtcGxhdGUoY29udGV4dC0+R2V0SXNvbGF0ZSgpKSk7CiAgICAgaWYg KCF3b3JrZXJXcmFwcGVyLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIFY4V29ya2VyQ29udGV4 dDo6dG9OYXRpdmUod29ya2VyV3JhcHBlciktPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dT aGVsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNw cAppbmRleCBjODEyNWQ2MGUxNjVjZWJmNWJlOGZhNGFkODk4NmIwMDllOWZiNzU1Li45YjFlZTNk N2RmMDE0ODQ4ZjRiYWY4NjU3Y2MzNzk1N2MyOWE1OTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcApAQCAtMTUzLDcgKzE1Myw3IEBAIHZv aWQgVjhET01XaW5kb3dTaGVsbDo6Y2xlYXJGb3JOYXZpZ2F0aW9uKCkKICAgICAvLyB3aWxsIGJl IHByb3RlY3RlZCBieSB0aGUgc2VjdXJpdHkgY2hlY2tzIG9uIHRoZSBET01XaW5kb3cgd3JhcHBl ci4KICAgICBjbGVhckRvY3VtZW50UHJvcGVydHkoKTsKIAotICAgIHY4OjpIYW5kbGU8djg6Ok9i amVjdD4gd2luZG93V3JhcHBlciA9IG1fZ2xvYmFsLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNo YWluKFY4RE9NV2luZG93OjpHZXRUZW1wbGF0ZSgpKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpPYmpl Y3Q+IHdpbmRvd1dyYXBwZXIgPSBtX2dsb2JhbC0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFp bihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUobV9pc29sYXRlKSk7CiAgICAgQVNTRVJUKCF3aW5k b3dXcmFwcGVyLklzRW1wdHkoKSk7CiAgICAgd2luZG93V3JhcHBlci0+VHVybk9uQWNjZXNzQ2hl Y2soKTsKICAgICBtX2NvbnRleHQtPkRldGFjaEdsb2JhbCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhJbml0aWFsaXplci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9WOEluaXRpYWxpemVyLmNwcAppbmRleCAzYWRhZjhiNWFmYzY2MmMwZGZkNGE2 ODU5NTJlY2YyOTgyNmFhYTY3Li5jYjNiYzZkYzFlY2NhMmFiYjk0NWI5OWUzNDc0MDQ0ZDIyMzI4 YjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEluaXRpYWxpemVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEluaXRpYWxpemVyLmNwcApA QCAtNDYsMTIgKzQ2LDEyIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIEZyYW1l KiBmaW5kRnJhbWUodjg6OkxvY2FsPHY4OjpPYmplY3Q+IGhvc3QsIHY4OjpMb2NhbDx2ODo6VmFs dWU+IGRhdGEpCitzdGF0aWMgRnJhbWUqIGZpbmRGcmFtZSh2ODo6TG9jYWw8djg6Ok9iamVjdD4g aG9zdCwgdjg6OkxvY2FsPHY4OjpWYWx1ZT4gZGF0YSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7 CiAgICAgV3JhcHBlclR5cGVJbmZvKiB0eXBlID0gV3JhcHBlclR5cGVJbmZvOjp1bndyYXAoZGF0 YSk7CiAKICAgICBpZiAoVjhET01XaW5kb3c6OmluZm8uZXF1YWxzKHR5cGUpKSB7Ci0gICAgICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd2luZG93V3JhcHBlciA9IGhvc3QtPkZpbmRJbnN0YW5j ZUluUHJvdG90eXBlQ2hhaW4oVjhET01XaW5kb3c6OkdldFRlbXBsYXRlKCkpOworICAgICAgICB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+IHdpbmRvd1dyYXBwZXIgPSBob3N0LT5GaW5kSW5zdGFuY2VJ blByb3RvdHlwZUNoYWluKFY4RE9NV2luZG93OjpHZXRUZW1wbGF0ZShpc29sYXRlKSk7CiAgICAg ICAgIGlmICh3aW5kb3dXcmFwcGVyLklzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybiAwOwog ICAgICAgICByZXR1cm4gVjhET01XaW5kb3c6OnRvTmF0aXZlKHdpbmRvd1dyYXBwZXIpLT5mcmFt ZSgpOwpAQCAtOTcsNyArOTcsNyBAQCBzdGF0aWMgdm9pZCBtZXNzYWdlSGFuZGxlckluTWFpblRo cmVhZCh2ODo6SGFuZGxlPHY4OjpNZXNzYWdlPiBtZXNzYWdlLCB2ODo6SGFuZAogCiBzdGF0aWMg dm9pZCBmYWlsZWRBY2Nlc3NDaGVja0NhbGxiYWNrSW5NYWluVGhyZWFkKHY4OjpMb2NhbDx2ODo6 T2JqZWN0PiBob3N0LCB2ODo6QWNjZXNzVHlwZSB0eXBlLCB2ODo6TG9jYWw8djg6OlZhbHVlPiBk YXRhKQogewotICAgIEZyYW1lKiB0YXJnZXQgPSBmaW5kRnJhbWUoaG9zdCwgZGF0YSk7CisgICAg RnJhbWUqIHRhcmdldCA9IGZpbmRGcmFtZShob3N0LCBkYXRhLCB2ODo6SXNvbGF0ZTo6R2V0Q3Vy cmVudCgpKTsKICAgICBpZiAoIXRhcmdldCkKICAgICAgICAgcmV0dXJuOwogICAgIERPTVdpbmRv dyogdGFyZ2V0V2luZG93ID0gdGFyZ2V0LT5kb2N1bWVudCgpLT5kb21XaW5kb3coKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtlclNjcmlwdENvbnRyb2xsZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5j cHAKaW5kZXggMDNmZDZiYTI4NGVmMWFiZDFlZGRiYzg2NjZjYmMzZjBiZmE1YTczNy4uN2RlYzQ3 NGRjN2U3NDQ5ZjUzNTFkZTdhOGE3YTRlMWUwMjY4NTEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKQEAgLTI0OCw3 ICsyNDgsNyBAQCBXb3JrZXJTY3JpcHRDb250cm9sbGVyKiBXb3JrZXJTY3JpcHRDb250cm9sbGVy Ojpjb250cm9sbGVyRm9yQ29udGV4dCgpCiAgICAgICAgIHJldHVybiAwOwogICAgIHY4OjpIYW5k bGU8djg6OkNvbnRleHQ+IGNvbnRleHQgPSB2ODo6Q29udGV4dDo6R2V0Q3VycmVudCgpOwogICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gZ2xvYmFsID0gY29udGV4dC0+R2xvYmFsKCk7Ci0gICAg Z2xvYmFsID0gZ2xvYmFsLT5GaW5kSW5zdGFuY2VJblByb3RvdHlwZUNoYWluKFY4V29ya2VyQ29u dGV4dDo6R2V0VGVtcGxhdGUoKSk7CisgICAgZ2xvYmFsID0gZ2xvYmFsLT5GaW5kSW5zdGFuY2VJ blByb3RvdHlwZUNoYWluKFY4V29ya2VyQ29udGV4dDo6R2V0VGVtcGxhdGUoY29udGV4dC0+R2V0 SXNvbGF0ZSgpKSk7CiAgICAgLy8gUmV0dXJuIDAgaWYgdGhlIGN1cnJlbnQgZXhlY3V0aW5nIGNv bnRleHQgaXMgbm90IHRoZSB3b3JrZXIgY29udGV4dC4KICAgICBpZiAoZ2xvYmFsLklzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAppbmRleCBiNDM2Zjk2ZWM0M2JlMzMy NWNmMjM0MTkwNDE2M2E2YmIxOGRlNTAzLi42MTM5ZGQwYmJkYjg3ZGFjNTljOWM4OWZkMjc2MDIz ZjZmOGM5NmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhET01XaW5kb3dDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKQEAgLTE0Niw3ICsxNDYsNyBAQCB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gV2luZG93U2V0VGltZW91dEltcGwoY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJn cywgYm9vbCBzaW5nbAogCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XaW5kb3c6OmV2ZW50 QWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nl c3NvckluZm8mIGluZm8pCiB7Ci0gICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBp bmZvLlRoaXMoKS0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0 VGVtcGxhdGUoKSk7CisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLlRo aXMoKS0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxh dGUoaW5mby5HZXRJc29sYXRlKCkpKTsKICAgICBpZiAoaG9sZGVyLklzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIApAQCAtMTY4LDcgKzE2OCw3IEBAIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBWOERPTVdpbmRvdzo6ZXZlbnRBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8 djg6OlN0cmluZz4gbmFtCiAKIHZvaWQgVjhET01XaW5kb3c6OmV2ZW50QWNjZXNzb3JTZXR0ZXIo djg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlLCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogewotICAgIHY4OjpIYW5kbGU8djg6Ok9iamVj dD4gaG9sZGVyID0gaW5mby5UaGlzKCktPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhE T01XaW5kb3c6OkdldFRlbXBsYXRlKCkpOworICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gaG9s ZGVyID0gaW5mby5UaGlzKCktPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4oVjhET01XaW5k b3c6OkdldFRlbXBsYXRlKGluZm8uR2V0SXNvbGF0ZSgpKSk7CiAgICAgaWYgKGhvbGRlci5Jc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMzQ0LDcgKzM0NCw3IEBAIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBWOERPTVdpbmRvdzo6cG9zdE1lc3NhZ2VDYWxsYmFjayhjb25zdCB2ODo6QXJn dW1lbnRzJiBhcmdzCiAvLyBzd2l0Y2hpbmcgY29udGV4dCBvZiByZWNlaXZlci4gSSBjb25zaWRl ciBpdCBpcyBkYW5nZXJvdXMuCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XaW5kb3c6OnRv U3RyaW5nQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKIHsKLSAgICB2ODo6SGFu ZGxlPHY4OjpPYmplY3Q+IGRvbVdyYXBwZXIgPSBhcmdzLlRoaXMoKS0+RmluZEluc3RhbmNlSW5Q cm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUoKSk7CisgICAgdjg6OkhhbmRs ZTx2ODo6T2JqZWN0PiBkb21XcmFwcGVyID0gYXJncy5UaGlzKCktPkZpbmRJbnN0YW5jZUluUHJv dG90eXBlQ2hhaW4oVjhET01XaW5kb3c6OkdldFRlbXBsYXRlKGFyZ3MuR2V0SXNvbGF0ZSgpKSk7 CiAgICAgaWYgKGRvbVdyYXBwZXIuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gYXJncy5UaGlz KCktPk9iamVjdFByb3RvVG9TdHJpbmcoKTsKICAgICByZXR1cm4gZG9tV3JhcHBlci0+T2JqZWN0 UHJvdG9Ub1N0cmluZygpOwpAQCAtNTg0LDcgKzU4NCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVl PiB0b1Y4KERPTVdpbmRvdyogd2luZG93LCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGNyZWF0aW9u Q29uCiAgICAgLy8gbmVjZXNzYXJpbHkgdGhlIGZpcnN0IGdsb2JhbCBvYmplY3QgYXNzb2NpYXRl ZCB3aXRoIHRoYXQgRE9NV2luZG93LgogICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IGN1cnJl bnRDb250ZXh0ID0gdjg6OkNvbnRleHQ6OkdldEN1cnJlbnQoKTsKICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGN1cnJlbnRHbG9iYWwgPSBjdXJyZW50Q29udGV4dC0+R2xvYmFsKCk7Ci0gICAg djg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3aW5kb3dXcmFwcGVyID0gY3VycmVudEdsb2JhbC0+Rmlu ZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUoKSk7Cisg ICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3aW5kb3dXcmFwcGVyID0gY3VycmVudEdsb2JhbC0+ RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUoaXNv bGF0ZSkpOwogICAgIGlmICghd2luZG93V3JhcHBlci5Jc0VtcHR5KCkpIHsKICAgICAgICAgaWYg KFY4RE9NV2luZG93Ojp0b05hdGl2ZSh3aW5kb3dXcmFwcGVyKSA9PSB3aW5kb3cpCiAgICAgICAg ICAgICByZXR1cm4gY3VycmVudEdsb2JhbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rvci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0 b3IuY3BwCmluZGV4IGNmODU4ZmE1MDIwYTAzOGUyZmI2MWNkMjA3NWIxYmJjYzM5MjYwNmYuLjU3 NWIyZWIyY2RlMDdjZmZlMjM3NzgwNmJmYWIxN2QxZmM1MWVhOTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEltYWdl RWxlbWVudENvbnN0cnVjdG9yLmNwcApAQCAtOTMsNyArOTMsNyBAQCB2ODo6UGVyc2lzdGVudDx2 ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0b3I6OkdldFRl bXBsYXRlKAogICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0VGVtcGxhdGU+IGluc3RhbmNlID0gcmVz dWx0LT5JbnN0YW5jZVRlbXBsYXRlKCk7CiAgICAgaW5zdGFuY2UtPlNldEludGVybmFsRmllbGRD b3VudChWOEhUTUxJbWFnZUVsZW1lbnQ6OmludGVybmFsRmllbGRDb3VudCk7CiAgICAgcmVzdWx0 LT5TZXRDbGFzc05hbWUodjg6OlN0cmluZzo6TmV3U3ltYm9sKCJIVE1MSW1hZ2VFbGVtZW50Iikp OwotICAgIHJlc3VsdC0+SW5oZXJpdChWOEhUTUxJbWFnZUVsZW1lbnQ6OkdldFRlbXBsYXRlKCkp OworICAgIHJlc3VsdC0+SW5oZXJpdChWOEhUTUxJbWFnZUVsZW1lbnQ6OkdldFRlbXBsYXRlKGlz b2xhdGUpKTsKIAogICAgIGNhY2hlZFRlbXBsYXRlID0gdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0 aW9uVGVtcGxhdGU+OjpOZXcocmVzdWx0KTsKICAgICByZXR1cm4gY2FjaGVkVGVtcGxhdGU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNj cmlwdE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcAppbmRleCA3YjlmZTNjNmIxNDM3YTY4MmZkNjFiNTBkMGZl MTgzNDkyMjA1ZjNkLi40NWZhODYyODkwNGQxZGI3NDllOGFhMjlhZTJmZmNjZmJhN2IwZDI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNj cmlwdE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEluamVjdGVkU2NyaXB0TWFuYWdlci5jcHAKQEAgLTUzLDkgKzUzLDkgQEAgc3RhdGljIHZvaWQg V2Vha1JlZmVyZW5jZUNhbGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gb2JqZWN0LCB2 b2lkKiBwYXJhbWUKICAgICBvYmplY3QuQ2xlYXIoKTsKIH0KIAotc3RhdGljIHY4OjpMb2NhbDx2 ODo6T2JqZWN0PiBjcmVhdGVJbmplY3RlZFNjcmlwdEhvc3RWOFdyYXBwZXIoSW5qZWN0ZWRTY3Jp cHRIb3N0KiBob3N0KQorc3RhdGljIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBjcmVhdGVJbmplY3Rl ZFNjcmlwdEhvc3RWOFdyYXBwZXIoSW5qZWN0ZWRTY3JpcHRIb3N0KiBob3N0LCB2ODo6SXNvbGF0 ZSogaXNvbGF0ZSkKIHsKLSAgICB2ODo6TG9jYWw8djg6OkZ1bmN0aW9uPiBmdW5jdGlvbiA9IFY4 SW5qZWN0ZWRTY3JpcHRIb3N0OjpHZXRUZW1wbGF0ZSgpLT5HZXRGdW5jdGlvbigpOworICAgIHY4 OjpMb2NhbDx2ODo6RnVuY3Rpb24+IGZ1bmN0aW9uID0gVjhJbmplY3RlZFNjcmlwdEhvc3Q6Okdl dFRlbXBsYXRlKGlzb2xhdGUpLT5HZXRGdW5jdGlvbigpOwogICAgIGlmIChmdW5jdGlvbi5Jc0Vt cHR5KCkpIHsKICAgICAgICAgLy8gUmV0dXJuIGlmIGFsbG9jYXRpb24gZmFpbGVkLgogICAgICAg ICByZXR1cm4gdjg6OkxvY2FsPHY4OjpPYmplY3Q+KCk7CkBAIC04NSw3ICs4NSw3IEBAIFNjcmlw dE9iamVjdCBJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmNyZWF0ZUluamVjdGVkU2NyaXB0KGNvbnN0 IFN0cmluZyYgc2NyaXB0U291CiAgICAgLy8gaW5zdGVhZCBvZiBjYWxsaW5nIHRvVjgoKSB0aGF0 IHdvdWxkIGNyZWF0ZSB0aGUKICAgICAvLyB3cmFwcGVyIGluIHRoZSBjdXJyZW50IGNvbnRleHQu CiAgICAgLy8gRklYTUU6IG1ha2UgaXQgcG9zc2libGUgdG8gdXNlIGdlbmVyaWMgYmluZGluZ3Mg ZmFjdG9yeSBmb3IgSW5qZWN0ZWRTY3JpcHRIb3N0LgotICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0 PiBzY3JpcHRIb3N0V3JhcHBlciA9IGNyZWF0ZUluamVjdGVkU2NyaXB0SG9zdFY4V3JhcHBlciht X2luamVjdGVkU2NyaXB0SG9zdC5nZXQoKSk7CisgICAgdjg6OkxvY2FsPHY4OjpPYmplY3Q+IHNj cmlwdEhvc3RXcmFwcGVyID0gY3JlYXRlSW5qZWN0ZWRTY3JpcHRIb3N0VjhXcmFwcGVyKG1faW5q ZWN0ZWRTY3JpcHRIb3N0LmdldCgpLCBpbnNwZWN0ZWRDb250ZXh0LT5HZXRJc29sYXRlKCkpOwog ICAgIGlmIChzY3JpcHRIb3N0V3JhcHBlci5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBTY3Jp cHRPYmplY3QoKTsKIApAQCAtMTE4LDcgKzExOCw3IEBAIGJvb2wgSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyOjpjYW5BY2Nlc3NJbnNwZWN0ZWRXaW5kb3coU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlKQog ICAgIHY4OjpMb2NhbDx2ODo6T2JqZWN0PiBnbG9iYWwgPSBjb250ZXh0LT5HbG9iYWwoKTsKICAg ICBpZiAoZ2xvYmFsLklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gaG9sZGVyID0gZ2xvYmFsLT5GaW5kSW5zdGFuY2VJblByb3RvdHlw ZUNoYWluKFY4RE9NV2luZG93OjpHZXRUZW1wbGF0ZSgpKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpP YmplY3Q+IGhvbGRlciA9IGdsb2JhbC0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERP TVdpbmRvdzo6R2V0VGVtcGxhdGUoY29udGV4dC0+R2V0SXNvbGF0ZSgpKSk7CiAgICAgaWYgKGhv bGRlci5Jc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBGcmFtZSogZnJhbWUg PSBWOERPTVdpbmRvdzo6dG9OYXRpdmUoaG9sZGVyKS0+ZnJhbWUoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3VzdG9tLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOExvY2F0aW9uQ3VzdG9tLmNwcAppbmRl eCBmY2EzYjdmNGZiOGUzNjMwZTQ4N2FhODUwNmQ5OWFjYWE2ZGU3YWI4Li43YjQ2MzVjNDJlMGVk MTM0YWQwYTI4ZmNlMGIzM2MyZGUyM2JlODcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhMb2NhdGlvbkN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TG9jYXRpb25DdXN0b20uY3BwCkBAIC0xMzksNyArMTM5 LDcgQEAgdm9pZCBWOExvY2F0aW9uOjpzZWFyY2hBY2Nlc3NvclNldHRlcih2ODo6TG9jYWw8djg6 OlN0cmluZz4gbmFtZSwgdjg6OkxvY2FsPHY4OjoKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOExv Y2F0aW9uOjpyZWxvYWRBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwg Y29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbykKIHsKICAgICBzdGF0aWMgdjg6OlBlcnNpc3Rl bnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IHByaXZhdGVUZW1wbGF0ZSA9IHY4OjpQZXJzaXN0ZW50 PHY4OjpGdW5jdGlvblRlbXBsYXRlPjo6TmV3KHY4OjpGdW5jdGlvblRlbXBsYXRlOjpOZXcoVjhM b2NhdGlvbjo6cmVsb2FkQ2FsbGJhY2ssIHY4VW5kZWZpbmVkKCksIHY4OjpTaWduYXR1cmU6Ok5l dyhWOExvY2F0aW9uOjpHZXRSYXdUZW1wbGF0ZSgpKSkpOwotICAgIHY4OjpIYW5kbGU8djg6Ok9i amVjdD4gaG9sZGVyID0gaW5mby5UaGlzKCktPkZpbmRJbnN0YW5jZUluUHJvdG90eXBlQ2hhaW4o VjhMb2NhdGlvbjo6R2V0VGVtcGxhdGUoKSk7CisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBo b2xkZXIgPSBpbmZvLlRoaXMoKS0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOExvY2F0 aW9uOjpHZXRUZW1wbGF0ZShpbmZvLkdldElzb2xhdGUoKSkpOwogICAgIGlmIChob2xkZXIuSXNF bXB0eSgpKSB7CiAgICAgICAgIC8vIGNhbiBvbmx5IHJlYWNoIGhlcmUgYnkgJ29iamVjdC5fX3By b3RvX18uZnVuYycsIGFuZCBpdCBzaG91bGQgcGFzc2VkCiAgICAgICAgIC8vIGRvbWFpbiBzZWN1 cml0eSBjaGVjayBhbHJlYWR5CkBAIC0xNTYsNyArMTU2LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFs dWU+IFY4TG9jYXRpb246OnJlbG9hZEFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5n PiBuYW0KIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOExvY2F0aW9uOjpyZXBsYWNlQWNjZXNzb3JH ZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIGNvbnN0IHY4OjpBY2Nlc3NvckluZm8m IGluZm8pCiB7CiAgICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRl PiBwcml2YXRlVGVtcGxhdGUgPSB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT46 Ok5ldyh2ODo6RnVuY3Rpb25UZW1wbGF0ZTo6TmV3KFY4TG9jYXRpb246OnJlcGxhY2VDYWxsYmFj aywgdjhVbmRlZmluZWQoKSwgdjg6OlNpZ25hdHVyZTo6TmV3KFY4TG9jYXRpb246OkdldFJhd1Rl bXBsYXRlKCkpKSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLlRo aXMoKS0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOExvY2F0aW9uOjpHZXRUZW1wbGF0 ZSgpKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGhvbGRlciA9IGluZm8uVGhpcygpLT5G aW5kSW5zdGFuY2VJblByb3RvdHlwZUNoYWluKFY4TG9jYXRpb246OkdldFRlbXBsYXRlKGluZm8u R2V0SXNvbGF0ZSgpKSk7CiAgICAgaWYgKGhvbGRlci5Jc0VtcHR5KCkpIHsKICAgICAgICAgLy8g Y2FuIG9ubHkgcmVhY2ggaGVyZSBieSAnb2JqZWN0Ll9fcHJvdG9fXy5mdW5jJywgYW5kIGl0IHNo b3VsZCBwYXNzZWQKICAgICAgICAgLy8gZG9tYWluIHNlY3VyaXR5IGNoZWNrIGFscmVhZHkKQEAg LTE3NCw3ICsxNzQsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhMb2NhdGlvbjo6YXNzaWdu QWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbQogewogICAgIHN0YXRpYyB2 ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gcHJpdmF0ZVRlbXBsYXRlID0KICAg ICAgICAgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+OjpOZXcodjg6OkZ1bmN0 aW9uVGVtcGxhdGU6Ok5ldyhWOExvY2F0aW9uOjphc3NpZ25DYWxsYmFjaywgdjhVbmRlZmluZWQo KSwgdjg6OlNpZ25hdHVyZTo6TmV3KFY4TG9jYXRpb246OkdldFJhd1RlbXBsYXRlKCkpKSk7Ci0g ICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLlRoaXMoKS0+RmluZEluc3Rh bmNlSW5Qcm90b3R5cGVDaGFpbihWOExvY2F0aW9uOjpHZXRUZW1wbGF0ZSgpKTsKKyAgICB2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+IGhvbGRlciA9IGluZm8uVGhpcygpLT5GaW5kSW5zdGFuY2VJblBy b3RvdHlwZUNoYWluKFY4TG9jYXRpb246OkdldFRlbXBsYXRlKGluZm8uR2V0SXNvbGF0ZSgpKSk7 CiAgICAgaWYgKGhvbGRlci5Jc0VtcHR5KCkpIHsKICAgICAgICAgLy8gY2FuIG9ubHkgcmVhY2gg aGVyZSBieSAnb2JqZWN0Ll9fcHJvdG9fXy5mdW5jJywgYW5kIGl0IHNob3VsZCBwYXNzZWQKICAg ICAgICAgLy8gZG9tYWluIHNlY3VyaXR5IGNoZWNrIGFscmVhZHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3Bw CmluZGV4IGRhNWIxZmQ3NTBlMjg0NmRkMDFmMGQzYjllY2E0NjIzNzZjNDAwM2YuLjhmYzAyZjRi MzE3NjMzOTE2OThiYTM1OWMyYWFhZWRmNWNmZWU5MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNwcApA QCAtMTE2LDcgKzExNiw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE1lc3NhZ2VFdmVudDo6 aW5pdE1lc3NhZ2VFdmVudENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVuCiAgICAgRE9NV2luZG93 KiBzb3VyY2VBcmcgPSAwOwogICAgIGlmIChhcmdzWzZdLT5Jc09iamVjdCgpKSB7CiAgICAgICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd3JhcHBlciA9IHY4OjpIYW5kbGU8djg6Ok9iamVjdD46 OkNhc3QoYXJnc1s2XSk7Ci0gICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd2luZG93ID0g d3JhcHBlci0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVt cGxhdGUoKSk7CisgICAgICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gd2luZG93ID0gd3JhcHBl ci0+RmluZEluc3RhbmNlSW5Qcm90b3R5cGVDaGFpbihWOERPTVdpbmRvdzo6R2V0VGVtcGxhdGUo YXJncy5HZXRJc29sYXRlKCkpKTsKICAgICAgICAgaWYgKCF3aW5kb3cuSXNFbXB0eSgpKQogICAg ICAgICAgICAgc291cmNlQXJnID0gVjhET01XaW5kb3c6OnRvTmF0aXZlKHdpbmRvdyk7CiAgICAg fQo=