185895 2018-05-22 17:16:17 -0700 REGRESSION(r232081): Broke two API tests (Requested by bfulgham_ on #webkit). 2018-05-22 17:18:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 185877 1 commit-queue commit-queue bfulgham rniwa webkit-bug-importer oldest_to_newest 1426413 0 commit-queue 2018-05-22 17:16:17 -0700 https://trac.webkit.org/changeset/232081 broke the build: Broke two API tests (Requested by bfulgham_ on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1426415 1 341049 commit-queue 2018-05-22 17:16:25 -0700 Created attachment 341049 ROLLOUT of r232081 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1426418 2 341049 commit-queue 2018-05-22 17:17:50 -0700 Comment on attachment 341049 ROLLOUT of r232081 Clearing flags on attachment: 341049 Committed r232093: <https://trac.webkit.org/changeset/232093> 1426419 3 commit-queue 2018-05-22 17:17:52 -0700 All reviewed patches have been landed. Closing bug. 1426420 4 webkit-bug-importer 2018-05-22 17:18:20 -0700 <rdar://problem/40470541> 341049 2018-05-22 17:16:25 -0700 2018-05-22 17:17:50 -0700 ROLLOUT of r232081 bug-185895-20180522201624.patch text/plain 21430 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM0ODkyZjVkMTU3NWJj ZjJiZDAxODhkNDc2NTg5OWEzYzU1NWU0MC4uNDBhMDBjOTkyNzY5NGFlMDU3YjA2NzAxNTRiYzg1 ZmU1MTFlYmQyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA1LTIyICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMjMyMDgxLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg1ODk1CisKKyAgICAgICAgQnJva2UgdHdvIEFQSSB0ZXN0cyAoUmVx dWVzdGVkIGJ5IGJmdWxnaGFtXyBvbiAjd2Via2l0KS4KKworICAgICAgICBSZXZlcnRlZCBjaGFu Z2VzZXQ6CisKKyAgICAgICAgIkF2b2lkIGtlZXBpbmcgRm9ybVN0YXRlIGFsaXZlIGxvbmdlciB0 aGFuIG5lY2Vzc2FyeSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE4NTg3NworICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQv MjMyMDgxCisKIDIwMTgtMDUtMjIgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAg ICAgICAgIE9wdGltaXplZCBwYXRoIHpvb20gYW5pbWF0aW9uIG5lZWRzIGEgdmFsaWQgVUlJbWFn ZSBhbmQgQ0dSZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRl eCA3ZWQ0ZjY0YzkyMTE4MWU0OGFmOWJkNjAzMjU5ZWVkNTVkMWI4ODNhLi45ZTA5YmQzNWUwZDM0 ZmM3NGE0OTA3YjkyNjkyY2UwMjMyNjRkMjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2 LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy MDA2LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChD KSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CkBAIC02NDAsNyArNjQwLDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0 KFJlc291cmNlUmVxdWVzdCYmIG5ld1JlcXVlc3QsIGNvbnN0IFJlc291cmMKICAgICBpZiAoIWRp ZFJlY2VpdmVSZWRpcmVjdFJlc3BvbnNlICYmIHNob3VsZENvbnRpbnVlICE9IFNob3VsZENvbnRp bnVlOjpGb3JTdXNwZW5zaW9uKQogICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoV1RG TW92ZShuZXdSZXF1ZXN0KSk7CiAKLSAgICBhdXRvIG5hdmlnYXRpb25Qb2xpY3lDb21wbGV0aW9u SGFuZGxlciA9IFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvbXBsZXRp b25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIChSZXNvdXJjZVJlcXVlc3Qm JiByZXF1ZXN0LCBXZWFrUHRyPEZvcm1TdGF0ZT4mJiwgU2hvdWxkQ29udGludWUgc2hvdWxkQ29u dGludWUpIG11dGFibGUgeworICAgIGF1dG8gbmF2aWdhdGlvblBvbGljeUNvbXBsZXRpb25IYW5k bGVyID0gW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKFJlc291cmNlUmVxdWVzdCYmIHJl cXVlc3QsIEZvcm1TdGF0ZSosIFNob3VsZENvbnRpbnVlIHNob3VsZENvbnRpbnVlKSBtdXRhYmxl IHsKICAgICAgICAgbV93YWl0aW5nRm9yTmF2aWdhdGlvblBvbGljeSA9IGZhbHNlOwogICAgICAg ICBzd2l0Y2ggKHNob3VsZENvbnRpbnVlKSB7CiAgICAgICAgIGNhc2UgU2hvdWxkQ29udGludWU6 OkZvclN1c3BlbnNpb246CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRm9ybVN0 YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Gb3JtU3RhdGUuY3BwCmluZGV4IGY4NzAw YjFhZDM4MzFhM2Q0MzE2MzA4MWE4ZjBjMDYyYjZjYTA2ZjQuLjlmYThiZGQzZTFjYzM2YWIxMWNj ZGU1ZjMwMTk2NTI4OTRiZmQwNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G b3JtU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Gb3JtU3RhdGUuY3BwCkBA IC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNi0yMDE4IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNi0yMDE3IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpA QCAtNTIsNyArNTIsNyBAQCBSZWY8Rm9ybVN0YXRlPiBGb3JtU3RhdGU6OmNyZWF0ZShIVE1MRm9y bUVsZW1lbnQmIGZvcm0sIFN0cmluZ1BhaXJWZWN0b3ImJiB0ZXh0Rgogdm9pZCBGb3JtU3RhdGU6 OndpbGxEZXRhY2hQYWdlKCkKIHsKICAgICAvLyBCZWFydHJhcCBmb3IgPHJkYXI6Ly9wcm9ibGVt LzM3NTc5MzU0PgotICAgIFJFTEVBU0VfQVNTRVJUKGhhc09uZVJlZigpKTsKKyAgICBSRUxFQVNF X0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRm9ybVN0YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRm9ybVN0YXRlLmgK aW5kZXggNzc1ODQzMjlhZjE2NDI0NjUwYzAwZGI4YTc5M2Q5ZDk1NWY1MDUwZi4uMjYzNGE5N2Ix MjM2Yzk3NjIzNGU1MGRhN2Q1YzIwMzk3Y2RjYzJmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0Zvcm1TdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Gb3JtU3Rh dGUuaApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYtMjAxOCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYtMjAxNyBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTI5LDcgKzI5LDYgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiRnJhbWVE ZXN0cnVjdGlvbk9ic2VydmVyLmgiCi0jaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTAsOCAr NDksNiBAQCBwdWJsaWM6CiAgICAgRG9jdW1lbnQmIHNvdXJjZURvY3VtZW50KCkgY29uc3QgeyBy ZXR1cm4gbV9zb3VyY2VEb2N1bWVudDsgfQogICAgIEZvcm1TdWJtaXNzaW9uVHJpZ2dlciBmb3Jt U3VibWlzc2lvblRyaWdnZXIoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1TdWJtaXNzaW9uVHJpZ2dl cjsgfQogCi0gICAgYXV0byYgd2Vha1B0ckZhY3RvcnkoKSBjb25zdCB7IHJldHVybiBtX3dlYWtG YWN0b3J5OyB9Ci0KIHByaXZhdGU6CiAgICAgRm9ybVN0YXRlKEhUTUxGb3JtRWxlbWVudCYsIFN0 cmluZ1BhaXJWZWN0b3ImJiB0ZXh0RmllbGRWYWx1ZXMsIERvY3VtZW50JiwgRm9ybVN1Ym1pc3Np b25UcmlnZ2VyKTsKICAgICB2b2lkIHdpbGxEZXRhY2hQYWdlKCkgb3ZlcnJpZGU7CkBAIC02MCw3 ICs1Nyw2IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nUGFpclZlY3RvciBtX3RleHRGaWVsZFZhbHVl czsKICAgICBSZWY8RG9jdW1lbnQ+IG1fc291cmNlRG9jdW1lbnQ7CiAgICAgRm9ybVN1Ym1pc3Np b25UcmlnZ2VyIG1fZm9ybVN1Ym1pc3Npb25UcmlnZ2VyOwotICAgIFdlYWtQdHJGYWN0b3J5PEZv cm1TdGF0ZT4gbV93ZWFrRmFjdG9yeTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDg5ZDVkYzkxMjE2ZmM2NDJiMGRm ZmY1MDAzMDBkMWU4YzlkMTdlN2IuLjMwZDAwMjUzY2RlOGE3NDgzN2IwZDQ3NWMwZjE3MzUxZjVh YThhZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYtMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggTm9raWEgQ29ycG9yYXRpb24gYW5k L29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkgVG9y Y2ggTW9iaWxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4gKGh0dHA6Ly93d3cudG9yY2htb2Jp bGUuY29tLykKICAqIENvcHlyaWdodCAoQykgMjAwOCBBbHAgVG9rZXIgPGFscEBhdG9rZXIuY29t PgpAQCAtMTIyOCw3ICsxMjI4LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZEZyYW1lUmVxdWVz dChGcmFtZUxvYWRSZXF1ZXN0JiYgcmVxdWVzdCwgRXZlbnQqIGV2ZW50LCBGb3IKICAgICBlbHNl CiAgICAgICAgIGxvYWRUeXBlID0gRnJhbWVMb2FkVHlwZTo6U3RhbmRhcmQ7CiAKLSAgICBhdXRv IGNvbXBsZXRpb25IYW5kbGVyID0gW3RoaXMsIHByb3RlY3RlZEZyYW1lID0gbWFrZVJlZihtX2Zy YW1lKSwgZm9ybVN0YXRlID0gbWFrZVdlYWtQdHIoZm9ybVN0YXRlKSwgZnJhbWVOYW1lID0gcmVx dWVzdC5mcmFtZU5hbWUoKV0geworICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXIgPSBbdGhpcywg cHJvdGVjdGVkRnJhbWUgPSBtYWtlUmVmKG1fZnJhbWUpLCBmb3JtU3RhdGUgPSBtYWtlUmVmUHRy KGZvcm1TdGF0ZSksIGZyYW1lTmFtZSA9IHJlcXVlc3QuZnJhbWVOYW1lKCldIHsKICAgICAgICAg Ly8gRklYTUU6IEl0J3MgcG9zc2libGUgdGhpcyB0YXJnZXRGcmFtZSB3aWxsIG5vdCBiZSB0aGUg c2FtZSBmcmFtZSB0aGF0IHdhcyB0YXJnZXRlZCBieSB0aGUgYWN0dWFsCiAgICAgICAgIC8vIGxv YWQgaWYgZnJhbWUgbmFtZXMgaGF2ZSBjaGFuZ2VkLgogICAgICAgICBGcmFtZSogc291cmNlRnJh bWUgPSBmb3JtU3RhdGUgPyBmb3JtU3RhdGUtPnNvdXJjZURvY3VtZW50KCkuZnJhbWUoKSA6ICZt X2ZyYW1lOwpAQCAtMTMzOCw4ICsxMzM4LDggQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTChG cmFtZUxvYWRSZXF1ZXN0JiYgZnJhbWVMb2FkUmVxdWVzdCwgY29uc3QgU3RyaW5nJiByZWYKIAog ICAgIGlmICghdGFyZ2V0RnJhbWUgJiYgIWZyYW1lTmFtZS5pc0VtcHR5KCkpIHsKICAgICAgICAg YWN0aW9uID0gYWN0aW9uLmNvcHlXaXRoU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeShzaG91 bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5VG9BcHBseShtX2ZyYW1lLCBmcmFtZUxvYWRSZXF1ZXN0 KSk7Ci0gICAgICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShXVEZNb3Zl KGFjdGlvbiksIFdURk1vdmUocmVxdWVzdCksIGZvcm1TdGF0ZSwgZnJhbWVOYW1lLCBbdGhpcywg YWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xpY3ksIGNvbXBsZXRpb25IYW5k bGVyID0gY29tcGxldGlvbkhhbmRsZXJDYWxsZXIucmVsZWFzZSgpXSAoY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBXZWFrUHRyPEZvcm1TdGF0ZT4mJiBmb3JtU3RhdGUsIGNvbnN0IFN0 cmluZyYgZnJhbWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIFNob3VsZENv bnRpbnVlIHNob3VsZENvbnRpbnVlKSB7Ci0gICAgICAgICAgICBjb250aW51ZUxvYWRBZnRlck5l d1dpbmRvd1BvbGljeShyZXF1ZXN0LCBmb3JtU3RhdGUuZ2V0KCksIGZyYW1lTmFtZSwgYWN0aW9u LCBzaG91bGRDb250aW51ZSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xp Y3kpOworICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koV1RGTW92 ZShhY3Rpb24pLCBXVEZNb3ZlKHJlcXVlc3QpLCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgW3RoaXMs IGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgb3BlbmVyUG9saWN5LCBjb21wbGV0aW9uSGFu ZGxlciA9IGNvbXBsZXRpb25IYW5kbGVyQ2FsbGVyLnJlbGVhc2UoKV0gKGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCwgRm9ybVN0YXRlKiBmb3JtU3RhdGUsIGNvbnN0IFN0cmluZyYgZnJh bWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIFNob3VsZENvbnRpbnVlIHNo b3VsZENvbnRpbnVlKSB7CisgICAgICAgICAgICBjb250aW51ZUxvYWRBZnRlck5ld1dpbmRvd1Bv bGljeShyZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgYWN0aW9uLCBzaG91bGRDb250aW51 ZSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xpY3kpOwogICAgICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIoKTsKICAgICAgICAgfSk7CiAgICAgICAgIHJldHVybjsKQEAg LTEzNTgsNyArMTM1OCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRVUkwoRnJhbWVMb2FkUmVx dWVzdCYmIGZyYW1lTG9hZFJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcmVmCiAgICAgICAgIG9sZERv Y3VtZW50TG9hZGVyLT5zZXRMYXN0Q2hlY2tlZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0KCkpOwog ICAgICAgICBwb2xpY3lDaGVja2VyKCkuc3RvcENoZWNrKCk7CiAgICAgICAgIHBvbGljeUNoZWNr ZXIoKS5zZXRMb2FkVHlwZShuZXdMb2FkVHlwZSk7Ci0gICAgICAgIHBvbGljeUNoZWNrZXIoKS5j aGVja05hdmlnYXRpb25Qb2xpY3koV1RGTW92ZShyZXF1ZXN0KSwgZmFsc2UgLyogZGlkUmVjZWl2 ZVJlZGlyZWN0UmVzcG9uc2UgKi8sIG9sZERvY3VtZW50TG9hZGVyLmdldCgpLCBmb3JtU3RhdGUs IFt0aGlzLCBwcm90ZWN0ZWRGcmFtZSA9IG1ha2VSZWYobV9mcmFtZSldIChjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QsIFdlYWtQdHI8Rm9ybVN0YXRlPiYmLCBTaG91bGRDb250aW51ZSBz aG91bGRDb250aW51ZSkgeworICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOYXZpZ2F0aW9u UG9saWN5KFdURk1vdmUocmVxdWVzdCksIGZhbHNlIC8qIGRpZFJlY2VpdmVSZWRpcmVjdFJlc3Bv bnNlICovLCBvbGREb2N1bWVudExvYWRlci5nZXQoKSwgZm9ybVN0YXRlLCBbdGhpcywgcHJvdGVj dGVkRnJhbWUgPSBtYWtlUmVmKG1fZnJhbWUpXSAoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBGb3JtU3RhdGUqLCBTaG91bGRDb250aW51ZSBzaG91bGRDb250aW51ZSkgewogICAgICAg ICAgICAgY29udGludWVGcmFnbWVudFNjcm9sbEFmdGVyTmF2aWdhdGlvblBvbGljeShyZXF1ZXN0 LCBzaG91bGRDb250aW51ZSA9PSBTaG91bGRDb250aW51ZTo6WWVzKTsKICAgICAgICAgfSwgUG9s aWN5RGVjaXNpb25Nb2RlOjpTeW5jaHJvbm91cyk7CiAgICAgICAgIHJldHVybjsKQEAgLTE0MTks OCArMTQxOSw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRnJhbWVMb2FkUmVxdWVzdCYmIHJl cXVlc3QpCiAKICAgICBpZiAocmVxdWVzdC5zaG91bGRDaGVja05ld1dpbmRvd1BvbGljeSgpKSB7 CiAgICAgICAgIE5hdmlnYXRpb25BY3Rpb24gYWN0aW9uIHsgcmVxdWVzdC5yZXF1ZXN0ZXIoKSwg cmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKSwgSW5pdGlhdGVkQnlNYWluRnJhbWU6OlVua25vd24s IE5hdmlnYXRpb25UeXBlOjpPdGhlciwgcmVxdWVzdC5zaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5KCkgfTsKLSAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmV3V2luZG93UG9saWN5KFdU Rk1vdmUoYWN0aW9uKSwgV1RGTW92ZShyZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpKSwgbnVsbHB0 ciwgcmVxdWVzdC5mcmFtZU5hbWUoKSwgW3RoaXNdIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIFdlYWtQdHI8Rm9ybVN0YXRlPiYmIGZvcm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFt ZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgU2hvdWxkQ29udGludWUgc2hv dWxkQ29udGludWUpIHsKLSAgICAgICAgICAgIGNvbnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9s aWN5KHJlcXVlc3QsIGZvcm1TdGF0ZS5nZXQoKSwgZnJhbWVOYW1lLCBhY3Rpb24sIHNob3VsZENv bnRpbnVlLCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQ b2xpY3k6OlN1cHByZXNzKTsKKyAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmV3V2luZG93 UG9saWN5KFdURk1vdmUoYWN0aW9uKSwgV1RGTW92ZShyZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgp KSwgbnVsbHB0ciwgcmVxdWVzdC5mcmFtZU5hbWUoKSwgW3RoaXNdIChjb25zdCBSZXNvdXJjZVJl cXVlc3QmIHJlcXVlc3QsIEZvcm1TdGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1l TmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBTaG91bGRDb250aW51ZSBzaG91 bGRDb250aW51ZSkgeworICAgICAgICAgICAgY29udGludWVMb2FkQWZ0ZXJOZXdXaW5kb3dQb2xp Y3kocmVxdWVzdCwgZm9ybVN0YXRlLCBmcmFtZU5hbWUsIGFjdGlvbiwgc2hvdWxkQ29udGludWUs IEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6 U3VwcHJlc3MpOwogICAgICAgICB9KTsKIAogICAgICAgICByZXR1cm47CkBAIC0xNTMzLDcgKzE1 MzMsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50 TG9hZGVyKiBsb2FkZXIsIEZyYW1lTG9hZFR5cGUgdAogICAgICAgICBvbGREb2N1bWVudExvYWRl ci0+c2V0VHJpZ2dlcmluZ0FjdGlvbihhY3Rpb24pOwogICAgICAgICBvbGREb2N1bWVudExvYWRl ci0+c2V0TGFzdENoZWNrZWRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCgpKTsKICAgICAgICAgcG9s aWN5Q2hlY2tlcigpLnN0b3BDaGVjaygpOwotICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tO YXZpZ2F0aW9uUG9saWN5KFJlc291cmNlUmVxdWVzdChsb2FkZXItPnJlcXVlc3QoKSksIGZhbHNl IC8qIGRpZFJlY2VpdmVSZWRpcmVjdFJlc3BvbnNlICovLCBvbGREb2N1bWVudExvYWRlci5nZXQo KSwgZm9ybVN0YXRlLCBbdGhpcywgcHJvdGVjdGVkRnJhbWUgPSBtYWtlUmVmKG1fZnJhbWUpXSAo Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBXZWFrUHRyPEZvcm1TdGF0ZT4mJiwgU2hv dWxkQ29udGludWUgc2hvdWxkQ29udGludWUpIHsKKyAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNo ZWNrTmF2aWdhdGlvblBvbGljeShSZXNvdXJjZVJlcXVlc3QobG9hZGVyLT5yZXF1ZXN0KCkpLCBm YWxzZSAvKiBkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSAqLywgb2xkRG9jdW1lbnRMb2FkZXIu Z2V0KCksIGZvcm1TdGF0ZSwgW3RoaXMsIHByb3RlY3RlZEZyYW1lID0gbWFrZVJlZihtX2ZyYW1l KV0gKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRm9ybVN0YXRlKiwgU2hvdWxkQ29u dGludWUgc2hvdWxkQ29udGludWUpIHsKICAgICAgICAgICAgIGNvbnRpbnVlRnJhZ21lbnRTY3Jv bGxBZnRlck5hdmlnYXRpb25Qb2xpY3kocmVxdWVzdCwgc2hvdWxkQ29udGludWUgPT0gU2hvdWxk Q29udGludWU6Olllcyk7CiAgICAgICAgIH0sIFBvbGljeURlY2lzaW9uTW9kZTo6U3luY2hyb25v dXMpOwogICAgICAgICByZXR1cm47CkBAIC0xNTY3LDggKzE1NjcsOCBAQCB2b2lkIEZyYW1lTG9h ZGVyOjpsb2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIEZyYW1l TG9hZFR5cGUgdAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcG9saWN5Q2hlY2tlcigp LmNoZWNrTmF2aWdhdGlvblBvbGljeShSZXNvdXJjZVJlcXVlc3QobG9hZGVyLT5yZXF1ZXN0KCkp LCBmYWxzZSAvKiBkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSAqLywgbG9hZGVyLCBmb3JtU3Rh dGUsIFt0aGlzLCBwcm90ZWN0ZWRGcmFtZSA9IG1ha2VSZWYobV9mcmFtZSksIGFsbG93TmF2aWdh dGlvblRvSW52YWxpZFVSTCwgY29tcGxldGlvbkhhbmRsZXIgPSBjb21wbGV0aW9uSGFuZGxlckNh bGxlci5yZWxlYXNlKCldIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdlYWtQdHI8 Rm9ybVN0YXRlPiYmIGZvcm1TdGF0ZSwgU2hvdWxkQ29udGludWUgc2hvdWxkQ29udGludWUpIHsK LSAgICAgICAgY29udGludWVMb2FkQWZ0ZXJOYXZpZ2F0aW9uUG9saWN5KHJlcXVlc3QsIGZvcm1T dGF0ZS5nZXQoKSwgc2hvdWxkQ29udGludWUsIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCk7 CisgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmF2aWdhdGlvblBvbGljeShSZXNvdXJjZVJlcXVl c3QobG9hZGVyLT5yZXF1ZXN0KCkpLCBmYWxzZSAvKiBkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25z ZSAqLywgbG9hZGVyLCBmb3JtU3RhdGUsIFt0aGlzLCBwcm90ZWN0ZWRGcmFtZSA9IG1ha2VSZWYo bV9mcmFtZSksIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgY29tcGxldGlvbkhhbmRsZXIg PSBjb21wbGV0aW9uSGFuZGxlckNhbGxlci5yZWxlYXNlKCldIChjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIEZvcm1TdGF0ZSogZm9ybVN0YXRlLCBTaG91bGRDb250aW51ZSBzaG91bGRD b250aW51ZSkgeworICAgICAgICBjb250aW51ZUxvYWRBZnRlck5hdmlnYXRpb25Qb2xpY3kocmVx dWVzdCwgZm9ybVN0YXRlLCBzaG91bGRDb250aW51ZSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlk VVJMKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKICAgICB9KTsKIH0KQEAgLTI4NjEs MTMgKzI4NjEsMTMgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFBvc3RSZXF1ZXN0KEZyYW1lTG9h ZFJlcXVlc3QmJiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHJlZmUKIAogICAgIGlmICghZnJhbWVO YW1lLmlzRW1wdHkoKSkgewogICAgICAgICAvLyBUaGUgc2VhcmNoIGZvciBhIHRhcmdldCBmcmFt ZSBpcyBkb25lIGVhcmxpZXIgaW4gdGhlIGNhc2Ugb2YgZm9ybSBzdWJtaXNzaW9uLgotICAgICAg ICBpZiAoYXV0byogdGFyZ2V0RnJhbWUgPSBmb3JtU3RhdGUgPyBudWxscHRyIDogZmluZEZyYW1l Rm9yTmF2aWdhdGlvbihmcmFtZU5hbWUpKSB7Ci0gICAgICAgICAgICB0YXJnZXRGcmFtZS0+bG9h ZGVyKCkubG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uKHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIGFj dGlvbiwgbG9ja0hpc3RvcnksIGxvYWRUeXBlLCBmb3JtU3RhdGUsIGFsbG93TmF2aWdhdGlvblRv SW52YWxpZFVSTCwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgICAgICBpZiAoRnJh bWUqIHRhcmdldEZyYW1lID0gZm9ybVN0YXRlID8gMCA6IGZpbmRGcmFtZUZvck5hdmlnYXRpb24o ZnJhbWVOYW1lKSkgeworICAgICAgICAgICAgdGFyZ2V0RnJhbWUtPmxvYWRlcigpLmxvYWRXaXRo TmF2aWdhdGlvbkFjdGlvbih3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBhY3Rpb24sIGxvY2tIaXN0 b3J5LCBsb2FkVHlwZSwgV1RGTW92ZShmb3JtU3RhdGUpLCBhbGxvd05hdmlnYXRpb25Ub0ludmFs aWRVUkwsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogCi0gICAgICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGlj eShXVEZNb3ZlKGFjdGlvbiksIFdURk1vdmUod29ya2luZ1Jlc291cmNlUmVxdWVzdCksIGZvcm1T dGF0ZSwgZnJhbWVOYW1lLCBbdGhpcywgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVu ZXJQb2xpY3ksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcild IChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdlYWtQdHI8Rm9ybVN0YXRlPiYmIGZv cm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24m IGFjdGlvbiwgU2hvdWxkQ29udGludWUgc2hvdWxkQ29udGludWUpIHsKLSAgICAgICAgICAgIGNv bnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9saWN5KHJlcXVlc3QsIGZvcm1TdGF0ZS5nZXQoKSwg ZnJhbWVOYW1lLCBhY3Rpb24sIHNob3VsZENvbnRpbnVlLCBhbGxvd05hdmlnYXRpb25Ub0ludmFs aWRVUkwsIG9wZW5lclBvbGljeSk7CisgICAgICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dp bmRvd1BvbGljeShXVEZNb3ZlKGFjdGlvbiksIFdURk1vdmUod29ya2luZ1Jlc291cmNlUmVxdWVz dCksIFdURk1vdmUoZm9ybVN0YXRlKSwgZnJhbWVOYW1lLCBbdGhpcywgYWxsb3dOYXZpZ2F0aW9u VG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xpY3ksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcildIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZvcm1T dGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgTmF2aWdhdGlv bkFjdGlvbiYgYWN0aW9uLCBTaG91bGRDb250aW51ZSBzaG91bGRDb250aW51ZSkgeworICAgICAg ICAgICAgY29udGludWVMb2FkQWZ0ZXJOZXdXaW5kb3dQb2xpY3kocmVxdWVzdCwgZm9ybVN0YXRl LCBmcmFtZU5hbWUsIGFjdGlvbiwgc2hvdWxkQ29udGludWUsIGFsbG93TmF2aWdhdGlvblRvSW52 YWxpZFVSTCwgb3BlbmVyUG9saWN5KTsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7 CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm47CkBAIC0yODc1LDcgKzI4NzUsNyBAQCB2b2lk IEZyYW1lTG9hZGVyOjpsb2FkUG9zdFJlcXVlc3QoRnJhbWVMb2FkUmVxdWVzdCYmIHJlcXVlc3Qs IGNvbnN0IFN0cmluZyYgcmVmZQogCiAgICAgLy8gbXVzdCBncmFiIHRoaXMgbm93LCBzaW5jZSB0 aGlzIGxvYWQgbWF5IHN0b3AgdGhlIHByZXZpb3VzIGxvYWQgYW5kIGNsZWFyIHRoaXMgZmxhZwog ICAgIGJvb2wgaXNSZWRpcmVjdCA9IG1fcXVpY2tSZWRpcmVjdENvbWluZzsKLSAgICBsb2FkV2l0 aE5hdmlnYXRpb25BY3Rpb24od29ya2luZ1Jlc291cmNlUmVxdWVzdCwgYWN0aW9uLCBsb2NrSGlz dG9yeSwgbG9hZFR5cGUsIGZvcm1TdGF0ZSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBb dGhpcywgaXNSZWRpcmVjdCwgcHJvdGVjdGVkRnJhbWUgPSBtYWtlUmVmKG1fZnJhbWUpLCBjb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSB7CisgICAgbG9hZFdp dGhOYXZpZ2F0aW9uQWN0aW9uKHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIGFjdGlvbiwgbG9ja0hp c3RvcnksIGxvYWRUeXBlLCBXVEZNb3ZlKGZvcm1TdGF0ZSksIGFsbG93TmF2aWdhdGlvblRvSW52 YWxpZFVSTCwgW3RoaXMsIGlzUmVkaXJlY3QsIHByb3RlY3RlZEZyYW1lID0gbWFrZVJlZihtX2Zy YW1lKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gewog ICAgICAgICBpZiAoaXNSZWRpcmVjdCkgewogICAgICAgICAgICAgbV9xdWlja1JlZGlyZWN0Q29t aW5nID0gZmFsc2U7CiAgICAgICAgICAgICBpZiAobV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVy KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCmluZGV4IDFiZTcwZTE0ZTcz ODhhZDgyNzZlODVjZmFhMjdlMDkzYjI5OTcyODUuLmI2NjkwZWE5NjY1YTE1MTVjOTdhNjNhZGM5 NDA3NzMyYjk4MTkxMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lD aGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5Q2hlY2tlci5jcHAK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LTIwMTggQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LTIwMTYgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4IE5va2lhIENv cnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQogICogQ29weXJpZ2h0IChDKSAy MDA4LCAyMDA5IFRvcmNoIE1vYmlsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIChodHRwOi8v d3d3LnRvcmNobW9iaWxlLmNvbS8pCiAgKgpAQCAtMTA5LDcgKzEwOSw3IEBAIHZvaWQgUG9saWN5 Q2hlY2tlcjo6Y2hlY2tOYXZpZ2F0aW9uUG9saWN5KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3Qs IGJvb2wgZGlkUmVjCiAgICAgLy8gRG9uJ3QgYXNrIG1vcmUgdGhhbiBvbmNlIGZvciB0aGUgc2Ft ZSByZXF1ZXN0IG9yIGlmIHdlIGFyZSBsb2FkaW5nIGFuIGVtcHR5IFVSTC4KICAgICAvLyBUaGlz IGF2b2lkcyBjb25mdXNpb24gb24gdGhlIHBhcnQgb2YgdGhlIGNsaWVudC4KICAgICBpZiAoZXF1 YWxJZ25vcmluZ0hlYWRlckZpZWxkcyhyZXF1ZXN0LCBsb2FkZXItPmxhc3RDaGVja2VkUmVxdWVz dCgpKSB8fCAoIXJlcXVlc3QuaXNOdWxsKCkgJiYgcmVxdWVzdC51cmwoKS5pc0VtcHR5KCkpKSB7 Ci0gICAgICAgIGZ1bmN0aW9uKFJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSwgeyB9LCBTaG91bGRD b250aW51ZTo6WWVzKTsKKyAgICAgICAgZnVuY3Rpb24oUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3Qp LCBudWxscHRyLCBTaG91bGRDb250aW51ZTo6WWVzKTsKICAgICAgICAgbG9hZGVyLT5zZXRMYXN0 Q2hlY2tlZFJlcXVlc3QoV1RGTW92ZShyZXF1ZXN0KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CkBAIC0xMjQsNyArMTI0LDcgQEAgdm9pZCBQb2xpY3lDaGVja2VyOjpjaGVja05hdmlnYXRpb25Q b2xpY3koUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgYm9vbCBkaWRSZWMKICNlbmRpZgogICAg ICAgICBpZiAoaXNCYWNrRm9yd2FyZExvYWRUeXBlKG1fbG9hZFR5cGUpKQogICAgICAgICAgICAg bV9sb2FkVHlwZSA9IEZyYW1lTG9hZFR5cGU6OlJlbG9hZDsKLSAgICAgICAgZnVuY3Rpb24oV1RG TW92ZShyZXF1ZXN0KSwgeyB9LCBzaG91bGRDb250aW51ZSA/IFNob3VsZENvbnRpbnVlOjpZZXMg OiBTaG91bGRDb250aW51ZTo6Tm8pOworICAgICAgICBmdW5jdGlvbihXVEZNb3ZlKHJlcXVlc3Qp LCBudWxscHRyLCBzaG91bGRDb250aW51ZSA/IFNob3VsZENvbnRpbnVlOjpZZXMgOiBTaG91bGRD b250aW51ZTo6Tm8pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xMzQsNyArMTM0LDcg QEAgdm9pZCBQb2xpY3lDaGVja2VyOjpjaGVja05hdmlnYXRpb25Qb2xpY3koUmVzb3VyY2VSZXF1 ZXN0JiYgcmVxdWVzdCwgYm9vbCBkaWRSZWMKICAgICAgICAgICAgIC8vIHJldmVhbCB0aGF0IHRo ZSBmcmFtZSB3YXMgYmxvY2tlZC4gVGhpcyB3YXksIGl0IGxvb2tzIGxpa2UgYW55IG90aGVyIGNy b3NzLW9yaWdpbiBwYWdlIGxvYWQuCiAgICAgICAgICAgICBtX2ZyYW1lLm93bmVyRWxlbWVudCgp LT5kaXNwYXRjaEV2ZW50KEV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmxvYWRFdmVudCwgZmFs c2UsIGZhbHNlKSk7CiAgICAgICAgIH0KLSAgICAgICAgZnVuY3Rpb24oV1RGTW92ZShyZXF1ZXN0 KSwgeyB9LCBTaG91bGRDb250aW51ZTo6Tm8pOworICAgICAgICBmdW5jdGlvbihXVEZNb3ZlKHJl cXVlc3QpLCBudWxscHRyLCBTaG91bGRDb250aW51ZTo6Tm8pOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC0xNDcsNyArMTQ3LDcgQEAgdm9pZCBQb2xpY3lDaGVja2VyOjpjaGVja05hdmln YXRpb25Qb2xpY3koUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgYm9vbCBkaWRSZWMKICNpZiBV U0UoUVVJQ0tfTE9PSykKICAgICAvLyBBbHdheXMgYWxsb3cgUXVpY2tMb29rLWdlbmVyYXRlZCBV UkxzIGJhc2VkIG9uIHRoZSBwcm90b2NvbCBzY2hlbWUuCiAgICAgaWYgKCFyZXF1ZXN0LmlzTnVs bCgpICYmIGlzUXVpY2tMb29rUHJldmlld1VSTChyZXF1ZXN0LnVybCgpKSkKLSAgICAgICAgcmV0 dXJuIGZ1bmN0aW9uKFdURk1vdmUocmVxdWVzdCksIG1ha2VXZWFrUHRyKGZvcm1TdGF0ZSksIFNo b3VsZENvbnRpbnVlOjpZZXMpOworICAgICAgICByZXR1cm4gZnVuY3Rpb24oV1RGTW92ZShyZXF1 ZXN0KSwgZm9ybVN0YXRlLCBTaG91bGRDb250aW51ZTo6WWVzKTsKICNlbmRpZgogCiAjaWYgRU5B QkxFKENPTlRFTlRfRklMVEVSSU5HKQpAQCAtMTY4LDcgKzE2OCw3IEBAIHZvaWQgUG9saWN5Q2hl Y2tlcjo6Y2hlY2tOYXZpZ2F0aW9uUG9saWN5KFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIGJv b2wgZGlkUmVjCiAKICAgICBtX2RlbGVnYXRlSXNEZWNpZGluZ05hdmlnYXRpb25Qb2xpY3kgPSB0 cnVlOwogICAgIFN0cmluZyBzdWdnZXN0ZWRGaWxlbmFtZSA9IGFjdGlvbi5kb3dubG9hZEF0dHJp YnV0ZSgpLmlzRW1wdHkoKSA/IG51bGxBdG9tKCkgOiBhY3Rpb24uZG93bmxvYWRBdHRyaWJ1dGUo KTsKLSAgICBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbihhY3Rpb24sIHJlcXVlc3QsIGRpZFJlY2VpdmVSZWRpcmVjdFJlc3Bv bnNlLCBmb3JtU3RhdGUsIHBvbGljeURlY2lzaW9uTW9kZSwgW3RoaXMsIGZ1bmN0aW9uID0gV1RG TW92ZShmdW5jdGlvbiksIHJlcXVlc3QgPSBSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCksIGZvcm1T dGF0ZSA9IG1ha2VXZWFrUHRyKGZvcm1TdGF0ZSksIHN1Z2dlc3RlZEZpbGVuYW1lID0gV1RGTW92 ZShzdWdnZXN0ZWRGaWxlbmFtZSksIGJsb2JVUkxMaWZldGltZUV4dGVuc2lvbiA9IFdURk1vdmUo YmxvYlVSTExpZmV0aW1lRXh0ZW5zaW9uKV0oUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikgbXV0 YWJsZSB7CisgICAgbV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5kaXNwYXRjaERlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24oYWN0aW9uLCByZXF1ZXN0LCBkaWRSZWNlaXZlUmVkaXJlY3RS ZXNwb25zZSwgZm9ybVN0YXRlLCBwb2xpY3lEZWNpc2lvbk1vZGUsIFt0aGlzLCBmdW5jdGlvbiA9 IFdURk1vdmUoZnVuY3Rpb24pLCByZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpLCBm b3JtU3RhdGUgPSBtYWtlUmVmUHRyKGZvcm1TdGF0ZSksIHN1Z2dlc3RlZEZpbGVuYW1lID0gV1RG TW92ZShzdWdnZXN0ZWRGaWxlbmFtZSksIGJsb2JVUkxMaWZldGltZUV4dGVuc2lvbiA9IFdURk1v dmUoYmxvYlVSTExpZmV0aW1lRXh0ZW5zaW9uKV0oUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikg bXV0YWJsZSB7CiAgICAgICAgIG1fZGVsZWdhdGVJc0RlY2lkaW5nTmF2aWdhdGlvblBvbGljeSA9 IGZhbHNlOwogCiAgICAgICAgIHN3aXRjaCAocG9saWN5QWN0aW9uKSB7CkBAIC0xODUsNyArMTg1 LDcgQEAgdm9pZCBQb2xpY3lDaGVja2VyOjpjaGVja05hdmlnYXRpb25Qb2xpY3koUmVzb3VyY2VS ZXF1ZXN0JiYgcmVxdWVzdCwgYm9vbCBkaWRSZWMKICAgICAgICAgICAgICAgICBoYW5kbGVVbmlt cGxlbWVudGFibGVQb2xpY3kobV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5jYW5ub3RTaG93VVJM RXJyb3IocmVxdWVzdCkpOwogICAgICAgICAgICAgICAgIHJldHVybiBmdW5jdGlvbih7IH0sIG51 bGxwdHIsIFNob3VsZENvbnRpbnVlOjpObyk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBy ZXR1cm4gZnVuY3Rpb24oV1RGTW92ZShyZXF1ZXN0KSwgV1RGTW92ZShmb3JtU3RhdGUpLCBTaG91 bGRDb250aW51ZTo6WWVzKTsKKyAgICAgICAgICAgIHJldHVybiBmdW5jdGlvbihXVEZNb3ZlKHJl cXVlc3QpLCBmb3JtU3RhdGUuZ2V0KCksIFNob3VsZENvbnRpbnVlOjpZZXMpOwogICAgICAgICB9 CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0pOwpAQCAtMjAxLDcgKzIwMSw3 IEBAIHZvaWQgUG9saWN5Q2hlY2tlcjo6Y2hlY2tOZXdXaW5kb3dQb2xpY3koTmF2aWdhdGlvbkFj dGlvbiYmIG5hdmlnYXRpb25BY3Rpb24sIFJlCiAKICAgICBhdXRvIGJsb2JVUkxMaWZldGltZUV4 dGVuc2lvbiA9IGV4dGVuZEJsb2JVUkxMaWZldGltZUlmTmVjZXNzYXJ5KHJlcXVlc3QpOwogCi0g ICAgbV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5kaXNwYXRjaERlY2lkZVBvbGljeUZvck5ld1dp bmRvd0FjdGlvbihuYXZpZ2F0aW9uQWN0aW9uLCByZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFt ZSwgW2ZyYW1lID0gbWFrZVJlZihtX2ZyYW1lKSwgcmVxdWVzdCwgZm9ybVN0YXRlID0gbWFrZVdl YWtQdHIoZm9ybVN0YXRlKSwgZnJhbWVOYW1lLCBuYXZpZ2F0aW9uQWN0aW9uLCBmdW5jdGlvbiA9 IFdURk1vdmUoZnVuY3Rpb24pLCBibG9iVVJMTGlmZXRpbWVFeHRlbnNpb24gPSBXVEZNb3ZlKGJs b2JVUkxMaWZldGltZUV4dGVuc2lvbildKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pIG11dGFi bGUgeworICAgIG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuZGlzcGF0Y2hEZWNpZGVQb2xpY3lG b3JOZXdXaW5kb3dBY3Rpb24obmF2aWdhdGlvbkFjdGlvbiwgcmVxdWVzdCwgZm9ybVN0YXRlLCBm cmFtZU5hbWUsIFtmcmFtZSA9IG1ha2VSZWYobV9mcmFtZSksIHJlcXVlc3QsIGZvcm1TdGF0ZSA9 IG1ha2VSZWZQdHIoZm9ybVN0YXRlKSwgZnJhbWVOYW1lLCBuYXZpZ2F0aW9uQWN0aW9uLCBmdW5j dGlvbiA9IFdURk1vdmUoZnVuY3Rpb24pLCBibG9iVVJMTGlmZXRpbWVFeHRlbnNpb24gPSBXVEZN b3ZlKGJsb2JVUkxMaWZldGltZUV4dGVuc2lvbildKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24p IG11dGFibGUgewogICAgICAgICBzd2l0Y2ggKHBvbGljeUFjdGlvbikgewogICAgICAgICBjYXNl IFBvbGljeUFjdGlvbjo6RG93bmxvYWQ6CiAgICAgICAgICAgICBmcmFtZS0+bG9hZGVyKCkuY2xp ZW50KCkuc3RhcnREb3dubG9hZChyZXF1ZXN0KTsKQEAgLTIxMyw3ICsyMTMsNyBAQCB2b2lkIFBv bGljeUNoZWNrZXI6OmNoZWNrTmV3V2luZG93UG9saWN5KE5hdmlnYXRpb25BY3Rpb24mJiBuYXZp Z2F0aW9uQWN0aW9uLCBSZQogICAgICAgICAgICAgLy8gSXQgaXMgaW52YWxpZCB0byBnZXQgYSAi U3VzcGVuZCIgcG9saWN5IGZvciBuZXcgd2luZG93cywgYXMgdGhlIG9sZCBkb2N1bWVudCBpcyBu b3QgZ29pbmcgYXdheS4KICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7 CiAgICAgICAgIGNhc2UgUG9saWN5QWN0aW9uOjpVc2U6Ci0gICAgICAgICAgICBmdW5jdGlvbihy ZXF1ZXN0LCBXVEZNb3ZlKGZvcm1TdGF0ZSksIGZyYW1lTmFtZSwgbmF2aWdhdGlvbkFjdGlvbiwg U2hvdWxkQ29udGludWU6Olllcyk7CisgICAgICAgICAgICBmdW5jdGlvbihyZXF1ZXN0LCBmb3Jt U3RhdGUuZ2V0KCksIGZyYW1lTmFtZSwgbmF2aWdhdGlvbkFjdGlvbiwgU2hvdWxkQ29udGludWU6 Olllcyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5Q2hl Y2tlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuaAppbmRleCA2ZjEx MjExOTE0NmM0OGI0ZWI0ZTliMDI2ODFkYzBlOWIyYWY1NmYwLi5jMzI5ZWM0M2I4MWUzNWU4Yjcz YWJlNmU2MDFkMTNkNDI1MDg1MmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UG9saWN5Q2hlY2tlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lDaGVja2Vy LmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LTIwMTggQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LTIwMTYgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5 IFRvcmNoIE1vYmlsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIChodHRwOi8vd3d3LnRvcmNo bW9iaWxlLmNvbS8pCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zMSw3ICszMSw2IEBACiAKICNpbmNs dWRlICJGcmFtZUxvYWRlclR5cGVzLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0LmgiCi0j aW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IAogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKQEAgLTYwLDggKzU5LDggQEAgZW51bSBj bGFzcyBTaG91bGRDb250aW51ZSB7CiAKIGVudW0gY2xhc3MgUG9saWN5RGVjaXNpb25Nb2RlIHsg U3luY2hyb25vdXMsIEFzeW5jaHJvbm91cyB9OwogCi11c2luZyBOZXdXaW5kb3dQb2xpY3lEZWNp c2lvbkZ1bmN0aW9uID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBSZXNvdXJjZVJlcXVl c3QmLCBXZWFrUHRyPEZvcm1TdGF0ZT4mJiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0 IE5hdmlnYXRpb25BY3Rpb24mLCBTaG91bGRDb250aW51ZSk+OwotdXNpbmcgTmF2aWdhdGlvblBv bGljeURlY2lzaW9uRnVuY3Rpb24gPSBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFJlc291cmNlUmVx dWVzdCYmLCBXZWFrUHRyPEZvcm1TdGF0ZT4mJiwgU2hvdWxkQ29udGludWUpPjsKK3VzaW5nIE5l d1dpbmRvd1BvbGljeURlY2lzaW9uRnVuY3Rpb24gPSBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNv bnN0IFJlc291cmNlUmVxdWVzdCYsIEZvcm1TdGF0ZSosIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1l LCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiwgU2hvdWxkQ29udGludWUpPjsKK3VzaW5nIE5hdmln YXRpb25Qb2xpY3lEZWNpc2lvbkZ1bmN0aW9uID0gQ29tcGxldGlvbkhhbmRsZXI8dm9pZChSZXNv dXJjZVJlcXVlc3QmJiwgRm9ybVN0YXRlKiwgU2hvdWxkQ29udGludWUpPjsKIAogY2xhc3MgUG9s aWN5Q2hlY2tlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUG9saWN5Q2hlY2tlcik7Cg==