130924 2014-03-28 18:31:42 -0700 Land the stackmap register liveness glue with the uses of the liveness disabled 2014-03-30 11:44:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 130791 1 fpizlo fpizlo atrick barraclough commit-queue ggaren juergen mark.lam mhahnenberg msaboff nrotem oliver sam oldest_to_newest 995534 0 fpizlo 2014-03-28 18:31:42 -0700 Patch forthcoming. 995535 1 228102 fpizlo 2014-03-28 18:35:33 -0700 Created attachment 228102 the patch 995536 2 commit-queue 2014-03-28 18:37:44 -0700 Attachment 228102 did not pass style-queue: ERROR: Source/JavaScriptCore/ftl/FTLSlowPathCallKey.h:58: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/JavaScriptCore/jit/Repatch.cpp:1148: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 2 in 16 files If any of these errors are false positives, please file a bug against check-webkit-style. 995673 3 fpizlo 2014-03-30 11:44:20 -0700 Landed in http://trac.webkit.org/changeset/166463 228102 2014-03-28 18:35:33 -0700 2014-03-28 21:07:34 -0700 the patch blah.patch text/plain 27138 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTY2NDQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBA CisyMDE0LTAzLTI4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg TGFuZCB0aGUgc3RhY2ttYXAgcmVnaXN0ZXIgbGl2ZW5lc3MgZ2x1ZSB3aXRoIHRoZSB1c2VzIG9m IHRoZSBsaXZlbmVzcyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMwOTI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisgICAgICAgIAorICAgICAgICBBZGQgdGhlIGxpdmVuZXNzIGFuZCBmaXggb3RoZXIgYnVn cyBJIGZvdW5kLgorCisgICAgICAgICogYnl0ZWNvZGUvUHV0QnlJZFN0YXR1cy5jcHA6CisgICAg ICAgIChKU0M6OlB1dEJ5SWRTdGF0dXM6OmNvbXB1dGVGb3IpOgorICAgICAgICAqIGZ0bC9GVExD b21waWxlLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjp1c2VkUmVnaXN0ZXJzRm9yKToKKyAgICAg ICAgKEpTQzo6RlRMOjpmaXhGdW5jdGlvbkJhc2VkT25TdGFja01hcHMpOgorICAgICAgICAqIGZ0 bC9GVExTbG93UGF0aENhbGwuY3BwOgorICAgICAgICAqIGZ0bC9GVExTbG93UGF0aENhbGxLZXku Y3BwOgorICAgICAgICAoSlNDOjpGVEw6OlNsb3dQYXRoQ2FsbEtleTo6ZHVtcCk6CisgICAgICAg ICogZnRsL0ZUTFNsb3dQYXRoQ2FsbEtleS5oOgorICAgICAgICAoSlNDOjpGVEw6OlNsb3dQYXRo Q2FsbEtleTo6U2xvd1BhdGhDYWxsS2V5KToKKyAgICAgICAgKEpTQzo6RlRMOjpTbG93UGF0aENh bGxLZXk6OmFyZ3VtZW50UmVnaXN0ZXJzKToKKyAgICAgICAgKEpTQzo6RlRMOjpTbG93UGF0aENh bGxLZXk6OndpdGhDYWxsVGFyZ2V0KToKKyAgICAgICAgKiBmdGwvRlRMU3RhY2tNYXBzLmNwcDoK KyAgICAgICAgKEpTQzo6RlRMOjpTdGFja01hcHM6OlJlY29yZDo6bG9jYXRpb25TZXQpOgorICAg ICAgICAoSlNDOjpGVEw6OlN0YWNrTWFwczo6UmVjb3JkOjpsaXZlT3V0c1NldCk6CisgICAgICAg IChKU0M6OkZUTDo6U3RhY2tNYXBzOjpSZWNvcmQ6OnVzZWRSZWdpc3RlclNldCk6CisgICAgICAg ICogZnRsL0ZUTFN0YWNrTWFwcy5oOgorICAgICAgICAqIGZ0bC9GVExUaHVua3MuY3BwOgorICAg ICAgICAoSlNDOjpGVEw6OnJlZ2lzdGVyQ2xvYmJlckNoZWNrKToKKyAgICAgICAgKEpTQzo6RlRM OjpzbG93UGF0aENhbGxUaHVua0dlbmVyYXRvcik6CisgICAgICAgICogaml0L1JlZ2lzdGVyU2V0 LmNwcDoKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXJTZXQ6OnN0YWNrUmVnaXN0ZXJzKToKKyAgICAg ICAgKEpTQzo6UmVnaXN0ZXJTZXQ6OnJlc2VydmVkSGFyZHdhcmVSZWdpc3RlcnMpOgorICAgICAg ICAoSlNDOjpSZWdpc3RlclNldDo6cnVudGltZVJlZ2lzdGVycyk6CisgICAgICAgIChKU0M6OlJl Z2lzdGVyU2V0OjpzcGVjaWFsUmVnaXN0ZXJzKToKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXJTZXQ6 OmR1bXApOgorICAgICAgICAqIGppdC9SZWdpc3RlclNldC5oOgorICAgICAgICAoSlNDOjpSZWdp c3RlclNldDo6UmVnaXN0ZXJTZXQpOgorICAgICAgICAoSlNDOjpSZWdpc3RlclNldDo6c2V0QW55 KToKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXJTZXQ6OnNldE1hbnkpOgorICAgICAgICAqIGppdC9S ZXBhdGNoLmNwcDoKKyAgICAgICAgKEpTQzo6dHJ5Q2FjaGVHZXRCeUlEKToKKyAgICAgICAgKEpT Qzo6dHJ5Q2FjaGVQdXRCeUlEKToKKyAgICAgICAgKEpTQzo6dHJ5UmVwYXRjaEluKToKKyAgICAg ICAgKiBydW50aW1lL09wdGlvbnMuY3BwOgorICAgICAgICAoSlNDOjpyZWNvbXB1dGVEZXBlbmRl bnRPcHRpb25zKToKKyAgICAgICAgKiBydW50aW1lL09wdGlvbnMuaDoKKwogMjAxNC0wMy0yOCAg TWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgbWFuZHJlZWwgdGhyb3dz IGEgY2hlY2tzdW0gZXJyb3Igb24gMzItYml0IHg4Ni4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9QdXRCeUlkU3RhdHVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvUHV0QnlJZFN0YXR1cy5jcHAJKHJldmlzaW9uIDE2NjM1OCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9QdXRCeUlkU3RhdHVzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjM4LDcgKzIzOCwxMCBAQCBQdXRCeUlkU3RhdHVzIFB1dEJ5SWRTdGF0 dXM6OmNvbXB1dGVGb3IoCiAgICAgICAgICAgICByZXN1bHQgPSBjb21wdXRlRm9yU3R1YkluZm8o bG9ja2VyLCBkZmdCbG9jaywgZGZnTWFwLmdldChjb2RlT3JpZ2luKSwgdWlkKTsKICAgICAgICAg fQogICAgICAgICAKLSAgICAgICAgaWYgKHJlc3VsdC5pc1NldCgpKQorICAgICAgICAvLyBXZSB1 c2UgVGFrZXNTbG93UGF0aCBpbiBzb21lIGNhc2VzIHdoZXJlIHRoZSBzdHViIHdhcyB1bnNldC4g VGhhdCdzIHdlaXJkIGFuZAorICAgICAgICAvLyBpdCB3b3VsZCBiZSBiZXR0ZXIgbm90IHRvIGRv IHRoYXQuIEJ1dCBpdCBtZWFucyB0aGF0IHdlIGhhdmUgdG8gZGVmZW5kCisgICAgICAgIC8vIG91 cnNlbHZlcyBoZXJlLgorICAgICAgICBpZiAocmVzdWx0LmlzU2ltcGxlKCkpCiAgICAgICAgICAg ICByZXR1cm4gcmVzdWx0OwogICAgIH0KICNlbHNlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZnRsL0ZUTENvbXBpbGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9mdGwvRlRMQ29tcGlsZS5jcHAJKHJldmlzaW9uIDE2NjM1OCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMQ29tcGlsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Myw2ICsxNjMs MTMgQEAgdm9pZCBnZW5lcmF0ZUlDRmFzdFBhdGgoCiAgICAgfQogfQogCitzdGF0aWMgUmVnaXN0 ZXJTZXQgdXNlZFJlZ2lzdGVyc0Zvcihjb25zdCBTdGFja01hcHM6OlJlY29yZCYgcmVjb3JkKQor eworICAgIGlmIChPcHRpb25zOjphc3N1bWVBbGxSZWdzSW5GVExJQ0FyZUxpdmUoKSkKKyAgICAg ICAgcmV0dXJuIFJlZ2lzdGVyU2V0OjphbGxSZWdpc3RlcnMoKTsKKyAgICByZXR1cm4gcmVjb3Jk LnVzZWRSZWdpc3RlclNldCgpOworfQorCiBzdGF0aWMgdm9pZCBmaXhGdW5jdGlvbkJhc2VkT25T dGFja01hcHMoCiAgICAgU3RhdGUmIHN0YXRlLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgSklUQ29k ZSogaml0Q29kZSwgR2VuZXJhdGVkRnVuY3Rpb24gZ2VuZXJhdGVkRnVuY3Rpb24sCiAgICAgU3Rh Y2tNYXBzOjpSZWNvcmRNYXAmIHJlY29yZE1hcCwgYm9vbCBkaWRTZWVVbndpbmRJbmZvKQpAQCAt MzAwLDkgKzMwNyw3IEBAIHN0YXRpYyB2b2lkIGZpeEZ1bmN0aW9uQmFzZWRPblN0YWNrTWFwcygK ICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpdGVyLT52YWx1ZS5zaXplKCk7 ICsraSkgewogICAgICAgICAgICAgICAgIFN0YWNrTWFwczo6UmVjb3JkJiByZWNvcmQgPSBpdGVy LT52YWx1ZVtpXTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBVc2Ug dGhlIGxpdmVuZXNzIGluZm9ybWF0aW9uIHRoYXQgTExWTSBnaXZlcyB1cy4KLSAgICAgICAgICAg ICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNzkxCi0g ICAgICAgICAgICAgICAgUmVnaXN0ZXJTZXQgdXNlZFJlZ2lzdGVycyA9IFJlZ2lzdGVyU2V0Ojph bGxSZWdpc3RlcnMoKTsKKyAgICAgICAgICAgICAgICBSZWdpc3RlclNldCB1c2VkUmVnaXN0ZXJz ID0gdXNlZFJlZ2lzdGVyc0ZvcihyZWNvcmQpOwogICAgICAgICAgICAgICAgIAogICAgICAgICAg ICAgICAgIEdQUlJlZyByZXN1bHQgPSByZWNvcmQubG9jYXRpb25zWzBdLmRpcmVjdEdQUigpOwog ICAgICAgICAgICAgICAgIEdQUlJlZyBiYXNlID0gcmVjb3JkLmxvY2F0aW9uc1sxXS5kaXJlY3RH UFIoKTsKQEAgLTMzOSw5ICszNDQsNyBAQCBzdGF0aWMgdm9pZCBmaXhGdW5jdGlvbkJhc2VkT25T dGFja01hcHMoCiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaXRlci0+dmFs dWUuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgICAgICAgICBTdGFja01hcHM6OlJlY29yZCYgcmVj b3JkID0gaXRlci0+dmFsdWVbaV07CiAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAg Ly8gRklYTUU6IFVzZSB0aGUgbGl2ZW5lc3MgaW5mb3JtYXRpb24gdGhhdCBMTFZNIGdpdmVzIHVz LgotICAgICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzA3OTEKLSAgICAgICAgICAgICAgICBSZWdpc3RlclNldCB1c2VkUmVnaXN0ZXJzID0g UmVnaXN0ZXJTZXQ6OmFsbFJlZ2lzdGVycygpOworICAgICAgICAgICAgICAgIFJlZ2lzdGVyU2V0 IHVzZWRSZWdpc3RlcnMgPSB1c2VkUmVnaXN0ZXJzRm9yKHJlY29yZCk7CiAgICAgICAgICAgICAg ICAgCiAgICAgICAgICAgICAgICAgR1BSUmVnIGJhc2UgPSByZWNvcmQubG9jYXRpb25zWzBdLmRp cmVjdEdQUigpOwogICAgICAgICAgICAgICAgIEdQUlJlZyB2YWx1ZSA9IHJlY29yZC5sb2NhdGlv bnNbMV0uZGlyZWN0R1BSKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFNs b3dQYXRoQ2FsbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExTbG93UGF0aENhbGwuY3BwCShyZXZpc2lvbiAxNjYzNTgpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTFNsb3dQYXRoQ2FsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3LDcgKzY3 LDggQEAgcHVibGljOgogICAgICAgICAgICAgKHN0ZDo6bWF4KG1fbnVtQXJncywgTlVNQkVSX09G X0FSR1VNRU5UX1JFR0lTVEVSUykgLSBOVU1CRVJfT0ZfQVJHVU1FTlRfUkVHSVNURVJTKSAqIHdv cmRTaXplOwogICAgICAgICAKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gc3RkOjptaW4oTlVN QkVSX09GX0FSR1VNRU5UX1JFR0lTVEVSUywgbnVtQXJncyk7IGktLTspCi0gICAgICAgICAgICBt X2NhbGxpbmdDb252ZW50aW9uUmVnaXN0ZXJzLnNldChHUFJJbmZvOjp0b0FyZ3VtZW50UmVnaXN0 ZXIoaSkpOworICAgICAgICAgICAgbV9hcmd1bWVudFJlZ2lzdGVycy5zZXQoR1BSSW5mbzo6dG9B cmd1bWVudFJlZ2lzdGVyKGkpKTsKKyAgICAgICAgbV9jYWxsaW5nQ29udmVudGlvblJlZ2lzdGVy cy5tZXJnZShtX2FyZ3VtZW50UmVnaXN0ZXJzKTsKICAgICAgICAgaWYgKHJldHVyblJlZ2lzdGVy ICE9IEludmFsaWRHUFJSZWcpCiAgICAgICAgICAgICBtX2NhbGxpbmdDb252ZW50aW9uUmVnaXN0 ZXJzLnNldChHUFJJbmZvOjpyZXR1cm5WYWx1ZUdQUik7CiAgICAgICAgIG1fY2FsbGluZ0NvbnZl bnRpb25SZWdpc3RlcnMuZmlsdGVyKG1fdXNlZFJlZ2lzdGVycyk7CkBAIC04NCw5ICs4NSw3IEBA IHB1YmxpYzoKICAgICAgICAgICAgIHN0YWNrQnl0ZXNOZWVkZWRGb3JSZXR1cm5BZGRyZXNzICsK ICAgICAgICAgICAgIChtX3VzZWRSZWdpc3RlcnMubnVtYmVyT2ZTZXRSZWdpc3RlcnMoKSAtIG51 bWJlck9mQ2FsbGluZ0NvbnZlbnRpb25SZWdpc3RlcnMpICogd29yZFNpemU7CiAgICAgICAgIAot ICAgICAgICBzaXplX3Qgc3RhY2tBbGlnbm1lbnQgPSAxNjsKLSAgICAgICAgCi0gICAgICAgIG1f c3RhY2tCeXRlc05lZWRlZCA9IChtX3N0YWNrQnl0ZXNOZWVkZWQgKyBzdGFja0FsaWdubWVudCAt IDEpICYgfihzdGFja0FsaWdubWVudCAtIDEpOworICAgICAgICBtX3N0YWNrQnl0ZXNOZWVkZWQg PSAobV9zdGFja0J5dGVzTmVlZGVkICsgc3RhY2tBbGlnbm1lbnRCeXRlcygpIC0gMSkgJiB+KHN0 YWNrQWxpZ25tZW50Qnl0ZXMoKSAtIDEpOwogICAgICAgICAKICAgICAgICAgbV9qaXQuc3ViUHRy KENDYWxsSGVscGVyczo6VHJ1c3RlZEltbTMyKG1fc3RhY2tCeXRlc05lZWRlZCksIENDYWxsSGVs cGVyczo6c3RhY2tQb2ludGVyUmVnaXN0ZXIpOwogICAgICAgICAKQEAgLTEzMyw3ICsxMzIsNyBA QCBwdWJsaWM6CiAgICAgCiAgICAgU2xvd1BhdGhDYWxsS2V5IGtleVdpdGhUYXJnZXQodm9pZCog Y2FsbFRhcmdldCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBTbG93UGF0aENhbGxLZXko dXNlZFJlZ2lzdGVycygpLCBjYWxsVGFyZ2V0LCBvZmZzZXQoKSk7CisgICAgICAgIHJldHVybiBT bG93UGF0aENhbGxLZXkodXNlZFJlZ2lzdGVycygpLCBjYWxsVGFyZ2V0LCBtX2FyZ3VtZW50UmVn aXN0ZXJzLCBvZmZzZXQoKSk7CiAgICAgfQogICAgIAogICAgIE1hY3JvQXNzZW1ibGVyOjpDYWxs IG1ha2VDYWxsKHZvaWQqIGNhbGxUYXJnZXQsIE1hY3JvQXNzZW1ibGVyOjpKdW1wTGlzdCogZXhj ZXB0aW9uVGFyZ2V0KQpAQCAtMTQ5LDYgKzE0OCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAg U3RhdGUmIG1fc3RhdGU7CiAgICAgUmVnaXN0ZXJTZXQgbV91c2VkUmVnaXN0ZXJzOworICAgIFJl Z2lzdGVyU2V0IG1fYXJndW1lbnRSZWdpc3RlcnM7CiAgICAgUmVnaXN0ZXJTZXQgbV9jYWxsaW5n Q29udmVudGlvblJlZ2lzdGVyczsKICAgICBDQ2FsbEhlbHBlcnMmIG1faml0OwogICAgIHVuc2ln bmVkIG1fbnVtQXJnczsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU2xvd1Bh dGhDYWxsS2V5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZU TFNsb3dQYXRoQ2FsbEtleS5jcHAJKHJldmlzaW9uIDE2NjM1OCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9mdGwvRlRMU2xvd1BhdGhDYWxsS2V5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIs NyArMzIsNyBAQCBuYW1lc3BhY2UgSlNDIHsgbmFtZXNwYWNlIEZUTCB7CiAKIHZvaWQgU2xvd1Bh dGhDYWxsS2V5OjpkdW1wKFByaW50U3RyZWFtJiBvdXQpIGNvbnN0CiB7Ci0gICAgb3V0LnByaW50 KCI8dXNlZFJlZ2lzdGVycyA9ICIsIG1fdXNlZFJlZ2lzdGVycywgIiwgb2Zmc2V0ID0gIiwgbV9v ZmZzZXQsICIsIGNhbGxUYXJnZXQgPSAiLCBSYXdQb2ludGVyKG1fY2FsbFRhcmdldCksICI+Iik7 CisgICAgb3V0LnByaW50KCI8dXNlZFJlZ2lzdGVycyA9ICIsIG1fdXNlZFJlZ2lzdGVycywgIiwg b2Zmc2V0ID0gIiwgbV9vZmZzZXQsICIsIGNhbGxUYXJnZXQgPSAiLCBSYXdQb2ludGVyKG1fY2Fs bFRhcmdldCksICIsIGFyZ3VtZW50UmVnaXN0ZXJzID0gIiwgbV9hcmd1bWVudFJlZ2lzdGVycywg Ij4iKTsKIH0KIAogfSB9IC8vIG5hbWVzcGFjZSBKU0M6OkZUTApJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExTbG93UGF0aENhbGxLZXkuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZnRsL0ZUTFNsb3dQYXRoQ2FsbEtleS5oCShyZXZpc2lvbiAxNjYzNTgp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFNsb3dQYXRoQ2FsbEtleS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01MCwyMCArNTAsMjQgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAgICAg Ci0gICAgU2xvd1BhdGhDYWxsS2V5KGNvbnN0IFJlZ2lzdGVyU2V0JiBzZXQsIHZvaWQqIGNhbGxU YXJnZXQsIHB0cmRpZmZfdCBvZmZzZXQpCisgICAgU2xvd1BhdGhDYWxsS2V5KAorICAgICAgICBj b25zdCBSZWdpc3RlclNldCYgc2V0LCB2b2lkKiBjYWxsVGFyZ2V0LCBjb25zdCBSZWdpc3RlclNl dCYgYXJndW1lbnRSZWdpc3RlcnMsCisgICAgICAgIHB0cmRpZmZfdCBvZmZzZXQpCiAgICAgICAg IDogbV91c2VkUmVnaXN0ZXJzKHNldCkKICAgICAgICAgLCBtX2NhbGxUYXJnZXQoY2FsbFRhcmdl dCkKKyAgICAgICAgLCBtX2FyZ3VtZW50UmVnaXN0ZXJzKGFyZ3VtZW50UmVnaXN0ZXJzKQogICAg ICAgICAsIG1fb2Zmc2V0KG9mZnNldCkKICAgICB7CiAgICAgfQogICAgIAogICAgIGNvbnN0IFJl Z2lzdGVyU2V0JiB1c2VkUmVnaXN0ZXJzKCkgY29uc3QgeyByZXR1cm4gbV91c2VkUmVnaXN0ZXJz OyB9CiAgICAgdm9pZCogY2FsbFRhcmdldCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FsbFRhcmdldDsg fQorICAgIGNvbnN0IFJlZ2lzdGVyU2V0JiBhcmd1bWVudFJlZ2lzdGVycygpIGNvbnN0IHsgcmV0 dXJuIG1fYXJndW1lbnRSZWdpc3RlcnM7IH0KICAgICBwdHJkaWZmX3Qgb2Zmc2V0KCkgY29uc3Qg eyByZXR1cm4gbV9vZmZzZXQ7IH0KICAgICAKICAgICBTbG93UGF0aENhbGxLZXkgd2l0aENhbGxU YXJnZXQodm9pZCogY2FsbFRhcmdldCkKICAgICB7Ci0gICAgICAgIHJldHVybiBTbG93UGF0aENh bGxLZXkodXNlZFJlZ2lzdGVycygpLCBjYWxsVGFyZ2V0LCBvZmZzZXQoKSk7CisgICAgICAgIHJl dHVybiBTbG93UGF0aENhbGxLZXkodXNlZFJlZ2lzdGVycygpLCBjYWxsVGFyZ2V0LCBhcmd1bWVu dFJlZ2lzdGVycygpLCBvZmZzZXQoKSk7CiAgICAgfQogICAgIAogICAgIHZvaWQgZHVtcChQcmlu dFN0cmVhbSYpIGNvbnN0OwpAQCAtMTAyLDYgKzEwNiw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgUmVnaXN0ZXJTZXQgbV91c2VkUmVnaXN0ZXJzOwogICAgIHZvaWQqIG1fY2FsbFRhcmdldDsK KyAgICBSZWdpc3RlclNldCBtX2FyZ3VtZW50UmVnaXN0ZXJzOwogICAgIHB0cmRpZmZfdCBtX29m ZnNldDsKIH07CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFN0YWNrTWFw cy5jcHAJKHJldmlzaW9uIDE2NjM1OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRM U3RhY2tNYXBzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ5LDYgKzE0OSw0NCBAQCB2b2lkIFN0 YWNrTWFwczo6UmVjb3JkOjpkdW1wKFByaW50U3RyZWFtCiAgICAgICAgIGxpc3REdW1wKGxpdmVP dXRzKSwgIl0pIik7CiB9CiAKK1JlZ2lzdGVyU2V0IFN0YWNrTWFwczo6UmVjb3JkOjpsb2NhdGlv blNldCgpIGNvbnN0Cit7CisgICAgUmVnaXN0ZXJTZXQgcmVzdWx0OworICAgIGZvciAodW5zaWdu ZWQgaSA9IGxvY2F0aW9ucy5zaXplKCk7IGktLTspIHsKKyAgICAgICAgUmVnIHJlZyA9IGxvY2F0 aW9uc1tpXS5kd2FyZlJlZy5yZWcoKTsKKyAgICAgICAgaWYgKCFyZWcpCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgcmVzdWx0LnNldChyZWcpOworICAgIH0KKyAgICByZXR1cm4gcmVz dWx0OworfQorCitSZWdpc3RlclNldCBTdGFja01hcHM6OlJlY29yZDo6bGl2ZU91dHNTZXQoKSBj b25zdAoreworICAgIFJlZ2lzdGVyU2V0IHJlc3VsdDsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSBs aXZlT3V0cy5zaXplKCk7IGktLTspIHsKKyAgICAgICAgTGl2ZU91dCBsaXZlT3V0ID0gbGl2ZU91 dHNbaV07CisgICAgICAgIFJlZyByZWcgPSBsaXZlT3V0LmR3YXJmUmVnLnJlZygpOworICAgICAg ICAvLyBGSVhNRTogRWl0aGVyIGFzc2VydCB0aGF0IHNpemUgaXMgbm90IGdyZWF0ZXIgdGhhbiBz aXplb2YocG9pbnRlciksIG9yIGFjdHVhbGx5CisgICAgICAgIC8vIHNhdmUgdGhlIGhpZ2ggYml0 cyBvZiByZWdpc3RlcnMuCisgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzA4ODUKKyAgICAgICAgaWYgKCFyZWcpIHsKKyAgICAgICAgICAgIGRhdGFM b2coIkludmFsaWQgbGl2ZU91dHMgZW50cnkgaW46ICIsICp0aGlzLCAiXG4iKTsKKyAgICAgICAg ICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIH0KKyAgICAgICAgcmVz dWx0LnNldChyZWcpOworICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OworfQorCitSZWdpc3RlclNl dCBTdGFja01hcHM6OlJlY29yZDo6dXNlZFJlZ2lzdGVyU2V0KCkgY29uc3QKK3sKKyAgICBSZWdp c3RlclNldCByZXN1bHQ7CisgICAgcmVzdWx0Lm1lcmdlKGxvY2F0aW9uU2V0KCkpOworICAgIHJl c3VsdC5tZXJnZShsaXZlT3V0c1NldCgpKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBib29s IFN0YWNrTWFwczo6cGFyc2UoRGF0YVZpZXcqIHZpZXcpCiB7CiAgICAgUGFyc2VDb250ZXh0IGNv bnRleHQ7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTFN0YWNrTWFwcy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBzLmgJKHJl dmlzaW9uIDE2NjM1OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMU3RhY2tNYXBz LmgJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJEYXRhVmlldy5o IgogI2luY2x1ZGUgIkZUTERXQVJGUmVnaXN0ZXIuaCIKICNpbmNsdWRlICJHUFJJbmZvLmgiCisj aW5jbHVkZSAiUmVnaXN0ZXJTZXQuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogCiBuYW1l c3BhY2UgSlNDIHsKQEAgLTEwNiw2ICsxMDcsMTAgQEAgc3RydWN0IFN0YWNrTWFwcyB7CiAgICAg ICAgIAogICAgICAgICBib29sIHBhcnNlKFBhcnNlQ29udGV4dCYpOwogICAgICAgICB2b2lkIGR1 bXAoUHJpbnRTdHJlYW0mKSBjb25zdDsKKyAgICAgICAgCisgICAgICAgIFJlZ2lzdGVyU2V0IGxp dmVPdXRzU2V0KCkgY29uc3Q7CisgICAgICAgIFJlZ2lzdGVyU2V0IGxvY2F0aW9uU2V0KCkgY29u c3Q7CisgICAgICAgIFJlZ2lzdGVyU2V0IHVzZWRSZWdpc3RlclNldCgpIGNvbnN0OwogICAgIH07 CiAKICAgICB1bnNpZ25lZCB2ZXJzaW9uOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0 bC9GVExUaHVua3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwv RlRMVGh1bmtzLmNwcAkocmV2aXNpb24gMTY2MzU4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2Z0bC9GVExUaHVua3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsNiArMTA2LDM0IEBAIE1h Y3JvQXNzZW1ibGVyQ29kZVJlZiBvc3JFeGl0R2VuZXJhdGlvblQKICAgICByZXR1cm4gRklOQUxJ WkVfQ09ERShwYXRjaEJ1ZmZlciwgKCJGVEwgT1NSIGV4aXQgZ2VuZXJhdGlvbiB0aHVuayIpKTsK IH0KIAorc3RhdGljIHZvaWQgcmVnaXN0ZXJDbG9iYmVyQ2hlY2soQXNzZW1ibHlIZWxwZXJzJiBq aXQsIFJlZ2lzdGVyU2V0IGRvbnRDbG9iYmVyKQoreworICAgIGlmICghT3B0aW9uczo6Y2xvYmJl ckFsbFJlZ3NJbkZUTElDU2xvd1BhdGgoKSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIFJl Z2lzdGVyU2V0IGNsb2JiZXIgPSBSZWdpc3RlclNldDo6YWxsUmVnaXN0ZXJzKCk7CisgICAgY2xv YmJlci5leGNsdWRlKFJlZ2lzdGVyU2V0OjpyZXNlcnZlZEhhcmR3YXJlUmVnaXN0ZXJzKCkpOwor ICAgIGNsb2JiZXIuZXhjbHVkZShSZWdpc3RlclNldDo6c3RhY2tSZWdpc3RlcnMoKSk7CisgICAg Y2xvYmJlci5leGNsdWRlKFJlZ2lzdGVyU2V0OjpjYWxsZWVTYXZlUmVnaXN0ZXJzKCkpOworICAg IGNsb2JiZXIuZXhjbHVkZShkb250Q2xvYmJlcik7CisgICAgCisgICAgR1BSUmVnIHNvbWVHUFI7 CisgICAgZm9yIChSZWcgcmVnID0gUmVnOjpmaXJzdCgpOyByZWcgPD0gUmVnOjpsYXN0KCk7IHJl ZyA9IHJlZy5uZXh0KCkpIHsKKyAgICAgICAgaWYgKCFjbG9iYmVyLmdldChyZWcpIHx8ICFyZWcu aXNHUFIoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAKKyAgICAgICAgaml0Lm1v dmUoQXNzZW1ibHlIZWxwZXJzOjpUcnVzdGVkSW1tMzIoMHgxMzM3YmVlZiksIHJlZy5ncHIoKSk7 CisgICAgICAgIHNvbWVHUFIgPSByZWcuZ3ByKCk7CisgICAgfQorICAgIAorICAgIGZvciAoUmVn IHJlZyA9IFJlZzo6Zmlyc3QoKTsgcmVnIDw9IFJlZzo6bGFzdCgpOyByZWcgPSByZWcubmV4dCgp KSB7CisgICAgICAgIGlmICghY2xvYmJlci5nZXQocmVnKSB8fCAhcmVnLmlzRlBSKCkpCisgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgCisgICAgICAgIGppdC5tb3ZlNjRUb0RvdWJsZShz b21lR1BSLCByZWcuZnByKCkpOworICAgIH0KK30KKwogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIHNs b3dQYXRoQ2FsbFRodW5rR2VuZXJhdG9yKFZNJiB2bSwgY29uc3QgU2xvd1BhdGhDYWxsS2V5JiBr ZXkpCiB7CiAgICAgQXNzZW1ibHlIZWxwZXJzIGppdCgmdm0sIDApOwpAQCAtMTM0LDEzICsxNjIs MTMgQEAgTWFjcm9Bc3NlbWJsZXJDb2RlUmVmIHNsb3dQYXRoQ2FsbFRodW5rRwogICAgICAgICBj dXJyZW50T2Zmc2V0ICs9IHNpemVvZihkb3VibGUpOwogICAgIH0KICAgICAKLSAgICAvLyBGSVhN RTogQ1N0YWNrIC0gTmVlZCB0byBkbyBzb2VtZXRoaW5nIGxpa2Ugaml0LmVtaXRGdW5jdGlvblBy b2xvZ3VlKCk7CiAgICAgaml0LnByZXNlcnZlUmV0dXJuQWRkcmVzc0FmdGVyQ2FsbChHUFJJbmZv Ojpub25BcmdHUFIwKTsKICAgICBqaXQuc3RvcmVQdHIoR1BSSW5mbzo6bm9uQXJnR1BSMCwgQXNz ZW1ibHlIZWxwZXJzOjpBZGRyZXNzKE1hY3JvQXNzZW1ibGVyOjpzdGFja1BvaW50ZXJSZWdpc3Rl ciwga2V5Lm9mZnNldCgpKSk7CiAgICAgCisgICAgcmVnaXN0ZXJDbG9iYmVyQ2hlY2soaml0LCBr ZXkuYXJndW1lbnRSZWdpc3RlcnMoKSk7CisgICAgCiAgICAgQXNzZW1ibHlIZWxwZXJzOjpDYWxs IGNhbGwgPSBqaXQuY2FsbCgpOwogCi0gICAgLy8gRklYTUU6IENTdGFjayAtIE5lZWQgdG8gZG8g c29tZXRoaW5nIGxpa2Ugaml0LmVtaXRGdW5jdGlvbkVwaWxvZ3VlKCk7CiAgICAgaml0LmxvYWRQ dHIoQXNzZW1ibHlIZWxwZXJzOjpBZGRyZXNzKE1hY3JvQXNzZW1ibGVyOjpzdGFja1BvaW50ZXJS ZWdpc3Rlciwga2V5Lm9mZnNldCgpKSwgR1BSSW5mbzo6bm9uUHJlc2VydmVkTm9uUmV0dXJuR1BS KTsKICAgICBqaXQucmVzdG9yZVJldHVybkFkZHJlc3NCZWZvcmVSZXR1cm4oR1BSSW5mbzo6bm9u UHJlc2VydmVkTm9uUmV0dXJuR1BSKTsKICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvUmVnaXN0ZXJTZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvUmVnaXN0ZXJTZXQuY3BwCShyZXZpc2lvbiAxNjYzNTgpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L1JlZ2lzdGVyU2V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNDMgKzMx LDM5IEBACiAjaW5jbHVkZSAiR1BSSW5mby5oIgogI2luY2x1ZGUgIk1hY3JvQXNzZW1ibGVyLmgi CiAjaW5jbHVkZSAiSlNDSW5saW5lcy5oIgorI2luY2x1ZGUgPHd0Zi9Db21tYVByaW50ZXIuaD4K IAogbmFtZXNwYWNlIEpTQyB7CiAKIFJlZ2lzdGVyU2V0IFJlZ2lzdGVyU2V0OjpzdGFja1JlZ2lz dGVycygpCiB7Ci0gICAgUmVnaXN0ZXJTZXQgcmVzdWx0OwotICAgIHJlc3VsdC5zZXQoTWFjcm9B c3NlbWJsZXI6OnN0YWNrUG9pbnRlclJlZ2lzdGVyKTsKLSAgICByZXN1bHQuc2V0KE1hY3JvQXNz ZW1ibGVyOjpmcmFtZVBvaW50ZXJSZWdpc3Rlcik7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICBy ZXR1cm4gUmVnaXN0ZXJTZXQoCisgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpzdGFja1BvaW50ZXJS ZWdpc3RlciwKKyAgICAgICAgTWFjcm9Bc3NlbWJsZXI6OmZyYW1lUG9pbnRlclJlZ2lzdGVyKTsK IH0KIAogUmVnaXN0ZXJTZXQgUmVnaXN0ZXJTZXQ6OnJlc2VydmVkSGFyZHdhcmVSZWdpc3RlcnMo KQogewotICAgIFJlZ2lzdGVyU2V0IHJlc3VsdDsKICNpZiBDUFUoQVJNNjQpCi0gICAgcmVzdWx0 LnNldChBUk02NFJlZ2lzdGVyczo6bHIpOworICAgIHJldHVybiBSZWdpc3RlclNldChBUk02NFJl Z2lzdGVyczo6bHIpOworI2Vsc2UKKyAgICByZXR1cm4gUmVnaXN0ZXJTZXQoKTsKICNlbmRpZgot ICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIFJlZ2lzdGVyU2V0IFJlZ2lzdGVyU2V0OjpydW50aW1l UmVnaXN0ZXJzKCkKIHsKLSAgICBSZWdpc3RlclNldCByZXN1bHQ7CiAjaWYgVVNFKEpTVkFMVUU2 NCkKLSAgICByZXN1bHQuc2V0KEdQUkluZm86OnRhZ1R5cGVOdW1iZXJSZWdpc3Rlcik7Ci0gICAg cmVzdWx0LnNldChHUFJJbmZvOjp0YWdNYXNrUmVnaXN0ZXIpOworICAgIHJldHVybiBSZWdpc3Rl clNldChHUFJJbmZvOjp0YWdUeXBlTnVtYmVyUmVnaXN0ZXIsIEdQUkluZm86OnRhZ01hc2tSZWdp c3Rlcik7CisjZWxzZQorICAgIHJldHVybiBSZWdpc3RlclNldCgpOwogI2VuZGlmCi0gICAgcmV0 dXJuIHJlc3VsdDsKIH0KIAogUmVnaXN0ZXJTZXQgUmVnaXN0ZXJTZXQ6OnNwZWNpYWxSZWdpc3Rl cnMoKQogewotICAgIFJlZ2lzdGVyU2V0IHJlc3VsdDsKLSAgICByZXN1bHQubWVyZ2Uoc3RhY2tS ZWdpc3RlcnMoKSk7Ci0gICAgcmVzdWx0Lm1lcmdlKHJlc2VydmVkSGFyZHdhcmVSZWdpc3RlcnMo KSk7Ci0gICAgcmVzdWx0Lm1lcmdlKHJ1bnRpbWVSZWdpc3RlcnMoKSk7Ci0gICAgcmV0dXJuIHJl c3VsdDsKKyAgICByZXR1cm4gUmVnaXN0ZXJTZXQoCisgICAgICAgIHN0YWNrUmVnaXN0ZXJzKCks IHJlc2VydmVkSGFyZHdhcmVSZWdpc3RlcnMoKSwgcnVudGltZVJlZ2lzdGVycygpKTsKIH0KIAog UmVnaXN0ZXJTZXQgUmVnaXN0ZXJTZXQ6OmNhbGxlZVNhdmVSZWdpc3RlcnMoKQpAQCAtMTU1LDcg KzE1MSwxMyBAQCBzaXplX3QgUmVnaXN0ZXJTZXQ6Om51bWJlck9mU2V0RlBScygpIGNvCiAKIHZv aWQgUmVnaXN0ZXJTZXQ6OmR1bXAoUHJpbnRTdHJlYW0mIG91dCkgY29uc3QKIHsKLSAgICBtX3Zl Y3Rvci5kdW1wKG91dCk7CisgICAgQ29tbWFQcmludGVyIGNvbW1hOworICAgIG91dC5wcmludCgi WyIpOworICAgIGZvciAoUmVnIHJlZyA9IFJlZzo6Zmlyc3QoKTsgcmVnIDw9IFJlZzo6bGFzdCgp OyByZWcgPSByZWcubmV4dCgpKSB7CisgICAgICAgIGlmIChnZXQocmVnKSkKKyAgICAgICAgICAg IG91dC5wcmludChjb21tYSwgcmVnKTsKKyAgICB9CisgICAgb3V0LnByaW50KCJdIik7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZWdp c3RlclNldC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVnaXN0 ZXJTZXQuaAkocmV2aXNpb24gMTY2MzU4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9S ZWdpc3RlclNldC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSwxMSBAQCBuYW1lc3BhY2Ug SlNDIHsKIAogY2xhc3MgUmVnaXN0ZXJTZXQgewogcHVibGljOgotICAgIFJlZ2lzdGVyU2V0KCkg eyB9CisgICAgdGVtcGxhdGU8dHlwZW5hbWUuLi4gUmVncz4KKyAgICBleHBsaWNpdCBSZWdpc3Rl clNldChSZWdzLi4uIHJlZ3MpCisgICAgeworICAgICAgICBzZXRNYW55KHJlZ3MuLi4pOworICAg IH0KICAgICAKICAgICBzdGF0aWMgUmVnaXN0ZXJTZXQgc3RhY2tSZWdpc3RlcnMoKTsKICAgICBz dGF0aWMgUmVnaXN0ZXJTZXQgcmVzZXJ2ZWRIYXJkd2FyZVJlZ2lzdGVycygpOwpAQCAtNTUsNyAr NTksNyBAQCBwdWJsaWM6CiAgICAgICAgIEFTU0VSVCghIXJlZyk7CiAgICAgICAgIG1fdmVjdG9y LnNldChyZWcuaW5kZXgoKSwgdmFsdWUpOwogICAgIH0KLQorICAgIAogICAgIHZvaWQgc2V0KEpT VmFsdWVSZWdzIHJlZ3MpCiAgICAgewogICAgICAgICBpZiAocmVncy50YWdHUFIoKSAhPSBJbnZh bGlkR1BSUmVnKQpAQCAtMTA1LDYgKzEwOSwxNiBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgaGFz aCgpIGNvbnN0IHsgcmV0dXJuIG1fdmVjdG9yLmhhc2goKTsgfQogICAgIAogcHJpdmF0ZToKKyAg ICB2b2lkIHNldEFueShSZWcgcmVnKSB7IHNldChyZWcpOyB9CisgICAgdm9pZCBzZXRBbnkoY29u c3QgUmVnaXN0ZXJTZXQmIHNldCkgeyBtZXJnZShzZXQpOyB9CisgICAgdm9pZCBzZXRNYW55KCkg eyB9CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgUmVnVHlwZSwgdHlwZW5hbWUuLi4gUmVncz4KKyAg ICB2b2lkIHNldE1hbnkoUmVnVHlwZSByZWcsIFJlZ3MuLi4gcmVncykKKyAgICB7CisgICAgICAg IHNldEFueShyZWcpOworICAgICAgICBzZXRNYW55KHJlZ3MuLi4pOworICAgIH0KKwogICAgIEJp dFZlY3RvciBtX3ZlY3RvcjsKIH07CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv UmVwYXRjaC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBh dGNoLmNwcAkocmV2aXNpb24gMTY2MzU4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9S ZXBhdGNoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDkwLDYgKzQ5MCw5IEBAIHN0YXRpYyB2b2lk IGdlbmVyYXRlR2V0QnlJZFN0dWIoCiAKIHN0YXRpYyBib29sIHRyeUNhY2hlR2V0QnlJRChFeGVj U3RhdGUqIGV4ZWMsIEpTVmFsdWUgYmFzZVZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0 eU5hbWUsIGNvbnN0IFByb3BlcnR5U2xvdCYgc2xvdCwgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJ bmZvKQogeworICAgIGlmIChPcHRpb25zOjpmb3JjZUlDRmFpbHVyZSgpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgCiAgICAgLy8gRklYTUU6IFdyaXRlIGEgdGVzdCB0aGF0IHByb3ZlcyB3 ZSBuZWVkIHRvIGNoZWNrIGZvciByZWN1cnNpb24gaGVyZSBqdXN0CiAgICAgLy8gbGlrZSB0aGUg aW50ZXJwcmV0ZXIgZG9lcywgdGhlbiBhZGQgYSBjaGVjayBmb3IgcmVjdXJzaW9uLgogCkBAIC0x MTEwLDYgKzExMTMsOSBAQCBzdGF0aWMgdm9pZCBlbWl0Q3VzdG9tU2V0dGVyU3R1YihFeGVjU3Rh CiAKIHN0YXRpYyBib29sIHRyeUNhY2hlUHV0QnlJRChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUg YmFzZVZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgY29uc3QgUHV0UHJvcGVydHlTbG90 JiBzbG90LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sIFB1dEtpbmQgcHV0S2luZCkKIHsK KyAgICBpZiAoT3B0aW9uczo6Zm9yY2VJQ0ZhaWx1cmUoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIAogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gZXhlYy0+Y29kZUJsb2NrKCk7CiAg ICAgVk0qIHZtID0gJmV4ZWMtPnZtKCk7CiAKQEAgLTExMzksNiArMTE0NSw4IEBAIHN0YXRpYyBi b29sIHRyeUNhY2hlUHV0QnlJRChFeGVjU3RhdGUqIGUKICAgICAgICAgICAgIAogICAgICAgICAg ICAgLy8gU2tpcCBvcHRpbWl6aW5nIHRoZSBjYXNlIHdoZXJlIHdlIG5lZWQgcmVhbGxvYywgYW5k IHRoZSBzdHJ1Y3R1cmUgaGFzCiAgICAgICAgICAgICAvLyBpbmRleGluZyBzdG9yYWdlLgorICAg ICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZG4ndCBza2lwIHRoaXMhICBJbXBsZW1lbnQgaXQh CisgICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMwOTE0CiAgICAgICAgICAgICBpZiAob2xkU3RydWN0dXJlLT5jb3VsZEhhdmVJbmRleGluZ0hl YWRlcigpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIApAQCAt MTM0MCw2ICsxMzQ4LDkgQEAgc3RhdGljIGJvb2wgdHJ5UmVwYXRjaEluKAogICAgIEV4ZWNTdGF0 ZSogZXhlYywgSlNDZWxsKiBiYXNlLCBjb25zdCBJZGVudGlmaWVyJiBpZGVudCwgYm9vbCB3YXNG b3VuZCwKICAgICBjb25zdCBQcm9wZXJ0eVNsb3QmIHNsb3QsIFN0cnVjdHVyZVN0dWJJbmZvJiBz dHViSW5mbykKIHsKKyAgICBpZiAoT3B0aW9uczo6Zm9yY2VJQ0ZhaWx1cmUoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworICAgIAogICAgIGlmICghYmFzZS0+c3RydWN0dXJlKCktPnByb3BlcnR5 QWNjZXNzZXNBcmVDYWNoZWFibGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5jcHAJKHJldmlzaW9uIDE2 NjM1OCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMDIsNyArMjAyLDcgQEAgc3RhdGljIHZvaWQgcmVjb21wdXRlRGVwZW5k ZW50T3B0aW9ucygpCiAjaWYgIUVOQUJMRShGVExfSklUKQogICAgIE9wdGlvbnM6OnVzZUZUTEpJ VCgpID0gZmFsc2U7CiAjZW5kaWYKLSAgICAKKwogICAgIGlmIChPcHRpb25zOjpzaG93RGlzYXNz ZW1ibHkoKQogICAgICAgICB8fCBPcHRpb25zOjpzaG93REZHRGlzYXNzZW1ibHkoKQogICAgICAg ICB8fCBPcHRpb25zOjpzaG93RlRMRGlzYXNzZW1ibHkoKQpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL09wdGlvbnMuaAkocmV2aXNpb24gMTY2MzU4KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAy LDcgQEAgdHlwZWRlZiBPcHRpb25SYW5nZSBvcHRpb25SYW5nZTsKICAgICB2KGJvb2wsIGNyYXNo SWZDYW50QWxsb2NhdGVKSVRNZW1vcnksIGZhbHNlKSBcCiAgICAgXAogICAgIHYoYm9vbCwgZm9y Y2VERkdDb2RlQmxvY2tMaXZlbmVzcywgZmFsc2UpIFwKKyAgICB2KGJvb2wsIGZvcmNlSUNGYWls dXJlLCBmYWxzZSkgXAogICAgIFwKICAgICB2KGJvb2wsIGR1bXBHZW5lcmF0ZWRCeXRlY29kZXMs IGZhbHNlKSBcCiAgICAgdihib29sLCBkdW1wQnl0ZWNvZGVMaXZlbmVzc1Jlc3VsdHMsIGZhbHNl KSBcCkBAIC0xNTcsNiArMTU4LDggQEAgdHlwZWRlZiBPcHRpb25SYW5nZSBvcHRpb25SYW5nZTsK ICAgICB2KHVuc2lnbmVkLCBsbHZtTWF4U3RhY2tTaXplLCAxMjggKiBLQikgXAogICAgIHYoYm9v bCwgbGx2bURpc2FsbG93QVZYLCB0cnVlKSBcCiAgICAgdihib29sLCBmdGxDcmFzaGVzLCBmYWxz ZSkgLyogZm9vbC1wcm9vZiB3YXkgb2YgY2hlY2tpbmcgdGhhdCB5b3UgZW5kZWQgdXAgaW4gdGhl IEZUTC4gOy0pICovXAorICAgIHYoYm9vbCwgY2xvYmJlckFsbFJlZ3NJbkZUTElDU2xvd1BhdGgs ICFBU1NFUlRfRElTQUJMRUQpIFwKKyAgICB2KGJvb2wsIGFzc3VtZUFsbFJlZ3NJbkZUTElDQXJl TGl2ZSwgdHJ1ZSkgXAogICAgIFwKICAgICB2KGJvb2wsIGVuYWJsZUNvbmN1cnJlbnRKSVQsIHRy dWUpIFwKICAgICB2KHVuc2lnbmVkLCBudW1iZXJPZkRGR0NvbXBpbGVyVGhyZWFkcywgY29tcHV0 ZU51bWJlck9mV29ya2VyVGhyZWFkcygyLCAyKSAtIDEpIFwKSW5kZXg6IFRvb2xzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjQ0NCkKKysrIFRv b2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDE0LTAzLTI4 ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAgTGFuZCB0aGUgc3Rh Y2ttYXAgcmVnaXN0ZXIgbGl2ZW5lc3MgZ2x1ZSB3aXRoIHRoZSB1c2VzIG9mIHRoZSBsaXZlbmVz cyBkaXNhYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTMwOTI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzOgorCiAyMDE0LTAzLTI4ICBNYXJ0aW4g SG9jayAgPG1ob2NrQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBBZGQgbXlzZWxm IGFzIGEgY29tbWl0dGVyLgpJbmRleDogVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0 cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCShyZXZp c2lvbiAxNjYzNTgpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNTAsNiArMjUwLDEwIEBAIGRlZiBwcmVmaXhDb21tYW5kKHByZWZpeCkK ICAgICAiYXdrICIgKyBTaGVsbHdvcmRzLnNoZWxsZXNjYXBlKCJ7IHByaW50ZiAjeyhwcmVmaXgg KyAnOiAnKS5pbnNwZWN0fTsgcHJpbnQgfSIpCiBlbmQKIAorZGVmIHJlZGlyZWN0QW5kUHJlZml4 Q29tbWFuZChwcmVmaXgpCisgICAgcHJlZml4Q29tbWFuZChwcmVmaXgpICsgIiAyPiYxIgorZW5k CisKIGRlZiBwaXBlQW5kUHJlZml4Q29tbWFuZChvdXRwdXRGaWxlbmFtZSwgcHJlZml4KQogICAg ICJ0ZWUgIiArIFNoZWxsd29yZHMuc2hlbGxlc2NhcGUob3V0cHV0RmlsZW5hbWUudG9fcykgKyAi IHwgIiArIHByZWZpeENvbW1hbmQocHJlZml4KQogZW5kCkBAIC0yNzYsNyArMjgwLDcgQEAgZGVm IHNpbXBsZUVycm9ySGFuZGxlcgogICAgICAgICB8IG91dHAsIHBsYW4gfAogICAgICAgICBvdXRw LnB1dHMgImlmIHRlc3QgLWUgI3twbGFuLmZhaWxGaWxlfSIKICAgICAgICAgb3V0cC5wdXRzICJ0 aGVuIgotICAgICAgICBvdXRwLnB1dHMgIiAgICAoZWNobyBFUlJPUjogVW5leHBlY3RlZCBleGl0 IGNvZGU6IGBjYXQgI3twbGFuLmZhaWxGaWxlfWApIHwgIiArIHByZWZpeENvbW1hbmQocGxhbi5u YW1lKSArICIxPiYyIgorICAgICAgICBvdXRwLnB1dHMgIiAgICAoZWNobyBFUlJPUjogVW5leHBl Y3RlZCBleGl0IGNvZGU6IGBjYXQgI3twbGFuLmZhaWxGaWxlfWApIHwgIiArIHJlZGlyZWN0QW5k UHJlZml4Q29tbWFuZChwbGFuLm5hbWUpCiAgICAgICAgIG91dHAucHV0cyAiICAgICIgKyBwbGFu LmZhaWxDb21tYW5kCiAgICAgICAgIG91dHAucHV0cyAiZWxzZSIKICAgICAgICAgb3V0cC5wdXRz ICIgICAgIiArIHBsYW4uc3VjY2Vzc0NvbW1hbmQKQEAgLTI5Myw3ICsyOTcsNyBAQCBkZWYgZGlm ZkVycm9ySGFuZGxlcihleHBlY3RlZEZpbGVuYW1lKQogICAgICAgICAKICAgICAgICAgb3V0cC5w dXRzICJpZiB0ZXN0IC1lICN7cGxhbi5mYWlsRmlsZX0iCiAgICAgICAgIG91dHAucHV0cyAidGhl biIKLSAgICAgICAgb3V0cC5wdXRzICIgICAgKGNhdCAje291dHB1dEZpbGVuYW1lfSAmJiBlY2hv IEVSUk9SOiBVbmV4cGVjdGVkIGV4aXQgY29kZTogYGNhdCAje3BsYW4uZmFpbEZpbGV9YCkgfCAi ICsgcHJlZml4Q29tbWFuZChwbGFuLm5hbWUpICsgIjE+JjIiCisgICAgICAgIG91dHAucHV0cyAi ICAgIChjYXQgI3tvdXRwdXRGaWxlbmFtZX0gJiYgZWNobyBFUlJPUjogVW5leHBlY3RlZCBleGl0 IGNvZGU6IGBjYXQgI3twbGFuLmZhaWxGaWxlfWApIHwgIiArIHJlZGlyZWN0QW5kUHJlZml4Q29t bWFuZChwbGFuLm5hbWUpCiAgICAgICAgIG91dHAucHV0cyAiICAgICIgKyBwbGFuLmZhaWxDb21t YW5kCiAgICAgICAgIG91dHAucHV0cyAiZWxpZiB0ZXN0IC1lIC4uLyN7U2hlbGx3b3Jkcy5zaGVs bGVzY2FwZShleHBlY3RlZEZpbGVuYW1lKX0iCiAgICAgICAgIG91dHAucHV0cyAidGhlbiIKQEAg LTMwMiwxMSArMzA2LDExIEBAIGRlZiBkaWZmRXJyb3JIYW5kbGVyKGV4cGVjdGVkRmlsZW5hbWUp CiAgICAgICAgIG91dHAucHV0cyAiICAgIHRoZW4iCiAgICAgICAgIG91dHAucHV0cyAiICAgICIg KyBwbGFuLnN1Y2Nlc3NDb21tYW5kCiAgICAgICAgIG91dHAucHV0cyAiICAgIGVsc2UiCi0gICAg ICAgIG91dHAucHV0cyAiICAgICAgICAoZWNobyBcIkRJRkYgRkFJTFVSRSFcIiAmJiBjYXQgI3tk aWZmRmlsZW5hbWV9KSB8ICIgKyBwcmVmaXhDb21tYW5kKHBsYW4ubmFtZSkgKyAiMT4mMiIKKyAg ICAgICAgb3V0cC5wdXRzICIgICAgICAgIChlY2hvIFwiRElGRiBGQUlMVVJFIVwiICYmIGNhdCAj e2RpZmZGaWxlbmFtZX0pIHwgIiArIHJlZGlyZWN0QW5kUHJlZml4Q29tbWFuZChwbGFuLm5hbWUp CiAgICAgICAgIG91dHAucHV0cyAiICAgICAgICAiICsgcGxhbi5mYWlsQ29tbWFuZAogICAgICAg ICBvdXRwLnB1dHMgIiAgICBmaSIKICAgICAgICAgb3V0cC5wdXRzICJlbHNlIgotICAgICAgICBv dXRwLnB1dHMgIiAgICAoZWNobyBcIk5PIEVYUEVDVEFUSU9OIVwiICYmIGNhdCAje291dHB1dEZp bGVuYW1lfSkgfCAiICsgcHJlZml4Q29tbWFuZChwbGFuLm5hbWUpICsgIjE+JjIiCisgICAgICAg IG91dHAucHV0cyAiICAgIChlY2hvIFwiTk8gRVhQRUNUQVRJT04hXCIgJiYgY2F0ICN7b3V0cHV0 RmlsZW5hbWV9KSB8ICIgKyByZWRpcmVjdEFuZFByZWZpeENvbW1hbmQocGxhbi5uYW1lKQogICAg ICAgICBvdXRwLnB1dHMgIiAgICAiICsgcGxhbi5mYWlsQ29tbWFuZAogICAgICAgICBvdXRwLnB1 dHMgImZpIgogICAgIH0KQEAgLTMyMSwxMSArMzI1LDExIEBAIGRlZiBtb3ppbGxhRXJyb3JIYW5k bGVyCiAKICAgICAgICAgb3V0cC5wdXRzICJpZiB0ZXN0IC1lICN7cGxhbi5mYWlsRmlsZX0iCiAg ICAgICAgIG91dHAucHV0cyAidGhlbiIKLSAgICAgICAgb3V0cC5wdXRzICIgICAgKGNhdCAje291 dHB1dEZpbGVuYW1lfSAmJiBlY2hvIEVSUk9SOiBVbmV4cGVjdGVkIGV4aXQgY29kZTogYGNhdCAj e3BsYW4uZmFpbEZpbGV9YCkgfCAiICsgcHJlZml4Q29tbWFuZChwbGFuLm5hbWUpICsgIjE+JjIi CisgICAgICAgIG91dHAucHV0cyAiICAgIChjYXQgI3tvdXRwdXRGaWxlbmFtZX0gJiYgZWNobyBF UlJPUjogVW5leHBlY3RlZCBleGl0IGNvZGU6IGBjYXQgI3twbGFuLmZhaWxGaWxlfWApIHwgIiAr IHJlZGlyZWN0QW5kUHJlZml4Q29tbWFuZChwbGFuLm5hbWUpCiAgICAgICAgIG91dHAucHV0cyAi ICAgICIgKyBwbGFuLmZhaWxDb21tYW5kCiAgICAgICAgIG91dHAucHV0cyAiZWxpZiBncmVwIC1p IC1xIGZhaWxlZCEgI3tvdXRwdXRGaWxlbmFtZX0iCiAgICAgICAgIG91dHAucHV0cyAidGhlbiIK LSAgICAgICAgb3V0cC5wdXRzICIgICAgKGVjaG8gRGV0ZWN0ZWQgZmFpbHVyZXM6ICYmIGNhdCAj e291dHB1dEZpbGVuYW1lfSkgfCAiICsgcHJlZml4Q29tbWFuZChwbGFuLm5hbWUpICsgIjE+JjIi CisgICAgICAgIG91dHAucHV0cyAiICAgIChlY2hvIERldGVjdGVkIGZhaWx1cmVzOiAmJiBjYXQg I3tvdXRwdXRGaWxlbmFtZX0pIHwgIiArIHJlZGlyZWN0QW5kUHJlZml4Q29tbWFuZChwbGFuLm5h bWUpCiAgICAgICAgIG91dHAucHV0cyAiICAgICIgKyBwbGFuLmZhaWxDb21tYW5kCiAgICAgICAg IG91dHAucHV0cyAiZWxzZSIKICAgICAgICAgb3V0cC5wdXRzICIgICAgIiArIHBsYW4uc3VjY2Vz c0NvbW1hbmQKQEAgLTM0Nyw3ICszNTEsNyBAQCBkZWYgbW96aWxsYUZhaWxFcnJvckhhbmRsZXIK ICAgICAgICAgb3V0cC5wdXRzICJ0aGVuIgogICAgICAgICBvdXRwLnB1dHMgIiAgICAiICsgcGxh bi5zdWNjZXNzQ29tbWFuZAogICAgICAgICBvdXRwLnB1dHMgImVsc2UiCi0gICAgICAgIG91dHAu cHV0cyAiICAgIChlY2hvIE5PVElDRTogWW91IG1hZGUgdGhpcyB0ZXN0IHBhc3MsIGJ1dCBpdCB3 YXMgZXhwZWN0ZWQgdG8gZmFpbCkgfCAiICsgcHJlZml4Q29tbWFuZChwbGFuLm5hbWUpICsgIjE+ JjIiCisgICAgICAgIG91dHAucHV0cyAiICAgIChlY2hvIE5PVElDRTogWW91IG1hZGUgdGhpcyB0 ZXN0IHBhc3MsIGJ1dCBpdCB3YXMgZXhwZWN0ZWQgdG8gZmFpbCkgfCAiICsgcmVkaXJlY3RBbmRQ cmVmaXhDb21tYW5kKHBsYW4ubmFtZSkKICAgICAgICAgb3V0cC5wdXRzICIgICAgIiArIHBsYW4u ZmFpbENvbW1hbmQKICAgICAgICAgb3V0cC5wdXRzICJmaSIKICAgICB9CkBAIC0zNjYsMTcgKzM3 MCwxNyBAQCBkZWYgbW96aWxsYUV4aXQzRXJyb3JIYW5kbGVyCiAgICAgICAgIG91dHAucHV0cyAi ICAgIHRoZW4iCiAgICAgICAgIG91dHAucHV0cyAiICAgICAgICBpZiBncmVwIC1pIC1xIGZhaWxl ZCEgI3tvdXRwdXRGaWxlbmFtZX0iCiAgICAgICAgIG91dHAucHV0cyAiICAgICAgICB0aGVuIgot ICAgICAgICBvdXRwLnB1dHMgIiAgICAgICAgICAgIChlY2hvIERldGVjdGVkIGZhaWx1cmVzOiAm JiBjYXQgI3tvdXRwdXRGaWxlbmFtZX0pIHwgIiArIHByZWZpeENvbW1hbmQocGxhbi5uYW1lKSAr ICIxPiYyIgorICAgICAgICBvdXRwLnB1dHMgIiAgICAgICAgICAgIChlY2hvIERldGVjdGVkIGZh aWx1cmVzOiAmJiBjYXQgI3tvdXRwdXRGaWxlbmFtZX0pIHwgIiArIHJlZGlyZWN0QW5kUHJlZml4 Q29tbWFuZChwbGFuLm5hbWUpCiAgICAgICAgIG91dHAucHV0cyAiICAgICAgICAgICAgIiArIHBs YW4uZmFpbENvbW1hbmQKICAgICAgICAgb3V0cC5wdXRzICIgICAgICAgIGVsc2UiCiAgICAgICAg IG91dHAucHV0cyAiICAgICAgICAgICAgIiArIHBsYW4uc3VjY2Vzc0NvbW1hbmQKICAgICAgICAg b3V0cC5wdXRzICIgICAgICAgIGZpIgogICAgICAgICBvdXRwLnB1dHMgIiAgICBlbHNlIgotICAg ICAgICBvdXRwLnB1dHMgIiAgICAgICAgKGNhdCAje291dHB1dEZpbGVuYW1lfSAmJiBlY2hvIEVS Uk9SOiBVbmV4cGVjdGVkIGV4aXQgY29kZTogYGNhdCAje3BsYW4uZmFpbEZpbGV9YCkgfCAiICsg cHJlZml4Q29tbWFuZChwbGFuLm5hbWUpICsgIjE+JjIiCisgICAgICAgIG91dHAucHV0cyAiICAg ICAgICAoY2F0ICN7b3V0cHV0RmlsZW5hbWV9ICYmIGVjaG8gRVJST1I6IFVuZXhwZWN0ZWQgZXhp dCBjb2RlOiBgY2F0ICN7cGxhbi5mYWlsRmlsZX1gKSB8ICIgKyByZWRpcmVjdEFuZFByZWZpeENv bW1hbmQocGxhbi5uYW1lKQogICAgICAgICBvdXRwLnB1dHMgIiAgICAgICAgIiArIHBsYW4uZmFp bENvbW1hbmQKICAgICAgICAgb3V0cC5wdXRzICIgICAgZmkiCiAgICAgICAgIG91dHAucHV0cyAi ZWxzZSIKLSAgICAgICAgb3V0cC5wdXRzICIgICAgKGNhdCAje291dHB1dEZpbGVuYW1lfSAmJiBl Y2hvIEVSUk9SOiBUZXN0IGV4cGVjdGVkIHRvIGZhaWwsIGJ1dCByZXR1cm5lZCBzdWNjZXNzZnVs bHkpIHwgIiArIHByZWZpeENvbW1hbmQocGxhbi5uYW1lKSArICIxPiYyIgorICAgICAgICBvdXRw LnB1dHMgIiAgICAoY2F0ICN7b3V0cHV0RmlsZW5hbWV9ICYmIGVjaG8gRVJST1I6IFRlc3QgZXhw ZWN0ZWQgdG8gZmFpbCwgYnV0IHJldHVybmVkIHN1Y2Nlc3NmdWxseSkgfCAiICsgcmVkaXJlY3RB bmRQcmVmaXhDb21tYW5kKHBsYW4ubmFtZSkKICAgICAgICAgb3V0cC5wdXRzICIgICAgIiArIHBs YW4uZmFpbENvbW1hbmQKICAgICAgICAgb3V0cC5wdXRzICJmaSIKICAgICB9CkBAIC02MTAsNiAr NjE0LDExIEBAIGRlZiBkZWZhdWx0UXVpY2tSdW4KICAgICBydW5GVExOb0NKSVQKIGVuZAogCitk ZWYgZGVmYXVsdEZUTFNwb3RDaGVjaworICAgIGRlZmF1bHRRdWlja1J1bgorICAgIHJ1bkZUTE5v U2ltcGxlT3B0CitlbmQKKwogIyBUaGlzIGlzIGV4cGVjdGVkIHRvIG5vdCBkbyBlYWdlciBydW5z IGJlY2F1c2UgZWFnZXIgcnVucyBjYW4gaGF2ZSBhIGxvdCBvZiByZWNvbXBpbGF0aW9ucwogIyBm b3IgcmVhc29ucyB0aGF0IGRvbid0IGFyaXNlIGluIHRoZSByZWFsIHdvcmxkLiBJdCdzIHVzZWQg Zm9yIHRlc3RzIHRoYXQgYXNzZXJ0IGNvbnZlcmdlbmNlCiAjIGJ5IGNvdW50aW5nIHJlY29tcGls YXRpb25zLgpAQCAtNjM5LDcgKzY0OCw3IEBAIGRlZiBydW5MYXlvdXRUZXN0KGtpbmQsICpvcHRp b25zKQogICAgIHByZXBhcmVFeHRyYVJlbGF0aXZlRmlsZXMoWyIuLi8je3Rlc3ROYW1lfS1leHBl Y3RlZC50eHQiXSwgJGJlbmNobWFya0RpcmVjdG9yeSkKICAgICBwcmVwYXJlRXh0cmFBYnNvbHV0 ZUZpbGVzKExBWU9VVFRFU1RTX1BBVEgsIFsicmVzb3VyY2VzL3N0YW5kYWxvbmUtcHJlLmpzIiwg InJlc291cmNlcy9zdGFuZGFsb25lLXBvc3QuanMiXSkKIAotICAgIGFyZ3MgPSBbcGF0aFRvVk0u dG9fc10gKyBvcHRpb25zICsKKyAgICBhcmdzID0gW3BhdGhUb1ZNLnRvX3NdICsgTk9fRlRMX09Q VElPTlMgKyBvcHRpb25zICsKICAgICAgICAgWyhQYXRobmFtZS5uZXcoInJlc291cmNlcyIpICsg InN0YW5kYWxvbmUtcHJlLmpzIikudG9fcywKICAgICAgICAgICRiZW5jaG1hcmsudG9fcywKICAg ICAgICAgIChQYXRobmFtZS5uZXcoInJlc291cmNlcyIpICsgInN0YW5kYWxvbmUtcG9zdC5qcyIp LnRvX3NdCkBAIC03MjEsNyArNzMwLDcgQEAgZGVmIHJ1bk1vemlsbGFUZXN0KGtpbmQsIG1vZGUs IGV4dHJhRmlsZQogICAgICAgICBraW5kID0gIm1vemlsbGEiCiAgICAgZW5kCiAgICAgcHJlcGFy ZUV4dHJhUmVsYXRpdmVGaWxlcyhleHRyYUZpbGVzLm1hcHt8dnwgKFBhdGhuYW1lKCIuLiIpICsg dikudG9fc30sICRjb2xsZWN0aW9uKQotICAgIGFyZ3MgPSBbcGF0aFRvVk0udG9fc10gKyBvcHRp b25zICsgZXh0cmFGaWxlcy5tYXB7fHZ8IHYudG9fc30gKyBbJGJlbmNobWFyay50b19zXQorICAg IGFyZ3MgPSBbcGF0aFRvVk0udG9fc10gKyBOT19GVExfT1BUSU9OUyArIG9wdGlvbnMgKyBleHRy YUZpbGVzLm1hcHt8dnwgdi50b19zfSArIFskYmVuY2htYXJrLnRvX3NdCiAgICAgY2FzZSBtb2Rl CiAgICAgd2hlbiA6bm9ybWFsCiAgICAgICAgIGVycm9ySGFuZGxlciA9IG1vemlsbGFFcnJvckhh bmRsZXIK