74507 2011-12-14 08:37:06 -0800 Minor refactor to Parser::parseTryStatement 2011-12-15 05:46:17 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 wingo webkit-unassigned ggaren oliver webkit.review.bot oldest_to_newest 520943 0 wingo 2011-12-14 08:37:06 -0800 Currently, the parser binds an identifier for the exception of a `catch' block by going directly to the scope object. The patch to be attached makes it use the Parser object's method. This will facilitate future checks for conflicting block-scoped bindings. 520946 1 119223 wingo 2011-12-14 08:38:22 -0800 Created attachment 119223 Patch 520974 2 119229 wingo 2011-12-14 09:03:45 -0800 Created attachment 119229 Patch 520976 3 119229 wingo 2011-12-14 09:04:54 -0800 Comment on attachment 119229 Patch Sorry, uploaded this patch to the wrong bug. The previous one is the right one. 521055 4 119223 ggaren 2011-12-14 10:37:51 -0800 Comment on attachment 119223 Patch r=me 521847 5 119223 webkit.review.bot 2011-12-15 05:46:12 -0800 Comment on attachment 119223 Patch Clearing flags on attachment: 119223 Committed r102931: <http://trac.webkit.org/changeset/102931> 521848 6 webkit.review.bot 2011-12-15 05:46:17 -0800 All reviewed patches have been landed. Closing bug. 119223 2011-12-14 08:38:22 -0800 2011-12-15 05:46:12 -0800 Patch bug-74507-20111214173819.patch text/plain 1720 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NGMzM2FiNjJhMjUzZmQxMjU4YWI3NTljODNkZGU2MWM3NzcyY2IxLi4yOTVlODdmY2VkYzg3YTk3 MmFmN2Q4NWIxODI5MzFkOWNmMjc4NDZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMS0xMi0xNCAgQW5keSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CisK KyAgICAgICAgTWlub3IgcmVmYWN0b3IgdG8gUGFyc2VyOjpwYXJzZVRyeVN0YXRlbWVudAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ1MDcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhcnNlci9QYXJz ZXIuY3BwIChKU0M6OlBhcnNlcjo6cGFyc2VUcnlTdGF0ZW1lbnQpOiBVc2UgdGhlCisgICAgICAg IFBhcnNlcidzIGRlY2xhcmVWYXJpYWJsZSBpbnN0ZWFkIG9mIGdvaW5nIGRpcmVjdGx5IHRvIHRo ZSBzY29wZS4KKyAgICAgICAgVGhpcyB3aWxsIGZhY2lsaXRhdGUgZnV0dXJlIGNoZWNrcyByZWxh dGVkIHRvIGhhcm1vbnkgYmxvY2sKKyAgICAgICAgc2NvcGluZy4KKwogMjAxMS0xMS0yMiAgQW5k eSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgQWRkIC0tZHVtcC1ieXRlY29k ZSB0byB0aGUgcnVudGltZSBvcHRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcGFyc2VyL1BhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNl ci5jcHAKaW5kZXggOGVmMjVkNTE1ZDI3NWQxOGMwZmU5N2E2MmIyOGU4NDMwMjM5OTZlYi4uN2Zi Mjg1YTZiYzVkZjc5MzM2YzZkZWMzZTNhN2I1NjExNmNkY2YxYSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9wYXJzZXIvUGFyc2VyLmNwcApAQCAtNjIzLDcgKzYyMyw3IEBAIHRlbXBsYXRlIDxjbGFz cyBUcmVlQnVpbGRlcj4gVHJlZVN0YXRlbWVudCBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VUcnlT dGF0ZW1lbnQoCiAgICAgICAgIGlkZW50ID0gbV90b2tlbi5tX2RhdGEuaWRlbnQ7CiAgICAgICAg IG5leHQoKTsKICAgICAgICAgQXV0b1BvcFNjb3BlUmVmIGNhdGNoU2NvcGUodGhpcywgcHVzaFNj b3BlKCkpOwotICAgICAgICBmYWlsSWZGYWxzZUlmU3RyaWN0V2l0aE5hbWVBbmRNZXNzYWdlKGNh dGNoU2NvcGUtPmRlY2xhcmVWYXJpYWJsZShpZGVudCksICJDYW5ub3QgZGVjbGFyZSBhIHZhcmlh YmxlIG5hbWVkIiwgaWRlbnQtPmltcGwoKSwgImluIHN0cmljdCBtb2RlIik7CisgICAgICAgIGZh aWxJZkZhbHNlSWZTdHJpY3RXaXRoTmFtZUFuZE1lc3NhZ2UoZGVjbGFyZVZhcmlhYmxlKGlkZW50 KSwgIkNhbm5vdCBkZWNsYXJlIGEgdmFyaWFibGUgbmFtZWQiLCBpZGVudC0+aW1wbCgpLCAiaW4g c3RyaWN0IG1vZGUiKTsKICAgICAgICAgY2F0Y2hTY29wZS0+cHJldmVudE5ld0RlY2xzKCk7CiAg ICAgICAgIGNvbnN1bWVPckZhaWwoQ0xPU0VQQVJFTik7CiAgICAgICAgIG1hdGNoT3JGYWlsKE9Q RU5CUkFDRSk7Cg== 119229 2011-12-14 09:03:45 -0800 2011-12-14 09:04:54 -0800 Patch bug-74507-20111214180342.patch text/plain 20862 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy OTVlODdmY2VkYzg3YTk3MmFmN2Q4NWIxODI5MzFkOWNmMjc4NDZjLi4xODcyY2Q4YjhhYWExZGY2 MDc2MDA3NWI4YTgxOTEyNjg4YzJjMjg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw2MiBAQAogMjAxMS0xMi0xNCAgQW5keSBXaW5nbyAgPHdpbmdvQGlnYWxpYS5jb20+CiAK KyAgICAgICAgSW50ZXJwb3NlIENvZGVOb2RlIGJldHdlZW4gU2NvcGVOb2RlIGFuZCBQcm9ncmFt Tm9kZSBldCBhbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzQ1MDcKKworICAgICAgICBIYXJtb255IC8gRVM2IGludHJvZHVjZXMgYSBuZXcgd2F5IHRv IGJpbmQgdmFyaWFibGVzLCBpbiBibG9jaworICAgICAgICBzY29wZXMuICBUaGUgcGF0Y2ggdG8g YmUgYXR0YWNoZWQgc2VwYXJhdGVzIHRoZSBjb25jZXJuIG9mCisgICAgICAgIHZhcmlhYmxlIGJp bmRpbmcgd2l0aCB0aGUgb3RoZXIgY29uY2VybnMgb2YgZnVuY3Rpb25zLCBwcm9ncmFtCisgICAg ICAgIGNvZGUsIGFuZCBldmFsIGNvZGUgKG5hbWVseSwgaG9sZGluZyBhIGNvZGVibG9jaykuICBJ dCBkb2VzIHNvIGJ5CisgICAgICAgIGludHJvZHVjaW5nIGEgbmV3IGNsYXNzLCBDb2RlTm9kZSwg YmV0d2VlbiBTY29wZU5vZGUgYW5kCisgICAgICAgIFByb2dyYW1Ob2RlLgorCisgICAgICAgIEEg ZnV0dXJlIHBhdGNoIHdpbGwgYWRkIEJsb2NrU2NvcGVOb2RlIHdob3NlIHN1cGVyY2xhc3MgaXMK KyAgICAgICAgU2NvcGVOb2RlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogYnl0ZWNvZGUvU2FtcGxpbmdUb29sLmg6IERlY2xhcmUgQ29kZU5vZGUs IG5vdCBTY29wZU5vZGUuCisgICAgICAgICogYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9y Lmg6IG1fY29kZU5vZGUsIG5vdCBtX3Njb3BlTm9kZS4KKyAgICAgICAgKiBieXRlY29tcGlsZXIv Qnl0ZWNvZGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6 Z2VuZXJhdGUpOgorICAgICAgICAoSlNDOjpCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5l cmF0b3IpOiBDaGFuZ2UgdXNlcyBhbmQKKyAgICAgICAgaW5pdGlhbGl6YXRpb24gb2YgbV9jb2Rl Tm9kZS4KKyAgICAgICAgKiBwYXJzZXIvTm9kZUNvbnN0cnVjdG9ycy5oOgorICAgICAgICAoSlND OjpTY29wZU5vZGU6OlNjb3BlTm9kZSk6IERlY2xhcmUgaW5saW5lIGNvbnN0cnVjdG9ycyBmb3IK KyAgICAgICAgU2NvcGVOb2RlLgorICAgICAgICAqIHBhcnNlci9Ob2Rlcy5jcHA6CisgICAgICAg IChKU0M6OlNjb3BlTm9kZURhdGE6OlNjb3BlTm9kZURhdGEpOiBUaGlzIGhlbHBlciBzdHJ1Y3Qg bm8gbG9uZ2VyCisgICAgICAgIHJlY29yZHMgdGhlIG51bWJlciBvZiBjb25zdGFudHMgaW4gdGhl IHNjb3BlLCBhcyB0aGF0IGlzIGEgY29uY2VybgorICAgICAgICBvZiBjb2RlYmxvY2tzLiAgSXQg YWxzbyBkb2Vzbid0IHByZXBhcmUgYSBuZXcgYXJlbmEsIGFzIHRoYXQgaXMgYQorICAgICAgICBj b25jZXJuIG9mIENvZGVOb2RlLgorICAgICAgICAoSlNDOjpDb2RlTm9kZTo6Q29kZU5vZGUpOiBC YXNpY2FsbHksIGNoYW5nZSB0aGUgbmFtZSBvZiB0aGlzIGZyb20KKyAgICAgICAgU2NvcGVOb2Rl LCBhbmQgYWxzbyByZWNvcmQgdGhlIG51bWJlciBvZiBjb25zdGFudHMgYW5kIGRvIHRoZQorICAg ICAgICBhcmVuYSBzd2FwIGhlcmUuCisgICAgICAgIChKU0M6OlByb2dyYW1Ob2RlOjpQcm9ncmFt Tm9kZSk6CisgICAgICAgIChKU0M6OlByb2dyYW1Ob2RlOjpjcmVhdGUpOgorICAgICAgICAoSlND OjpFdmFsTm9kZTo6RXZhbE5vZGUpOgorICAgICAgICAoSlNDOjpFdmFsTm9kZTo6Y3JlYXRlKToK KyAgICAgICAgKEpTQzo6RnVuY3Rpb25Cb2R5Tm9kZTo6RnVuY3Rpb25Cb2R5Tm9kZSk6CisgICAg ICAgIChKU0M6OkZ1bmN0aW9uQm9keU5vZGU6OmNyZWF0ZSk6IEFkYXB0IHRvIGRlc2NlbmQgZnJv bSBDb2RlTm9kZSwKKyAgICAgICAgYW5kIGFkYXB0IHRoZSBhc3NlcnRpb25zIHRvIGxvb2sgZm9y IHRoZSBhcmVuYSBpbiB0aGUgQ29kZU5vZGUuCisgICAgICAgICogcGFyc2VyL05vZGVzLmg6Cisg ICAgICAgIChKU0M6OlNjb3BlTm9kZTo6aGFzQ2FwdHVyZWRWYXJpYWJsZXMpOgorICAgICAgICAo SlNDOjpTY29wZU5vZGU6OmNhcHR1cmVkVmFyaWFibGVDb3VudCk6CisgICAgICAgIChKU0M6OlNj b3BlTm9kZTo6Y2FwdHVyZXMpOgorICAgICAgICAoSlNDOjpTY29wZU5vZGU6OnZhclN0YWNrKToK KyAgICAgICAgKEpTQzo6U2NvcGVOb2RlOjpmdW5jdGlvblN0YWNrKToKKyAgICAgICAgKEpTQzo6 U2NvcGVOb2RlOjpzaW5nbGVTdGF0ZW1lbnQpOgorICAgICAgICAoSlNDOjpDb2RlTm9kZTo6bmVl ZHNBY3RpdmF0aW9uRm9yTW9yZVRoYW5WYXJpYWJsZXMpOgorICAgICAgICAoSlNDOjpDb2RlTm9k ZTo6bmVlZHNBY3RpdmF0aW9uKToKKyAgICAgICAgKEpTQzo6Q29kZU5vZGU6Om5lZWRlZENvbnN0 YW50cyk6ICBEbyB0aGUgbWFudWFsIHJlZmFjdG9yaW5ncyB0bworICAgICAgICBzcGxpdCB3aGF0 IHdhcyB0aGUgU2NvcGVOb2RlIGZ1bmN0aW9uYWxpdHkgaW50byB0d28gY2xhc3NlcywKKyAgICAg ICAgU2NvcGVOb2RlIGFuZCBDb2RlTm9kZS4gIENvZGVOb2RlIGlzIHRoZSBvbmUgdGhhdCBrZWVw cyB0aGUKKyAgICAgICAgcGFyc2VyLWFyZW5hIHJlZmNvdW50aW5nLgorICAgICAgICAqIHBhcnNl ci9QYXJzZXIuaCAoSlNDOjpQYXJzZXI6OmlzRnVuY3Rpb25Cb2R5Tm9kZSk6IFRha2UgYQorICAg ICAgICBDb2RlTm9kZSwgbm90IGEgU2NvcGVOb2RlLgorCisyMDExLTEyLTE0ICBBbmR5IFdpbmdv ICA8d2luZ29AaWdhbGlhLmNvbT4KKwogICAgICAgICBNaW5vciByZWZhY3RvciB0byBQYXJzZXI6 OnBhcnNlVHJ5U3RhdGVtZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDUwNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvU2FtcGxpbmdUb29sLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvU2Ft cGxpbmdUb29sLmgKaW5kZXggYjY5ZWYwMjZlYTk3ZTA2Y2NhMzcxYzI1Mzk5NmE2MWIyODc4N2Mz MC4uNjY4NTRlNmQ1NDEyMTU0MWIwNTlkOGFhZmQ2MzU4NzdhZGIyNzU4NCAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL1NhbXBsaW5nVG9vbC5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9TYW1wbGluZ1Rvb2wuaApAQCAtMTgxLDcgKzE4MSw3 IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIGNsYXNzIENvZGVCbG9jazsKICAgICBjbGFzcyBFeGVj U3RhdGU7CiAgICAgY2xhc3MgSW50ZXJwcmV0ZXI7Ci0gICAgY2xhc3MgU2NvcGVOb2RlOworICAg IGNsYXNzIENvZGVOb2RlOwogICAgIHN0cnVjdCBJbnN0cnVjdGlvbjsKIAogICAgIHN0cnVjdCBT Y3JpcHRTYW1wbGVSZWNvcmQgewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5 dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAppbmRleCA0ZDBiZTQzNGI4ZTBiMmMy ZjU0OTZmNDU5YTJmYTAwMDc2MmEyMGNkLi43ZDRlN2RiNTkxYTcyY2NhYTc2NjMxMDRiNjRlNWNk NGUzZDkwMGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVy L0J5dGVjb2RlR2VuZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv bXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcApAQCAtMTMxLDcgKzEzMSw3IEBAIEpTT2JqZWN0 KiBCeXRlY29kZUdlbmVyYXRvcjo6Z2VuZXJhdGUoKQogICAgIAogICAgIG1fY29kZUJsb2NrLT5z ZXRUaGlzUmVnaXN0ZXIobV90aGlzUmVnaXN0ZXIuaW5kZXgoKSk7CiAKLSAgICBtX3Njb3BlTm9k ZS0+ZW1pdEJ5dGVjb2RlKCp0aGlzKTsKKyAgICBtX2NvZGVOb2RlLT5lbWl0Qnl0ZWNvZGUoKnRo aXMpOwogCiAgICAgbV9jb2RlQmxvY2stPnNldEluc3RydWN0aW9uQ291bnQobV9jb2RlQmxvY2st Pmluc3RydWN0aW9ucygpLnNpemUoKSk7CiAKQEAgLTE4Nyw3ICsxODcsNyBAQCBCeXRlY29kZUdl bmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3IoUHJvZ3JhbU5vZGUqIHByb2dyYW1Ob2RlLCBTY29w ZUNoYWluTm9kZSogcwogICAgICwgbV9zaG91bGRFbWl0UmljaFNvdXJjZUluZm8oc2NvcGVDaGFp bi0+Z2xvYmFsT2JqZWN0LT5nbG9iYWxPYmplY3RNZXRob2RUYWJsZSgpLT5zdXBwb3J0c1JpY2hT b3VyY2VJbmZvKHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC5nZXQoKSkpCiAgICAgLCBtX3Njb3Bl Q2hhaW4oKnNjb3BlQ2hhaW4tPmdsb2JhbERhdGEsIHNjb3BlQ2hhaW4pCiAgICAgLCBtX3N5bWJv bFRhYmxlKHN5bWJvbFRhYmxlKQotICAgICwgbV9zY29wZU5vZGUocHJvZ3JhbU5vZGUpCisgICAg LCBtX2NvZGVOb2RlKHByb2dyYW1Ob2RlKQogICAgICwgbV9jb2RlQmxvY2soY29kZUJsb2NrKQog ICAgICwgbV90aGlzUmVnaXN0ZXIoQ2FsbEZyYW1lOjp0aGlzQXJndW1lbnRPZmZzZXQoKSkKICAg ICAsIG1fZmluYWxseURlcHRoKDApCkBAIC0yNTgsNyArMjU4LDcgQEAgQnl0ZWNvZGVHZW5lcmF0 b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKEZ1bmN0aW9uQm9keU5vZGUqIGZ1bmN0aW9uQm9keSwgU2Nv cGVDaGFpbk4KICAgICAsIG1fc2hvdWxkRW1pdFJpY2hTb3VyY2VJbmZvKHNjb3BlQ2hhaW4tPmds b2JhbE9iamVjdC0+Z2xvYmFsT2JqZWN0TWV0aG9kVGFibGUoKS0+c3VwcG9ydHNSaWNoU291cmNl SW5mbyhzY29wZUNoYWluLT5nbG9iYWxPYmplY3QuZ2V0KCkpKQogICAgICwgbV9zY29wZUNoYWlu KCpzY29wZUNoYWluLT5nbG9iYWxEYXRhLCBzY29wZUNoYWluKQogICAgICwgbV9zeW1ib2xUYWJs ZShzeW1ib2xUYWJsZSkKLSAgICAsIG1fc2NvcGVOb2RlKGZ1bmN0aW9uQm9keSkKKyAgICAsIG1f Y29kZU5vZGUoZnVuY3Rpb25Cb2R5KQogICAgICwgbV9jb2RlQmxvY2soY29kZUJsb2NrKQogICAg ICwgbV9hY3RpdmF0aW9uUmVnaXN0ZXIoMCkKICAgICAsIG1fZmluYWxseURlcHRoKDApCkBAIC00 MTksNyArNDE5LDcgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2VuZXJhdG9yKEV2YWxO b2RlKiBldmFsTm9kZSwgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2gKICAgICAsIG1fc2hvdWxkRW1p dFJpY2hTb3VyY2VJbmZvKHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC0+Z2xvYmFsT2JqZWN0TWV0 aG9kVGFibGUoKS0+c3VwcG9ydHNSaWNoU291cmNlSW5mbyhzY29wZUNoYWluLT5nbG9iYWxPYmpl Y3QuZ2V0KCkpKQogICAgICwgbV9zY29wZUNoYWluKCpzY29wZUNoYWluLT5nbG9iYWxEYXRhLCBz Y29wZUNoYWluKQogICAgICwgbV9zeW1ib2xUYWJsZShzeW1ib2xUYWJsZSkKLSAgICAsIG1fc2Nv cGVOb2RlKGV2YWxOb2RlKQorICAgICwgbV9jb2RlTm9kZShldmFsTm9kZSkKICAgICAsIG1fY29k ZUJsb2NrKGNvZGVCbG9jaykKICAgICAsIG1fdGhpc1JlZ2lzdGVyKENhbGxGcmFtZTo6dGhpc0Fy Z3VtZW50T2Zmc2V0KCkpCiAgICAgLCBtX2ZpbmFsbHlEZXB0aCgwKQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5oCmluZGV4 IDdjZDI1NGE2ZDk5NzE2ODVlM2I0OWMxZTFhZDMxZmE3ZjRkZDU0YmMuLmJlY2ZmM2IwZjAwY2Vh NGZhN2E5NzE1NGI4NDljMjhiNDA4YzIzODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKQEAgLTUyNiw3ICs1MjYs NyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgU3Ryb25nPFNjb3BlQ2hhaW5Ob2RlPiBtX3Nj b3BlQ2hhaW47CiAgICAgICAgIFN5bWJvbFRhYmxlKiBtX3N5bWJvbFRhYmxlOwogCi0gICAgICAg IFNjb3BlTm9kZSogbV9zY29wZU5vZGU7CisgICAgICAgIENvZGVOb2RlKiBtX2NvZGVOb2RlOwog ICAgICAgICBDb2RlQmxvY2sqIG1fY29kZUJsb2NrOwogCiAgICAgICAgIC8vIFNvbWUgb2YgdGhl c2Ugb2JqZWN0cyBrZWVwIHBvaW50ZXJzIHRvIG9uZSBhbm90aGVyLiBUaGV5IGFyZSBhcnJhbmdl ZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2RlQ29uc3RydWN0 b3JzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaApp bmRleCA2YzA2OTQ5MGQxOGI4MWYyYzNmYjNkYWJkMTEzMDNkYmExZWRmNjI0Li4wYjAyOWIyZmZh ODk3MmVmNTljMjRhODkzMDY1NTVmM2UwYjE0MTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL05vZGVDb25zdHJ1Y3RvcnMuaApAQCAtODY0LDYgKzg2NCwxNyBAQCBuYW1l c3BhY2UgSlNDIHsKICAgICAgICAgLCBtX3N0YXRlbWVudHMoc3RhdGVtZW50cykKICAgICB7CiAg ICAgfQorICAgIAorICAgIGlubGluZSBTY29wZU5vZGU6OlNjb3BlTm9kZShpbnQgbGluZU51bWJl cikKKyAgICAgICAgOiBTdGF0ZW1lbnROb2RlKGxpbmVOdW1iZXIpCisgICAgeworICAgIH0KKwor ICAgIGlubGluZSBTY29wZU5vZGU6OlNjb3BlTm9kZShpbnQgbGluZU51bWJlciwgU291cmNlRWxl bWVudHMqIGNoaWxkcmVuLCBWYXJTdGFjayogdmFyU3RhY2ssIEZ1bmN0aW9uU3RhY2sqIGZ1bmNT dGFjaywgSWRlbnRpZmllclNldCYgY2FwdHVyZWRWYXJpYWJsZXMpCisgICAgICAgIDogU3RhdGVt ZW50Tm9kZShsaW5lTnVtYmVyKQorICAgICAgICAsIG1fZGF0YShhZG9wdFB0cihuZXcgU2NvcGVO b2RlRGF0YShjaGlsZHJlbiwgdmFyU3RhY2ssIGZ1bmNTdGFjaywgY2FwdHVyZWRWYXJpYWJsZXMp KSkKKyAgICB7CisgICAgfQogCiAgICAgaW5saW5lIEZvckluTm9kZTo6Rm9ySW5Ob2RlKEpTR2xv YmFsRGF0YSogZ2xvYmFsRGF0YSwgaW50IGxpbmVOdW1iZXIsIEV4cHJlc3Npb25Ob2RlKiBsLCBF eHByZXNzaW9uTm9kZSogZXhwciwgU3RhdGVtZW50Tm9kZSogc3RhdGVtZW50KQogICAgICAgICA6 IFN0YXRlbWVudE5vZGUobGluZU51bWJlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9wYXJzZXIvTm9kZXMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2Rl cy5jcHAKaW5kZXggOGFkNDc0ZTU0MTUzODllN2UwNTgxMWVlZGFmZjA3YzY4NjU5ODcxMC4uZjky MGViOTBlYzliMmIyZTc2OWMyZTMwYWNmYTkwOGI4MDE4ZDBmYiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2Rlcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3BhcnNlci9Ob2Rlcy5jcHAKQEAgLTc1LDExICs3NSw5IEBAIFN0YXRlbWVudE5vZGUqIFNv dXJjZUVsZW1lbnRzOjpzaW5nbGVTdGF0ZW1lbnQoKSBjb25zdAogCiAvLyAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLVNjb3BlTm9kZURhdGEgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAKLVNjb3BlTm9kZURhdGE6OlNjb3BlTm9kZURhdGEoUGFyc2VyQXJlbmEmIGFyZW5hLCBTb3Vy Y2VFbGVtZW50cyogc3RhdGVtZW50cywgVmFyU3RhY2sqIHZhclN0YWNrLCBGdW5jdGlvblN0YWNr KiBmdW5jU3RhY2ssIElkZW50aWZpZXJTZXQmIGNhcHR1cmVkVmFyaWFibGVzLCBpbnQgbnVtQ29u c3RhbnRzKQotICAgIDogbV9udW1Db25zdGFudHMobnVtQ29uc3RhbnRzKQotICAgICwgbV9zdGF0 ZW1lbnRzKHN0YXRlbWVudHMpCitTY29wZU5vZGVEYXRhOjpTY29wZU5vZGVEYXRhKFNvdXJjZUVs ZW1lbnRzKiBzdGF0ZW1lbnRzLCBWYXJTdGFjayogdmFyU3RhY2ssIEZ1bmN0aW9uU3RhY2sqIGZ1 bmNTdGFjaywgSWRlbnRpZmllclNldCYgY2FwdHVyZWRWYXJpYWJsZXMpCisgICAgOiBtX3N0YXRl bWVudHMoc3RhdGVtZW50cykKIHsKLSAgICBtX2FyZW5hLnN3YXAoYXJlbmEpOwogICAgIGlmICh2 YXJTdGFjaykKICAgICAgICAgbV92YXJTdGFjay5zd2FwKCp2YXJTdGFjayk7CiAgICAgaWYgKGZ1 bmNTdGFjaykKQEAgLTg3LDMzICs4NSwzMSBAQCBTY29wZU5vZGVEYXRhOjpTY29wZU5vZGVEYXRh KFBhcnNlckFyZW5hJiBhcmVuYSwgU291cmNlRWxlbWVudHMqIHN0YXRlbWVudHMsIFZhcgogICAg IG1fY2FwdHVyZWRWYXJpYWJsZXMuc3dhcChjYXB0dXJlZFZhcmlhYmxlcyk7CiB9CiAKLS8vIC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBTY29wZU5vZGUgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KKy8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBDb2RlTm9kZSAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotU2NvcGVOb2RlOjpTY29wZU5vZGUoSlNH bG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBpbnQgbGluZU51bWJlciwgYm9vbCBpblN0cmljdENvbnRl eHQpCi0gICAgOiBTdGF0ZW1lbnROb2RlKGxpbmVOdW1iZXIpCitDb2RlTm9kZTo6Q29kZU5vZGUo SlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBpbnQgbGluZU51bWJlciwgYm9vbCBpblN0cmljdENv bnRleHQpCisgICAgOiBTY29wZU5vZGUobGluZU51bWJlcikKICAgICAsIFBhcnNlckFyZW5hUmVm Q291bnRlZChnbG9iYWxEYXRhKQogICAgICwgbV9mZWF0dXJlcyhpblN0cmljdENvbnRleHQgPyBT dHJpY3RNb2RlRmVhdHVyZSA6IE5vRmVhdHVyZXMpCisgICAgLCBtX251bUNvbnN0YW50cygwKQog eworICAgIG1fYXJlbmEuc3dhcCgqZ2xvYmFsRGF0YS0+cGFyc2VyQXJlbmEpOwogfQogCi1TY29w ZU5vZGU6OlNjb3BlTm9kZShKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIGludCBsaW5lTnVtYmVy LCBjb25zdCBTb3VyY2VDb2RlJiBzb3VyY2UsIFNvdXJjZUVsZW1lbnRzKiBjaGlsZHJlbiwgVmFy U3RhY2sqIHZhclN0YWNrLCBGdW5jdGlvblN0YWNrKiBmdW5jU3RhY2ssIElkZW50aWZpZXJTZXQm IGNhcHR1cmVkVmFyaWFibGVzLCBDb2RlRmVhdHVyZXMgZmVhdHVyZXMsIGludCBudW1Db25zdGFu dHMpCi0gICAgOiBTdGF0ZW1lbnROb2RlKGxpbmVOdW1iZXIpCitDb2RlTm9kZTo6Q29kZU5vZGUo SlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBpbnQgbGluZU51bWJlciwgY29uc3QgU291cmNlQ29k ZSYgc291cmNlLCBTb3VyY2VFbGVtZW50cyogY2hpbGRyZW4sIFZhclN0YWNrKiB2YXJTdGFjaywg RnVuY3Rpb25TdGFjayogZnVuY1N0YWNrLCBJZGVudGlmaWVyU2V0JiBjYXB0dXJlZFZhcmlhYmxl cywgQ29kZUZlYXR1cmVzIGZlYXR1cmVzLCBpbnQgbnVtQ29uc3RhbnRzKQorICAgIDogU2NvcGVO b2RlKGxpbmVOdW1iZXIsIGNoaWxkcmVuLCB2YXJTdGFjaywgZnVuY1N0YWNrLCBjYXB0dXJlZFZh cmlhYmxlcykKICAgICAsIFBhcnNlckFyZW5hUmVmQ291bnRlZChnbG9iYWxEYXRhKQotICAgICwg bV9kYXRhKGFkb3B0UHRyKG5ldyBTY29wZU5vZGVEYXRhKCpnbG9iYWxEYXRhLT5wYXJzZXJBcmVu YSwgY2hpbGRyZW4sIHZhclN0YWNrLCBmdW5jU3RhY2ssIGNhcHR1cmVkVmFyaWFibGVzLCBudW1D b25zdGFudHMpKSkKICAgICAsIG1fZmVhdHVyZXMoZmVhdHVyZXMpCisgICAgLCBtX251bUNvbnN0 YW50cyhudW1Db25zdGFudHMpCiAgICAgLCBtX3NvdXJjZShzb3VyY2UpCiB7Ci19Ci0KLVN0YXRl bWVudE5vZGUqIFNjb3BlTm9kZTo6c2luZ2xlU3RhdGVtZW50KCkgY29uc3QKLXsKLSAgICByZXR1 cm4gbV9kYXRhLT5tX3N0YXRlbWVudHMgPyBtX2RhdGEtPm1fc3RhdGVtZW50cy0+c2luZ2xlU3Rh dGVtZW50KCkgOiAwOworICAgIG1fYXJlbmEuc3dhcCgqZ2xvYmFsRGF0YS0+cGFyc2VyQXJlbmEp OwogfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gUHJvZ3JhbU5vZGUgLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogaW5saW5lIFByb2dyYW1Ob2RlOjpQcm9ncmFt Tm9kZShKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsIGludCBsaW5lTnVtYmVyLCBTb3VyY2VFbGVt ZW50cyogY2hpbGRyZW4sIFZhclN0YWNrKiB2YXJTdGFjaywgRnVuY3Rpb25TdGFjayogZnVuY1N0 YWNrLCBJZGVudGlmaWVyU2V0JiBjYXB0dXJlZFZhcmlhYmxlcywgY29uc3QgU291cmNlQ29kZSYg c291cmNlLCBDb2RlRmVhdHVyZXMgZmVhdHVyZXMsIGludCBudW1Db25zdGFudHMpCi0gICAgOiBT Y29wZU5vZGUoZ2xvYmFsRGF0YSwgbGluZU51bWJlciwgc291cmNlLCBjaGlsZHJlbiwgdmFyU3Rh Y2ssIGZ1bmNTdGFjaywgY2FwdHVyZWRWYXJpYWJsZXMsIGZlYXR1cmVzLCBudW1Db25zdGFudHMp CisgICAgOiBDb2RlTm9kZShnbG9iYWxEYXRhLCBsaW5lTnVtYmVyLCBzb3VyY2UsIGNoaWxkcmVu LCB2YXJTdGFjaywgZnVuY1N0YWNrLCBjYXB0dXJlZFZhcmlhYmxlcywgZmVhdHVyZXMsIG51bUNv bnN0YW50cykKIHsKIH0KIApAQCAtMTIxLDkgKzExNyw5IEBAIFBhc3NSZWZQdHI8UHJvZ3JhbU5v ZGU+IFByb2dyYW1Ob2RlOjpjcmVhdGUoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBpbnQgbGlu ZU51CiB7CiAgICAgUmVmUHRyPFByb2dyYW1Ob2RlPiBub2RlID0gbmV3IFByb2dyYW1Ob2RlKGds b2JhbERhdGEsIGxpbmVOdW1iZXIsIGNoaWxkcmVuLCB2YXJTdGFjaywgZnVuY1N0YWNrLCAgY2Fw dHVyZWRWYXJpYWJsZXMsIHNvdXJjZSwgZmVhdHVyZXMsIG51bUNvbnN0YW50cyk7CiAKLSAgICBB U1NFUlQobm9kZS0+ZGF0YSgpLT5tX2FyZW5hLmxhc3QoKSA9PSBub2RlKTsKLSAgICBub2RlLT5k YXRhKCktPm1fYXJlbmEucmVtb3ZlTGFzdCgpOwotICAgIEFTU0VSVCghbm9kZS0+ZGF0YSgpLT5t X2FyZW5hLmNvbnRhaW5zKG5vZGUuZ2V0KCkpKTsKKyAgICBBU1NFUlQobm9kZS0+bV9hcmVuYS5s YXN0KCkgPT0gbm9kZSk7CisgICAgbm9kZS0+bV9hcmVuYS5yZW1vdmVMYXN0KCk7CisgICAgQVNT RVJUKCFub2RlLT5tX2FyZW5hLmNvbnRhaW5zKG5vZGUuZ2V0KCkpKTsKIAogICAgIHJldHVybiBu b2RlLnJlbGVhc2UoKTsKIH0KQEAgLTEzMSw3ICsxMjcsNyBAQCBQYXNzUmVmUHRyPFByb2dyYW1O b2RlPiBQcm9ncmFtTm9kZTo6Y3JlYXRlKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgaW50IGxp bmVOdQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIEV2YWxOb2RlIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIGlubGluZSBFdmFsTm9kZTo6RXZhbE5vZGUoSlNHbG9i YWxEYXRhKiBnbG9iYWxEYXRhLCBpbnQgbGluZU51bWJlciwgU291cmNlRWxlbWVudHMqIGNoaWxk cmVuLCBWYXJTdGFjayogdmFyU3RhY2ssIEZ1bmN0aW9uU3RhY2sqIGZ1bmNTdGFjaywgSWRlbnRp ZmllclNldCYgY2FwdHVyZWRWYXJpYWJsZXMsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZSwgQ29k ZUZlYXR1cmVzIGZlYXR1cmVzLCBpbnQgbnVtQ29uc3RhbnRzKQotICAgIDogU2NvcGVOb2RlKGds b2JhbERhdGEsIGxpbmVOdW1iZXIsIHNvdXJjZSwgY2hpbGRyZW4sIHZhclN0YWNrLCBmdW5jU3Rh Y2ssIGNhcHR1cmVkVmFyaWFibGVzLCBmZWF0dXJlcywgbnVtQ29uc3RhbnRzKQorICAgIDogQ29k ZU5vZGUoZ2xvYmFsRGF0YSwgbGluZU51bWJlciwgc291cmNlLCBjaGlsZHJlbiwgdmFyU3RhY2ss IGZ1bmNTdGFjaywgY2FwdHVyZWRWYXJpYWJsZXMsIGZlYXR1cmVzLCBudW1Db25zdGFudHMpCiB7 CiB9CiAKQEAgLTEzOSw5ICsxMzUsOSBAQCBQYXNzUmVmUHRyPEV2YWxOb2RlPiBFdmFsTm9kZTo6 Y3JlYXRlKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgaW50IGxpbmVOdW1iZXIsCiB7CiAgICAg UmVmUHRyPEV2YWxOb2RlPiBub2RlID0gbmV3IEV2YWxOb2RlKGdsb2JhbERhdGEsIGxpbmVOdW1i ZXIsIGNoaWxkcmVuLCB2YXJTdGFjaywgZnVuY1N0YWNrLCBjYXB0dXJlZFZhcmlhYmxlcywgc291 cmNlLCBmZWF0dXJlcywgbnVtQ29uc3RhbnRzKTsKIAotICAgIEFTU0VSVChub2RlLT5kYXRhKCkt Pm1fYXJlbmEubGFzdCgpID09IG5vZGUpOwotICAgIG5vZGUtPmRhdGEoKS0+bV9hcmVuYS5yZW1v dmVMYXN0KCk7Ci0gICAgQVNTRVJUKCFub2RlLT5kYXRhKCktPm1fYXJlbmEuY29udGFpbnMobm9k ZS5nZXQoKSkpOworICAgIEFTU0VSVChub2RlLT5tX2FyZW5hLmxhc3QoKSA9PSBub2RlKTsKKyAg ICBub2RlLT5tX2FyZW5hLnJlbW92ZUxhc3QoKTsKKyAgICBBU1NFUlQoIW5vZGUtPm1fYXJlbmEu Y29udGFpbnMobm9kZS5nZXQoKSkpOwogCiAgICAgcmV0dXJuIG5vZGUucmVsZWFzZSgpOwogfQpA QCAtMTU1LDEyICsxNTEsMTIgQEAgRnVuY3Rpb25QYXJhbWV0ZXJzOjpGdW5jdGlvblBhcmFtZXRl cnMoUGFyYW1ldGVyTm9kZSogZmlyc3RQYXJhbWV0ZXIpCiB9CiAKIGlubGluZSBGdW5jdGlvbkJv ZHlOb2RlOjpGdW5jdGlvbkJvZHlOb2RlKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgaW50IGxp bmVOdW1iZXIsIGJvb2wgaW5TdHJpY3RDb250ZXh0KQotICAgIDogU2NvcGVOb2RlKGdsb2JhbERh dGEsIGxpbmVOdW1iZXIsIGluU3RyaWN0Q29udGV4dCkKKyAgICA6IENvZGVOb2RlKGdsb2JhbERh dGEsIGxpbmVOdW1iZXIsIGluU3RyaWN0Q29udGV4dCkKIHsKIH0KIAogaW5saW5lIEZ1bmN0aW9u Qm9keU5vZGU6OkZ1bmN0aW9uQm9keU5vZGUoSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhLCBpbnQg bGluZU51bWJlciwgU291cmNlRWxlbWVudHMqIGNoaWxkcmVuLCBWYXJTdGFjayogdmFyU3RhY2ss IEZ1bmN0aW9uU3RhY2sqIGZ1bmNTdGFjaywgSWRlbnRpZmllclNldCYgY2FwdHVyZWRWYXJpYWJs ZXMsIGNvbnN0IFNvdXJjZUNvZGUmIHNvdXJjZUNvZGUsIENvZGVGZWF0dXJlcyBmZWF0dXJlcywg aW50IG51bUNvbnN0YW50cykKLSAgICA6IFNjb3BlTm9kZShnbG9iYWxEYXRhLCBsaW5lTnVtYmVy LCBzb3VyY2VDb2RlLCBjaGlsZHJlbiwgdmFyU3RhY2ssIGZ1bmNTdGFjaywgY2FwdHVyZWRWYXJp YWJsZXMsIGZlYXR1cmVzLCBudW1Db25zdGFudHMpCisgICAgOiBDb2RlTm9kZShnbG9iYWxEYXRh LCBsaW5lTnVtYmVyLCBzb3VyY2VDb2RlLCBjaGlsZHJlbiwgdmFyU3RhY2ssIGZ1bmNTdGFjaywg Y2FwdHVyZWRWYXJpYWJsZXMsIGZlYXR1cmVzLCBudW1Db25zdGFudHMpCiB7CiB9CiAKQEAgLTE4 Niw5ICsxODIsOSBAQCBQYXNzUmVmUHRyPEZ1bmN0aW9uQm9keU5vZGU+IEZ1bmN0aW9uQm9keU5v ZGU6OmNyZWF0ZShKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEsCiB7CiAgICAgUmVmUHRyPEZ1bmN0 aW9uQm9keU5vZGU+IG5vZGUgPSBuZXcgRnVuY3Rpb25Cb2R5Tm9kZShnbG9iYWxEYXRhLCBsaW5l TnVtYmVyLCBjaGlsZHJlbiwgdmFyU3RhY2ssIGZ1bmNTdGFjaywgY2FwdHVyZWRWYXJpYWJsZXMs IHNvdXJjZUNvZGUsIGZlYXR1cmVzLCBudW1Db25zdGFudHMpOwogCi0gICAgQVNTRVJUKG5vZGUt PmRhdGEoKS0+bV9hcmVuYS5sYXN0KCkgPT0gbm9kZSk7Ci0gICAgbm9kZS0+ZGF0YSgpLT5tX2Fy ZW5hLnJlbW92ZUxhc3QoKTsKLSAgICBBU1NFUlQoIW5vZGUtPmRhdGEoKS0+bV9hcmVuYS5jb250 YWlucyhub2RlLmdldCgpKSk7CisgICAgQVNTRVJUKG5vZGUtPm1fYXJlbmEubGFzdCgpID09IG5v ZGUpOworICAgIG5vZGUtPm1fYXJlbmEucmVtb3ZlTGFzdCgpOworICAgIEFTU0VSVCghbm9kZS0+ bV9hcmVuYS5jb250YWlucyhub2RlLmdldCgpKSk7CiAKICAgICByZXR1cm4gbm9kZS5yZWxlYXNl KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmgKaW5kZXggMjNmMmNkZTljOTU0 ZWU2NjUxNjY3NjdhMDlkOWQxOTQ5Mzc4ZmM1Yi4uMjFiNTgyMzZmZWFhZGQxNDJjYzA3ZmUxZmUx MjFlNWEzZDE3Nzc3YSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9O b2Rlcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuaApAQCAtNDUs NyArNDUsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBjbGFzcyBSZWFkTW9kaWZ5UmVzb2x2ZU5v ZGU7CiAgICAgY2xhc3MgUmVnaXN0ZXJJRDsKICAgICBjbGFzcyBTY29wZUNoYWluTm9kZTsKLSAg ICBjbGFzcyBTY29wZU5vZGU7CisgICAgY2xhc3MgQ29kZU5vZGU7CiAKICAgICB0eXBlZGVmIHVu c2lnbmVkIENvZGVGZWF0dXJlczsKIApAQCAtMTM3OSwyOSArMTM3OSw0NyBAQCBuYW1lc3BhY2Ug SlNDIHsKICAgICAgICAgdHlwZWRlZiBEZWNsYXJhdGlvblN0YWNrczo6VmFyU3RhY2sgVmFyU3Rh Y2s7CiAgICAgICAgIHR5cGVkZWYgRGVjbGFyYXRpb25TdGFja3M6OkZ1bmN0aW9uU3RhY2sgRnVu Y3Rpb25TdGFjazsKIAotICAgICAgICBTY29wZU5vZGVEYXRhKFBhcnNlckFyZW5hJiwgU291cmNl RWxlbWVudHMqLCBWYXJTdGFjayosIEZ1bmN0aW9uU3RhY2sqLCBJZGVudGlmaWVyU2V0JiwgaW50 IG51bUNvbnN0YW50cyk7CisgICAgICAgIFNjb3BlTm9kZURhdGEoU291cmNlRWxlbWVudHMqLCBW YXJTdGFjayosIEZ1bmN0aW9uU3RhY2sqLCBJZGVudGlmaWVyU2V0Jik7CiAKLSAgICAgICAgUGFy c2VyQXJlbmEgbV9hcmVuYTsKICAgICAgICAgVmFyU3RhY2sgbV92YXJTdGFjazsKICAgICAgICAg RnVuY3Rpb25TdGFjayBtX2Z1bmN0aW9uU3RhY2s7Ci0gICAgICAgIGludCBtX251bUNvbnN0YW50 czsKICAgICAgICAgU291cmNlRWxlbWVudHMqIG1fc3RhdGVtZW50czsKICAgICAgICAgSWRlbnRp ZmllclNldCBtX2NhcHR1cmVkVmFyaWFibGVzOwogICAgIH07CiAKLSAgICBjbGFzcyBTY29wZU5v ZGUgOiBwdWJsaWMgU3RhdGVtZW50Tm9kZSwgcHVibGljIFBhcnNlckFyZW5hUmVmQ291bnRlZCB7 CisgICAgY2xhc3MgU2NvcGVOb2RlIDogcHVibGljIFN0YXRlbWVudE5vZGUgewogICAgIHB1Ymxp YzoKICAgICAgICAgdHlwZWRlZiBEZWNsYXJhdGlvblN0YWNrczo6VmFyU3RhY2sgVmFyU3RhY2s7 CiAgICAgICAgIHR5cGVkZWYgRGVjbGFyYXRpb25TdGFja3M6OkZ1bmN0aW9uU3RhY2sgRnVuY3Rp b25TdGFjazsKIAotICAgICAgICBTY29wZU5vZGUoSlNHbG9iYWxEYXRhKiwgaW50LCBib29sIGlu U3RyaWN0Q29udGV4dCk7Ci0gICAgICAgIFNjb3BlTm9kZShKU0dsb2JhbERhdGEqLCBpbnQsIGNv bnN0IFNvdXJjZUNvZGUmLCBTb3VyY2VFbGVtZW50cyosIFZhclN0YWNrKiwgRnVuY3Rpb25TdGFj ayosIElkZW50aWZpZXJTZXQmLCBDb2RlRmVhdHVyZXMsIGludCBudW1Db25zdGFudHMpOwotCi0g ICAgICAgIHVzaW5nIFBhcnNlckFyZW5hUmVmQ291bnRlZDo6b3BlcmF0b3IgbmV3OworICAgICAg ICBTY29wZU5vZGUoaW50KTsKKyAgICAgICAgU2NvcGVOb2RlKGludCwgU291cmNlRWxlbWVudHMq LCBWYXJTdGFjayosIEZ1bmN0aW9uU3RhY2sqLCBJZGVudGlmaWVyU2V0Jik7CiAKICAgICAgICAg U2NvcGVOb2RlRGF0YSogZGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS5nZXQoKTsgfQogICAg ICAgICB2b2lkIGRlc3Ryb3lEYXRhKCkgeyBtX2RhdGEuY2xlYXIoKTsgfQogCisgICAgICAgIGJv b2wgaGFzQ2FwdHVyZWRWYXJpYWJsZXMoKSBjb25zdCB7IHJldHVybiAhIW1fZGF0YS0+bV9jYXB0 dXJlZFZhcmlhYmxlcy5zaXplKCk7IH0KKyAgICAgICAgc2l6ZV90IGNhcHR1cmVkVmFyaWFibGVD b3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS0+bV9jYXB0dXJlZFZhcmlhYmxlcy5zaXplKCk7 IH0KKyAgICAgICAgYm9vbCBjYXB0dXJlcyhjb25zdCBJZGVudGlmaWVyJiBpZGVudCkgeyByZXR1 cm4gbV9kYXRhLT5tX2NhcHR1cmVkVmFyaWFibGVzLmNvbnRhaW5zKGlkZW50LmltcGwoKSk7IH0K KworICAgICAgICBWYXJTdGFjayYgdmFyU3RhY2soKSB7IEFTU0VSVChtX2RhdGEpOyByZXR1cm4g bV9kYXRhLT5tX3ZhclN0YWNrOyB9CisgICAgICAgIEZ1bmN0aW9uU3RhY2smIGZ1bmN0aW9uU3Rh Y2soKSB7IEFTU0VSVChtX2RhdGEpOyByZXR1cm4gbV9kYXRhLT5tX2Z1bmN0aW9uU3RhY2s7IH0K KworICAgICAgICBTdGF0ZW1lbnROb2RlKiBzaW5nbGVTdGF0ZW1lbnQoKSBjb25zdCB7IHJldHVy biBkYXRhKCktPm1fc3RhdGVtZW50cyA/IGRhdGEoKS0+bV9zdGF0ZW1lbnRzLT5zaW5nbGVTdGF0 ZW1lbnQoKSA6IDA7IH0KKworICAgICAgICB2b2lkIGVtaXRTdGF0ZW1lbnRzQnl0ZWNvZGUoQnl0 ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiBkZXN0aW5hdGlvbik7CisKKyAgICBwcml2YXRl OgorICAgICAgICBPd25QdHI8U2NvcGVOb2RlRGF0YT4gbV9kYXRhOworICAgIH07CisKKyAgICBj bGFzcyBDb2RlTm9kZSA6IHB1YmxpYyBTY29wZU5vZGUsIHB1YmxpYyBQYXJzZXJBcmVuYVJlZkNv dW50ZWQgeworICAgIHB1YmxpYzoKKyAgICAgICAgQ29kZU5vZGUoSlNHbG9iYWxEYXRhKiwgaW50 LCBib29sIGluU3RyaWN0Q29udGV4dCk7CisgICAgICAgIENvZGVOb2RlKEpTR2xvYmFsRGF0YSos IGludCwgY29uc3QgU291cmNlQ29kZSYsIFNvdXJjZUVsZW1lbnRzKiwgVmFyU3RhY2sqLCBGdW5j dGlvblN0YWNrKiwgSWRlbnRpZmllclNldCYsIENvZGVGZWF0dXJlcywgaW50IG51bUNvbnN0YW50 cyk7CisKKyAgICAgICAgdXNpbmcgUGFyc2VyQXJlbmFSZWZDb3VudGVkOjpvcGVyYXRvciBuZXc7 CisKICAgICAgICAgY29uc3QgU291cmNlQ29kZSYgc291cmNlKCkgY29uc3QgeyByZXR1cm4gbV9z b3VyY2U7IH0KICAgICAgICAgY29uc3QgVVN0cmluZyYgc291cmNlVVJMKCkgY29uc3QgeyByZXR1 cm4gbV9zb3VyY2UucHJvdmlkZXIoKS0+dXJsKCk7IH0KICAgICAgICAgaW50cHRyX3Qgc291cmNl SUQoKSBjb25zdCB7IHJldHVybiBtX3NvdXJjZS5wcm92aWRlcigpLT5hc0lEKCk7IH0KQEAgLTE0 MTQsMzcgKzE0MzIsMjcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIGJvb2wgaXNTdHJpY3RN b2RlKCkgY29uc3QgeyByZXR1cm4gbV9mZWF0dXJlcyAmIFN0cmljdE1vZGVGZWF0dXJlOyB9CiAg ICAgICAgIHZvaWQgc2V0VXNlc0FyZ3VtZW50cygpIHsgbV9mZWF0dXJlcyB8PSBBcmd1bWVudHNG ZWF0dXJlOyB9CiAgICAgICAgIGJvb2wgdXNlc1RoaXMoKSBjb25zdCB7IHJldHVybiBtX2ZlYXR1 cmVzICYgVGhpc0ZlYXR1cmU7IH0KLSAgICAgICAgYm9vbCBuZWVkc0FjdGl2YXRpb25Gb3JNb3Jl VGhhblZhcmlhYmxlcygpIGNvbnN0IHsgQVNTRVJUKG1fZGF0YSk7IHJldHVybiBtX2ZlYXR1cmVz ICYgKEV2YWxGZWF0dXJlIHwgV2l0aEZlYXR1cmUgfCBDYXRjaEZlYXR1cmUpOyB9Ci0gICAgICAg IGJvb2wgbmVlZHNBY3RpdmF0aW9uKCkgY29uc3QgeyBBU1NFUlQobV9kYXRhKTsgcmV0dXJuICho YXNDYXB0dXJlZFZhcmlhYmxlcygpKSB8fCAobV9mZWF0dXJlcyAmIChFdmFsRmVhdHVyZSB8IFdp dGhGZWF0dXJlIHwgQ2F0Y2hGZWF0dXJlKSk7IH0KLSAgICAgICAgYm9vbCBoYXNDYXB0dXJlZFZh cmlhYmxlcygpIGNvbnN0IHsgcmV0dXJuICEhbV9kYXRhLT5tX2NhcHR1cmVkVmFyaWFibGVzLnNp emUoKTsgfQotICAgICAgICBzaXplX3QgY2FwdHVyZWRWYXJpYWJsZUNvdW50KCkgY29uc3QgeyBy ZXR1cm4gbV9kYXRhLT5tX2NhcHR1cmVkVmFyaWFibGVzLnNpemUoKTsgfQotICAgICAgICBib29s IGNhcHR1cmVzKGNvbnN0IElkZW50aWZpZXImIGlkZW50KSB7IHJldHVybiBtX2RhdGEtPm1fY2Fw dHVyZWRWYXJpYWJsZXMuY29udGFpbnMoaWRlbnQuaW1wbCgpKTsgfQotCi0gICAgICAgIFZhclN0 YWNrJiB2YXJTdGFjaygpIHsgQVNTRVJUKG1fZGF0YSk7IHJldHVybiBtX2RhdGEtPm1fdmFyU3Rh Y2s7IH0KLSAgICAgICAgRnVuY3Rpb25TdGFjayYgZnVuY3Rpb25TdGFjaygpIHsgQVNTRVJUKG1f ZGF0YSk7IHJldHVybiBtX2RhdGEtPm1fZnVuY3Rpb25TdGFjazsgfQorICAgICAgICBib29sIG5l ZWRzQWN0aXZhdGlvbkZvck1vcmVUaGFuVmFyaWFibGVzKCkgY29uc3QgeyBBU1NFUlQoZGF0YSgp KTsgcmV0dXJuIG1fZmVhdHVyZXMgJiAoRXZhbEZlYXR1cmUgfCBXaXRoRmVhdHVyZSB8IENhdGNo RmVhdHVyZSk7IH0KKyAgICAgICAgYm9vbCBuZWVkc0FjdGl2YXRpb24oKSBjb25zdCB7IEFTU0VS VChkYXRhKCkpOyByZXR1cm4gKGhhc0NhcHR1cmVkVmFyaWFibGVzKCkpIHx8IChtX2ZlYXR1cmVz ICYgKEV2YWxGZWF0dXJlIHwgV2l0aEZlYXR1cmUgfCBDYXRjaEZlYXR1cmUpKTsgfQogCiAgICAg ICAgIGludCBuZWVkZWRDb25zdGFudHMoKQogICAgICAgICB7Ci0gICAgICAgICAgICBBU1NFUlQo bV9kYXRhKTsKICAgICAgICAgICAgIC8vIFdlIG1heSBuZWVkIDIgbW9yZSBjb25zdGFudHMgdGhh biB0aGUgY291bnQgZ2l2ZW4gYnkgdGhlIHBhcnNlciwKICAgICAgICAgICAgIC8vIGJlY2F1c2Ug b2YgdGhlIHZhcmlvdXMgdXNlcyBvZiBqc1VuZGVmaW5lZCgpIGFuZCBqc051bGwoKS4KLSAgICAg ICAgICAgIHJldHVybiBtX2RhdGEtPm1fbnVtQ29uc3RhbnRzICsgMjsKKyAgICAgICAgICAgIHJl dHVybiBtX251bUNvbnN0YW50cyArIDI7CiAgICAgICAgIH0KIAotICAgICAgICBTdGF0ZW1lbnRO b2RlKiBzaW5nbGVTdGF0ZW1lbnQoKSBjb25zdDsKLQotICAgICAgICB2b2lkIGVtaXRTdGF0ZW1l bnRzQnl0ZWNvZGUoQnl0ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiBkZXN0aW5hdGlvbik7 Ci0KICAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIHZvaWQgc2V0U291cmNlKGNvbnN0IFNvdXJjZUNv ZGUmIHNvdXJjZSkgeyBtX3NvdXJjZSA9IHNvdXJjZTsgfQorICAgICAgICBQYXJzZXJBcmVuYSBt X2FyZW5hOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgT3duUHRyPFNjb3BlTm9kZURhdGE+IG1f ZGF0YTsKICAgICAgICAgQ29kZUZlYXR1cmVzIG1fZmVhdHVyZXM7CisgICAgICAgIHVuc2lnbmVk IG1fbnVtQ29uc3RhbnRzOwogICAgICAgICBTb3VyY2VDb2RlIG1fc291cmNlOwogICAgIH07CiAK LSAgICBjbGFzcyBQcm9ncmFtTm9kZSA6IHB1YmxpYyBTY29wZU5vZGUgeworICAgIGNsYXNzIFBy b2dyYW1Ob2RlIDogcHVibGljIENvZGVOb2RlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRp YyBjb25zdCBib29sIGlzRnVuY3Rpb25Ob2RlID0gZmFsc2U7CiAgICAgICAgIHN0YXRpYyBQYXNz UmVmUHRyPFByb2dyYW1Ob2RlPiBjcmVhdGUoSlNHbG9iYWxEYXRhKiwgaW50LCBTb3VyY2VFbGVt ZW50cyosIFZhclN0YWNrKiwgRnVuY3Rpb25TdGFjayosIElkZW50aWZpZXJTZXQmLCBjb25zdCBT b3VyY2VDb2RlJiwgQ29kZUZlYXR1cmVzLCBpbnQgbnVtQ29uc3RhbnRzKTsKQEAgLTE0NTcsNyAr MTQ2NSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2aXJ0dWFsIFJlZ2lzdGVySUQqIGVt aXRCeXRlY29kZShCeXRlY29kZUdlbmVyYXRvciYsIFJlZ2lzdGVySUQqID0gMCk7CiAgICAgfTsK IAotICAgIGNsYXNzIEV2YWxOb2RlIDogcHVibGljIFNjb3BlTm9kZSB7CisgICAgY2xhc3MgRXZh bE5vZGUgOiBwdWJsaWMgQ29kZU5vZGUgewogICAgIHB1YmxpYzoKICAgICAgICAgc3RhdGljIGNv bnN0IGJvb2wgaXNGdW5jdGlvbk5vZGUgPSBmYWxzZTsKICAgICAgICAgc3RhdGljIFBhc3NSZWZQ dHI8RXZhbE5vZGU+IGNyZWF0ZShKU0dsb2JhbERhdGEqLCBpbnQsIFNvdXJjZUVsZW1lbnRzKiwg VmFyU3RhY2sqLCBGdW5jdGlvblN0YWNrKiwgSWRlbnRpZmllclNldCYsIGNvbnN0IFNvdXJjZUNv ZGUmLCBDb2RlRmVhdHVyZXMsIGludCBudW1Db25zdGFudHMpOwpAQCAtMTQ3OSw3ICsxNDg3LDcg QEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIEZ1bmN0aW9uUGFyYW1ldGVycyhQYXJhbWV0ZXJO b2RlKik7CiAgICAgfTsKIAotICAgIGNsYXNzIEZ1bmN0aW9uQm9keU5vZGUgOiBwdWJsaWMgU2Nv cGVOb2RlIHsKKyAgICBjbGFzcyBGdW5jdGlvbkJvZHlOb2RlIDogcHVibGljIENvZGVOb2RlIHsK ICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBjb25zdCBib29sIGlzRnVuY3Rpb25Ob2RlID0g dHJ1ZTsKICAgICAgICAgc3RhdGljIEZ1bmN0aW9uQm9keU5vZGUqIGNyZWF0ZShKU0dsb2JhbERh dGEqLCBpbnQsIGJvb2wgaXNTdHJpY3RNb2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvUGFyc2VyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1Bh cnNlci5oCmluZGV4IGVmMTc2ZjAxNGM1ZmRjYzg3NGM0MzA1ZTdiZTA4MDU0ZjM0ZDgyMjguLmEy Yzk3MTlkMGQ1ZGFiNzcyYTVhZjFmZGYxNTFlNWZlZjU1Nzc4MDAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3BhcnNlci9QYXJzZXIuaApAQCAtNDg3LDcgKzQ4Nyw3IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludCwgaW50LCBJZGVudGlmaWVyU2V0Jik7CiAKICAgICAvLyBV c2VkIHRvIGRldGVybWluZSB0eXBlIG9mIGVycm9yIHRvIHJlcG9ydC4KLSAgICBib29sIGlzRnVu Y3Rpb25Cb2R5Tm9kZShTY29wZU5vZGUqKSB7IHJldHVybiBmYWxzZTsgfQorICAgIGJvb2wgaXNG dW5jdGlvbkJvZHlOb2RlKENvZGVOb2RlKikgeyByZXR1cm4gZmFsc2U7IH0KICAgICBib29sIGlz RnVuY3Rpb25Cb2R5Tm9kZShGdW5jdGlvbkJvZHlOb2RlKikgeyByZXR1cm4gdHJ1ZTsgfQogCiAK