176480 2017-09-06 16:20:12 -0700 Allow modern decoding of enums and OptionSets 2017-09-27 12:37:09 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes webkit-bug-importer oldest_to_newest 1346138 0 achristensen 2017-09-06 16:20:12 -0700 Allow modern decoding of enums and OptionSets 1346140 1 320074 achristensen 2017-09-06 16:20:38 -0700 Created attachment 320074 Patch 1346143 2 320077 achristensen 2017-09-06 16:22:40 -0700 Created attachment 320077 Patch 1346569 3 achristensen 2017-09-07 14:57:32 -0700 http://trac.webkit.org/r221760 1353532 4 webkit-bug-importer 2017-09-27 12:37:09 -0700 <rdar://problem/34693615> 320074 2017-09-06 16:20:38 -0700 2017-09-06 16:22:39 -0700 Patch bug-176480-20170906162037.patch text/plain 5912 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE3MDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA5LTA2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWxsb3cgbW9kZXJu IGRlY29kaW5nIG9mIGVudW1zIGFuZCBPcHRpb25TZXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY0ODAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5o OgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPE9wdGlvblNldDxUPj46OmRlY29kZSk6Cisg ICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuaDoKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6 b3BlcmF0b3I+Pik6CisgICAgICAgICogUGxhdGZvcm0vSVBDL0VuY29kZXIuaDoKKyAgICAgICAg KiBTaGFyZWQvV2Vic2l0ZVBvbGljaWVzLmg6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVQb2xp Y2llczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZVBvbGljaWVzOjpk ZWNvZGUpOgorCiAyMDE3LTA5LTA2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBJbnRyb2R1Y2UgYXN5bmNocm9ub3VzIG9wZW5pbmcgb2YgQ2FjaGVTdG9yYWdl RW5naW5lIGNhY2hlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENv ZGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0FyZ3VtZW50 Q29kZXJzLmgJKHJldmlzaW9uIDIyMTcwMSkKKysrIFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBD L0FyZ3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDYgKzY5LDE1IEBAIHRlbXBs YXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBBcmd1bWVudENvZGUKICAgICAgICAgb3B0aW9uU2V0ID0g T3B0aW9uU2V0PFQ+Ojpmcm9tUmF3KHZhbHVlKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg fQorCisgICAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8T3B0aW9uU2V0PFQ+PiBkZWNvZGUoRGVjb2Rl ciYgZGVjb2RlcikKKyAgICB7CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHZhbHVl OworICAgICAgICBkZWNvZGVyID4+IHZhbHVlOworICAgICAgICBpZiAoIXZhbHVlKQorICAgICAg ICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgcmV0dXJuIE9wdGlvblNldDxUPjo6 ZnJvbVJhdygqdmFsdWUpOworICAgIH0KIH07CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVj dCBBcmd1bWVudENvZGVyPHN0ZDo6b3B0aW9uYWw8VD4+IHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv UGxhdGZvcm0vSVBDL0RlY29kZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRm b3JtL0lQQy9EZWNvZGVyLmgJKHJldmlzaW9uIDIyMTcwMSkKKysrIFNvdXJjZS9XZWJLaXQvUGxh dGZvcm0vSVBDL0RlY29kZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYgKzEwOSwxNiBAQCBw dWJsaWM6CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAorICAgIHRlbXBsYXRlPHR5cGVu YW1lIEUsIHN0ZDo6ZW5hYmxlX2lmX3Q8c3RkOjppc19lbnVtPEU+Ojp2YWx1ZT4qID0gbnVsbHB0 cj4KKyAgICBEZWNvZGVyJiBvcGVyYXRvcj4+KHN0ZDo6b3B0aW9uYWw8RT4mIG9wdGlvbmFsKQor ICAgIHsKKyAgICAgICAgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gdmFsdWU7CisgICAgICAgICp0 aGlzID4+IHZhbHVlOworICAgICAgICBpZiAodmFsdWUgJiYgaXNWYWxpZEVudW08RT4oKnZhbHVl KSkKKyAgICAgICAgICAgIG9wdGlvbmFsID0gc3RhdGljX2Nhc3Q8RT4oKnZhbHVlKTsKKyAgICAg ICAgcmV0dXJuICp0aGlzOworICAgIH0KKwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wg ZGVjb2RlRW51bShUJiByZXN1bHQpCiAgICAgewogICAgICAgICBzdGF0aWNfYXNzZXJ0KHNpemVv ZihUKSA8PSA4LCAiRW51bSB0eXBlIFQgbXVzdCBub3QgYmUgbGFyZ2VyIHRoYW4gNjQgYml0cyEi KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0VuY29kZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9FbmNvZGVyLmgJKHJldmlzaW9uIDIyMTcw MSkKKysrIFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0VuY29kZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtNjUsMTMgKzY1LDIxIEBAIHB1YmxpYzoKICAgICAgICAgZW5jb2RlKHN0YXRpY19jYXN0 PHVpbnQ2NF90Pih0KSk7CiAgICAgfQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KLSAgICBh dXRvIGVuY29kZShUJiYgdCkgLT4gc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19lbnVtPHR5cGVu YW1lIHN0ZDo6cmVtb3ZlX2NvbnN0X3Q8c3RkOjpyZW1vdmVfcmVmZXJlbmNlX3Q8VD4+Pjo6dmFs dWU+CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19l bnVtPHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX2NvbnN0X3Q8c3RkOjpyZW1vdmVfcmVmZXJlbmNlX3Q8 VD4+Pjo6dmFsdWU+KiA9IG51bGxwdHI+CisgICAgdm9pZCBlbmNvZGUoVCYmIHQpCiAgICAgewog ICAgICAgICBBcmd1bWVudENvZGVyPHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX2NvbnN0PHR5cGVuYW1l IHN0ZDo6cmVtb3ZlX3JlZmVyZW5jZTxUPjo6dHlwZT46OnR5cGU+OjplbmNvZGUoKnRoaXMsIHN0 ZDo6Zm9yd2FyZDxUPih0KSk7CiAgICAgfQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gRW5j b2RlciYgb3BlcmF0b3I8PChUJiYgdCkKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzdGQ6OmVu YWJsZV9pZl90PHN0ZDo6aXNfZW51bTxUPjo6dmFsdWU+KiA9IG51bGxwdHI+CisgICAgRW5jb2Rl ciYgb3BlcmF0b3I8PChUJiYgdCkKKyAgICB7CisgICAgICAgIGVuY29kZShzdGF0aWNfY2FzdDx1 aW50NjRfdD4odCkpOworICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgfQorCisgICAgdGVtcGxh dGU8dHlwZW5hbWUgVCwgc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19lbnVtPFQ+Ojp2YWx1ZT4q ID0gbnVsbHB0cj4KKyAgICBFbmNvZGVyJiBvcGVyYXRvcjw8KFQmJiB0KQogICAgIHsKICAgICAg ICAgZW5jb2RlKHN0ZDo6Zm9yd2FyZDxUPih0KSk7CiAgICAgICAgIHJldHVybiAqdGhpczsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llcy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llcy5oCShyZXZpc2lvbiAyMjE3MDEp CisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXMuaAkod29ya2luZyBjb3B5 KQpAQCAtMjUsNiArMjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgPHd0Zi9FbnVt VHJhaXRzLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlvblNldC5oPgogI2luY2x1ZGUgPHd0Zi9PcHRp b25hbC5oPgogCkBAIC0zNyw2ICszOCwyNCBAQCBlbnVtIGNsYXNzIFdlYnNpdGVBdXRvcGxheVBv bGljeSB7CiAgICAgRGVueQogfTsKIAorfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKK25hbWVzcGFj ZSBXVEYgeworCit0ZW1wbGF0ZTw+IHN0cnVjdCBFbnVtVHJhaXRzPFdlYktpdDo6V2Vic2l0ZUF1 dG9wbGF5UG9saWN5PiB7CisgICAgdXNpbmcgdmFsdWVzID0gRW51bVZhbHVlczwKKyAgICAgICAg V2ViS2l0OjpXZWJzaXRlQXV0b3BsYXlQb2xpY3ksCisgICAgICAgIFdlYktpdDo6V2Vic2l0ZUF1 dG9wbGF5UG9saWN5OjpEZWZhdWx0LAorICAgICAgICBXZWJLaXQ6OldlYnNpdGVBdXRvcGxheVBv bGljeTo6QWxsb3csCisgICAgICAgIFdlYktpdDo6V2Vic2l0ZUF1dG9wbGF5UG9saWN5OjpBbGxv d1dpdGhvdXRTb3VuZCwKKyAgICAgICAgV2ViS2l0OjpXZWJzaXRlQXV0b3BsYXlQb2xpY3k6OkRl bnkKKyAgICA+OworfTsKKworfSAvLyBuYW1lc3BhY2UgV1RGCisKK25hbWVzcGFjZSBXZWJLaXQg eworCiBlbnVtIGNsYXNzIFdlYnNpdGVBdXRvcGxheVF1aXJrIHsKICAgICBTeW50aGVzaXplZFBh dXNlRXZlbnRzID0gMSA8PCAwLAogICAgIEluaGVyaXRlZFVzZXJHZXN0dXJlcyA9IDEgPDwgMSwK QEAgLTU1LDI1ICs3NCwzMiBAQCBzdHJ1Y3QgV2Vic2l0ZVBvbGljaWVzIHsKIHRlbXBsYXRlPGNs YXNzIEVuY29kZXI+IHZvaWQgV2Vic2l0ZVBvbGljaWVzOjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl cikgY29uc3QKIHsKICAgICBlbmNvZGVyIDw8IGNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQ7Ci0gICAg ZW5jb2Rlci5lbmNvZGVFbnVtKGF1dG9wbGF5UG9saWN5KTsKKyAgICBlbmNvZGVyIDw8IGF1dG9w bGF5UG9saWN5OwogICAgIGVuY29kZXIgPDwgYWxsb3dlZEF1dG9wbGF5UXVpcmtzOwogfQogCiB0 ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBzdGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llcz4gV2Vi c2l0ZVBvbGljaWVzOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKIHsKLSAgICBib29sIGNvbnRl bnRCbG9ja2Vyc0VuYWJsZWQ7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb250ZW50QmxvY2tl cnNFbmFibGVkKSkKKyAgICBzdGQ6Om9wdGlvbmFsPGJvb2w+IGNvbnRlbnRCbG9ja2Vyc0VuYWJs ZWQ7CisgICAgZGVjb2RlciA+PiBjb250ZW50QmxvY2tlcnNFbmFibGVkOworICAgIGlmICghY29u dGVudEJsb2NrZXJzRW5hYmxlZCkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICAgICAK LSAgICBXZWJzaXRlQXV0b3BsYXlQb2xpY3kgYXV0b3BsYXlQb2xpY3k7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZUVudW0oYXV0b3BsYXlQb2xpY3kpKQorICAgIHN0ZDo6b3B0aW9uYWw8V2Vic2l0 ZUF1dG9wbGF5UG9saWN5PiBhdXRvcGxheVBvbGljeTsKKyAgICBkZWNvZGVyID4+IGF1dG9wbGF5 UG9saWN5OworICAgIGlmICghYXV0b3BsYXlQb2xpY3kpCiAgICAgICAgIHJldHVybiBzdGQ6Om51 bGxvcHQ7CiAKLSAgICBPcHRpb25TZXQ8V2Vic2l0ZUF1dG9wbGF5UXVpcms+IGFsbG93ZWRBdXRv cGxheVF1aXJrczsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGFsbG93ZWRBdXRvcGxheVF1aXJr cykpCisgICAgc3RkOjpvcHRpb25hbDxPcHRpb25TZXQ8V2Vic2l0ZUF1dG9wbGF5UXVpcms+PiBh bGxvd2VkQXV0b3BsYXlRdWlya3M7CisgICAgZGVjb2RlciA+PiBhbGxvd2VkQXV0b3BsYXlRdWly a3M7CisgICAgaWYgKCFhbGxvd2VkQXV0b3BsYXlRdWlya3MpCiAgICAgICAgIHJldHVybiBzdGQ6 Om51bGxvcHQ7CiAKLSAgICByZXR1cm4geyB7IGNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQsIGFsbG93 ZWRBdXRvcGxheVF1aXJrcywgYXV0b3BsYXlQb2xpY3kgfSB9OworICAgIHJldHVybiB7IHsKKyAg ICAgICAgV1RGTW92ZSgqY29udGVudEJsb2NrZXJzRW5hYmxlZCksCisgICAgICAgIFdURk1vdmUo KmFsbG93ZWRBdXRvcGxheVF1aXJrcyksCisgICAgICAgIFdURk1vdmUoKmF1dG9wbGF5UG9saWN5 KSwKKyAgICB9IH07CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 320077 2017-09-06 16:22:40 -0700 2017-09-07 12:03:41 -0700 Patch bug-176480-20170906162240.patch text/plain 5803 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE3MDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA5LTA2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWxsb3cgbW9kZXJu IGRlY29kaW5nIG9mIGVudW1zIGFuZCBPcHRpb25TZXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY0ODAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5o OgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPE9wdGlvblNldDxUPj46OmRlY29kZSk6Cisg ICAgICAgICogUGxhdGZvcm0vSVBDL0RlY29kZXIuaDoKKyAgICAgICAgKElQQzo6RGVjb2Rlcjo6 b3BlcmF0b3I+Pik6CisgICAgICAgICogUGxhdGZvcm0vSVBDL0VuY29kZXIuaDoKKyAgICAgICAg KiBTaGFyZWQvV2Vic2l0ZVBvbGljaWVzLmg6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVQb2xp Y2llczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZVBvbGljaWVzOjpk ZWNvZGUpOgorCiAyMDE3LTA5LTA2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBJbnRyb2R1Y2UgYXN5bmNocm9ub3VzIG9wZW5pbmcgb2YgQ2FjaGVTdG9yYWdl RW5naW5lIGNhY2hlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9Bcmd1bWVudENv ZGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0FyZ3VtZW50 Q29kZXJzLmgJKHJldmlzaW9uIDIyMTcwMSkKKysrIFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBD L0FyZ3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDYgKzY5LDE1IEBAIHRlbXBs YXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBBcmd1bWVudENvZGUKICAgICAgICAgb3B0aW9uU2V0ID0g T3B0aW9uU2V0PFQ+Ojpmcm9tUmF3KHZhbHVlKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg fQorCisgICAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8T3B0aW9uU2V0PFQ+PiBkZWNvZGUoRGVjb2Rl ciYgZGVjb2RlcikKKyAgICB7CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHZhbHVl OworICAgICAgICBkZWNvZGVyID4+IHZhbHVlOworICAgICAgICBpZiAoIXZhbHVlKQorICAgICAg ICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgcmV0dXJuIE9wdGlvblNldDxUPjo6 ZnJvbVJhdygqdmFsdWUpOworICAgIH0KIH07CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVj dCBBcmd1bWVudENvZGVyPHN0ZDo6b3B0aW9uYWw8VD4+IHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQv UGxhdGZvcm0vSVBDL0RlY29kZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRm b3JtL0lQQy9EZWNvZGVyLmgJKHJldmlzaW9uIDIyMTcwMSkKKysrIFNvdXJjZS9XZWJLaXQvUGxh dGZvcm0vSVBDL0RlY29kZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYgKzEwOSwxNiBAQCBw dWJsaWM6CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAorICAgIHRlbXBsYXRlPHR5cGVu YW1lIEUsIHN0ZDo6ZW5hYmxlX2lmX3Q8c3RkOjppc19lbnVtPEU+Ojp2YWx1ZT4qID0gbnVsbHB0 cj4KKyAgICBEZWNvZGVyJiBvcGVyYXRvcj4+KHN0ZDo6b3B0aW9uYWw8RT4mIG9wdGlvbmFsKQor ICAgIHsKKyAgICAgICAgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gdmFsdWU7CisgICAgICAgICp0 aGlzID4+IHZhbHVlOworICAgICAgICBpZiAodmFsdWUgJiYgaXNWYWxpZEVudW08RT4oKnZhbHVl KSkKKyAgICAgICAgICAgIG9wdGlvbmFsID0gc3RhdGljX2Nhc3Q8RT4oKnZhbHVlKTsKKyAgICAg ICAgcmV0dXJuICp0aGlzOworICAgIH0KKwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGJvb2wg ZGVjb2RlRW51bShUJiByZXN1bHQpCiAgICAgewogICAgICAgICBzdGF0aWNfYXNzZXJ0KHNpemVv ZihUKSA8PSA4LCAiRW51bSB0eXBlIFQgbXVzdCBub3QgYmUgbGFyZ2VyIHRoYW4gNjQgYml0cyEi KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0VuY29kZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9FbmNvZGVyLmgJKHJldmlzaW9uIDIyMTcw MSkKKysrIFNvdXJjZS9XZWJLaXQvUGxhdGZvcm0vSVBDL0VuY29kZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtNjUsMTMgKzY1LDIxIEBAIHB1YmxpYzoKICAgICAgICAgZW5jb2RlKHN0YXRpY19jYXN0 PHVpbnQ2NF90Pih0KSk7CiAgICAgfQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KLSAgICBh dXRvIGVuY29kZShUJiYgdCkgLT4gc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19lbnVtPHR5cGVu YW1lIHN0ZDo6cmVtb3ZlX2NvbnN0X3Q8c3RkOjpyZW1vdmVfcmVmZXJlbmNlX3Q8VD4+Pjo6dmFs dWU+CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19l bnVtPHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX2NvbnN0X3Q8c3RkOjpyZW1vdmVfcmVmZXJlbmNlX3Q8 VD4+Pjo6dmFsdWU+KiA9IG51bGxwdHI+CisgICAgdm9pZCBlbmNvZGUoVCYmIHQpCiAgICAgewog ICAgICAgICBBcmd1bWVudENvZGVyPHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX2NvbnN0PHR5cGVuYW1l IHN0ZDo6cmVtb3ZlX3JlZmVyZW5jZTxUPjo6dHlwZT46OnR5cGU+OjplbmNvZGUoKnRoaXMsIHN0 ZDo6Zm9yd2FyZDxUPih0KSk7CiAgICAgfQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gRW5j b2RlciYgb3BlcmF0b3I8PChUJiYgdCkKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzdGQ6OmVu YWJsZV9pZl90PHN0ZDo6aXNfZW51bTxUPjo6dmFsdWU+KiA9IG51bGxwdHI+CisgICAgRW5jb2Rl ciYgb3BlcmF0b3I8PChUJiYgdCkKKyAgICB7CisgICAgICAgIGVuY29kZShzdGF0aWNfY2FzdDx1 aW50NjRfdD4odCkpOworICAgICAgICByZXR1cm4gKnRoaXM7CisgICAgfQorCisgICAgdGVtcGxh dGU8dHlwZW5hbWUgVCwgc3RkOjplbmFibGVfaWZfdDwhc3RkOjppc19lbnVtPFQ+Ojp2YWx1ZT4q ID0gbnVsbHB0cj4KKyAgICBFbmNvZGVyJiBvcGVyYXRvcjw8KFQmJiB0KQogICAgIHsKICAgICAg ICAgZW5jb2RlKHN0ZDo6Zm9yd2FyZDxUPih0KSk7CiAgICAgICAgIHJldHVybiAqdGhpczsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llcy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYnNpdGVQb2xpY2llcy5oCShyZXZpc2lvbiAyMjE3MDEp CisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJzaXRlUG9saWNpZXMuaAkod29ya2luZyBjb3B5 KQpAQCAtMjUsNiArMjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgPHd0Zi9FbnVt VHJhaXRzLmg+CiAjaW5jbHVkZSA8d3RmL09wdGlvblNldC5oPgogI2luY2x1ZGUgPHd0Zi9PcHRp b25hbC5oPgogCkBAIC01MiwyOCArNTMsNTMgQEAgc3RydWN0IFdlYnNpdGVQb2xpY2llcyB7CiAg ICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGljIHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBv bGljaWVzPiBkZWNvZGUoRGVjb2RlciYpOwogfTsKIAorfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisK K25hbWVzcGFjZSBXVEYgeworCit0ZW1wbGF0ZTw+IHN0cnVjdCBFbnVtVHJhaXRzPFdlYktpdDo6 V2Vic2l0ZUF1dG9wbGF5UG9saWN5PiB7CisgICAgdXNpbmcgdmFsdWVzID0gRW51bVZhbHVlczwK KyAgICBXZWJLaXQ6OldlYnNpdGVBdXRvcGxheVBvbGljeSwKKyAgICBXZWJLaXQ6OldlYnNpdGVB dXRvcGxheVBvbGljeTo6RGVmYXVsdCwKKyAgICBXZWJLaXQ6OldlYnNpdGVBdXRvcGxheVBvbGlj eTo6QWxsb3csCisgICAgV2ViS2l0OjpXZWJzaXRlQXV0b3BsYXlQb2xpY3k6OkFsbG93V2l0aG91 dFNvdW5kLAorICAgIFdlYktpdDo6V2Vic2l0ZUF1dG9wbGF5UG9saWN5OjpEZW55CisgICAgPjsK K307CisKK30gLy8gbmFtZXNwYWNlIFdURgorCituYW1lc3BhY2UgV2ViS2l0IHsKKwogdGVtcGxh dGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBXZWJzaXRlUG9saWNpZXM6OmVuY29kZShFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogewogICAgIGVuY29kZXIgPDwgY29udGVudEJsb2NrZXJzRW5hYmxlZDsK LSAgICBlbmNvZGVyLmVuY29kZUVudW0oYXV0b3BsYXlQb2xpY3kpOworICAgIGVuY29kZXIgPDwg YXV0b3BsYXlQb2xpY3k7CiAgICAgZW5jb2RlciA8PCBhbGxvd2VkQXV0b3BsYXlRdWlya3M7CiB9 CiAKIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVz PiBXZWJzaXRlUG9saWNpZXM6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIGJvb2wg Y29udGVudEJsb2NrZXJzRW5hYmxlZDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGNvbnRlbnRC bG9ja2Vyc0VuYWJsZWQpKQorICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gY29udGVudEJsb2NrZXJz RW5hYmxlZDsKKyAgICBkZWNvZGVyID4+IGNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQ7CisgICAgaWYg KCFjb250ZW50QmxvY2tlcnNFbmFibGVkKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0Owog ICAgIAotICAgIFdlYnNpdGVBdXRvcGxheVBvbGljeSBhdXRvcGxheVBvbGljeTsKLSAgICBpZiAo IWRlY29kZXIuZGVjb2RlRW51bShhdXRvcGxheVBvbGljeSkpCisgICAgc3RkOjpvcHRpb25hbDxX ZWJzaXRlQXV0b3BsYXlQb2xpY3k+IGF1dG9wbGF5UG9saWN5OworICAgIGRlY29kZXIgPj4gYXV0 b3BsYXlQb2xpY3k7CisgICAgaWYgKCFhdXRvcGxheVBvbGljeSkKICAgICAgICAgcmV0dXJuIHN0 ZDo6bnVsbG9wdDsKIAotICAgIE9wdGlvblNldDxXZWJzaXRlQXV0b3BsYXlRdWlyaz4gYWxsb3dl ZEF1dG9wbGF5UXVpcmtzOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUoYWxsb3dlZEF1dG9wbGF5 UXVpcmtzKSkKKyAgICBzdGQ6Om9wdGlvbmFsPE9wdGlvblNldDxXZWJzaXRlQXV0b3BsYXlRdWly az4+IGFsbG93ZWRBdXRvcGxheVF1aXJrczsKKyAgICBkZWNvZGVyID4+IGFsbG93ZWRBdXRvcGxh eVF1aXJrczsKKyAgICBpZiAoIWFsbG93ZWRBdXRvcGxheVF1aXJrcykKICAgICAgICAgcmV0dXJu IHN0ZDo6bnVsbG9wdDsKIAotICAgIHJldHVybiB7IHsgY29udGVudEJsb2NrZXJzRW5hYmxlZCwg YWxsb3dlZEF1dG9wbGF5UXVpcmtzLCBhdXRvcGxheVBvbGljeSB9IH07CisgICAgcmV0dXJuIHsg eworICAgICAgICBXVEZNb3ZlKCpjb250ZW50QmxvY2tlcnNFbmFibGVkKSwKKyAgICAgICAgV1RG TW92ZSgqYWxsb3dlZEF1dG9wbGF5UXVpcmtzKSwKKyAgICAgICAgV1RGTW92ZSgqYXV0b3BsYXlQ b2xpY3kpLAorICAgIH0gfTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==