190070 2018-09-27 21:51:15 -0700 ByValInfo should not use integer offsets. 2018-09-27 22:07:38 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1464302 0 mark.lam 2018-09-27 21:51:15 -0700 <rdar://problem/44803430> 1464303 1 351053 mark.lam 2018-09-27 21:59:21 -0700 Created attachment 351053 proposed patch. 1464306 2 351053 saam 2018-09-27 22:02:32 -0700 Comment on attachment 351053 proposed patch. r=me 1464308 3 mark.lam 2018-09-27 22:07:38 -0700 Thanks for the review. Landed in r236587: <http://trac.webkit.org/r236587>. 351053 2018-09-27 21:59:21 -0700 2018-09-27 22:02:32 -0700 proposed patch. bug-190070.patch text/plain 12962 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM2NTg0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDE4LTA5LTI3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBC eVZhbEluZm8gc2hvdWxkIG5vdCB1c2UgaW50ZWdlciBvZmZzZXRzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMDcwCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS80NDgwMzQzMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBbHNvIG1vdmVkIHNvbWUgZmllbGRzIGFyb3VuZCB0byBhbGxvdyB0aGUgQnlW YWxJbmZvIHN0cnVjdCB0byBiZSBtb3JlIGRlbnNlbHkgcGFja2VkLgorCisgICAgICAgICogYnl0 ZWNvZGUvQnlWYWxJbmZvLmg6CisgICAgICAgIChKU0M6OkJ5VmFsSW5mbzo6QnlWYWxJbmZvKToK KyAgICAgICAgKiBqaXQvSklULmNwcDoKKyAgICAgICAgKEpTQzo6SklUOjpsaW5rKToKKyAgICAg ICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6CisgICAgICAgIChKU0M6OkpJVDo6cHJpdmF0ZUNvbXBp bGVIYXNJbmRleGVkUHJvcGVydHkpOgorICAgICAgICAqIGppdC9KSVRPcGNvZGVzMzJfNjQuY3Bw OgorICAgICAgICAoSlNDOjpKSVQ6OnByaXZhdGVDb21waWxlSGFzSW5kZXhlZFByb3BlcnR5KToK KyAgICAgICAgKiBqaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwOgorICAgICAgICAoSlNDOjpKSVQ6 OnByaXZhdGVDb21waWxlR2V0QnlWYWwpOgorICAgICAgICAoSlNDOjpKSVQ6OnByaXZhdGVDb21w aWxlR2V0QnlWYWxXaXRoQ2FjaGVkSWQpOgorICAgICAgICAoSlNDOjpKSVQ6OnByaXZhdGVDb21w aWxlUHV0QnlWYWwpOgorICAgICAgICAoSlNDOjpKSVQ6OnByaXZhdGVDb21waWxlUHV0QnlWYWxX aXRoQ2FjaGVkSWQpOgorCiAyMDE4LTA5LTI3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgogCiAgICAgICAgIERvbid0IHVzZSBpbnQgb2Zmc2V0cyBpbiBTdHJ1Y3R1cmVTdHViSW5m bwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5VmFsSW5mby5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9CeVZhbEluZm8uaAkocmV2 aXNpb24gMjM2NTg0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0J5VmFsSW5m by5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykg MjAxMiwgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMTItMjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTIyNiwzNyArMjI2LDM3IEBAIGlubGluZSBKSVRBcnJh eU1vZGUgaml0QXJyYXlNb2RlRm9yU3RydWMKIHN0cnVjdCBCeVZhbEluZm8gewogICAgIEJ5VmFs SW5mbygpIHsgfQogCi0gICAgQnlWYWxJbmZvKHVuc2lnbmVkIGJ5dGVjb2RlSW5kZXgsIENvZGVM b2NhdGlvbkp1bXA8SlNJbnRlcm5hbFB0clRhZz4gbm90SW5kZXhKdW1wLCBDb2RlTG9jYXRpb25K dW1wPEpTSW50ZXJuYWxQdHJUYWc+IGJhZFR5cGVKdW1wLCBDb2RlTG9jYXRpb25MYWJlbDxFeGNl cHRpb25IYW5kbGVyUHRyVGFnPiBleGNlcHRpb25IYW5kbGVyLCBKSVRBcnJheU1vZGUgYXJyYXlN b2RlLCBBcnJheVByb2ZpbGUqIGFycmF5UHJvZmlsZSwgaW50MTZfdCBiYWRUeXBlSnVtcFRvRG9u ZSwgaW50MTZfdCBiYWRUeXBlSnVtcFRvTmV4dEhvdFBhdGgsIGludDE2X3QgcmV0dXJuQWRkcmVz c1RvU2xvd1BhdGgpCi0gICAgICAgIDogYnl0ZWNvZGVJbmRleChieXRlY29kZUluZGV4KQotICAg ICAgICAsIG5vdEluZGV4SnVtcChub3RJbmRleEp1bXApCisgICAgQnlWYWxJbmZvKHVuc2lnbmVk IGJ5dGVjb2RlSW5kZXgsIENvZGVMb2NhdGlvbkp1bXA8SlNJbnRlcm5hbFB0clRhZz4gbm90SW5k ZXhKdW1wLCBDb2RlTG9jYXRpb25KdW1wPEpTSW50ZXJuYWxQdHJUYWc+IGJhZFR5cGVKdW1wLCBD b2RlTG9jYXRpb25MYWJlbDxFeGNlcHRpb25IYW5kbGVyUHRyVGFnPiBleGNlcHRpb25IYW5kbGVy LCBKSVRBcnJheU1vZGUgYXJyYXlNb2RlLCBBcnJheVByb2ZpbGUqIGFycmF5UHJvZmlsZSwgQ29k ZUxvY2F0aW9uTGFiZWw8SlNJbnRlcm5hbFB0clRhZz4gYmFkVHlwZURvbmVUYXJnZXQsIENvZGVM b2NhdGlvbkxhYmVsPEpTSW50ZXJuYWxQdHJUYWc+IGJhZFR5cGVOZXh0SG90UGF0aFRhcmdldCwg Q29kZUxvY2F0aW9uTGFiZWw8SlNJbnRlcm5hbFB0clRhZz4gc2xvd1BhdGhUYXJnZXQpCisgICAg ICAgIDogbm90SW5kZXhKdW1wKG5vdEluZGV4SnVtcCkKICAgICAgICAgLCBiYWRUeXBlSnVtcChi YWRUeXBlSnVtcCkKICAgICAgICAgLCBleGNlcHRpb25IYW5kbGVyKGV4Y2VwdGlvbkhhbmRsZXIp Ci0gICAgICAgICwgYXJyYXlNb2RlKGFycmF5TW9kZSkKKyAgICAgICAgLCBiYWRUeXBlRG9uZVRh cmdldChiYWRUeXBlRG9uZVRhcmdldCkKKyAgICAgICAgLCBiYWRUeXBlTmV4dEhvdFBhdGhUYXJn ZXQoYmFkVHlwZU5leHRIb3RQYXRoVGFyZ2V0KQorICAgICAgICAsIHNsb3dQYXRoVGFyZ2V0KHNs b3dQYXRoVGFyZ2V0KQogICAgICAgICAsIGFycmF5UHJvZmlsZShhcnJheVByb2ZpbGUpCi0gICAg ICAgICwgYmFkVHlwZUp1bXBUb0RvbmUoYmFkVHlwZUp1bXBUb0RvbmUpCi0gICAgICAgICwgYmFk VHlwZUp1bXBUb05leHRIb3RQYXRoKGJhZFR5cGVKdW1wVG9OZXh0SG90UGF0aCkKLSAgICAgICAg LCByZXR1cm5BZGRyZXNzVG9TbG93UGF0aChyZXR1cm5BZGRyZXNzVG9TbG93UGF0aCkKKyAgICAg ICAgLCBieXRlY29kZUluZGV4KGJ5dGVjb2RlSW5kZXgpCiAgICAgICAgICwgc2xvd1BhdGhDb3Vu dCgwKQogICAgICAgICAsIHN0dWJJbmZvKG51bGxwdHIpCisgICAgICAgICwgYXJyYXlNb2RlKGFy cmF5TW9kZSkKICAgICAgICAgLCB0b29rU2xvd1BhdGgoZmFsc2UpCiAgICAgICAgICwgc2Vlbihm YWxzZSkKICAgICB7CiAgICAgfQogCi0gICAgdW5zaWduZWQgYnl0ZWNvZGVJbmRleDsKICAgICBD b2RlTG9jYXRpb25KdW1wPEpTSW50ZXJuYWxQdHJUYWc+IG5vdEluZGV4SnVtcDsKICAgICBDb2Rl TG9jYXRpb25KdW1wPEpTSW50ZXJuYWxQdHJUYWc+IGJhZFR5cGVKdW1wOwogICAgIENvZGVMb2Nh dGlvbkxhYmVsPEV4Y2VwdGlvbkhhbmRsZXJQdHJUYWc+IGV4Y2VwdGlvbkhhbmRsZXI7Ci0gICAg SklUQXJyYXlNb2RlIGFycmF5TW9kZTsgLy8gVGhlIGFycmF5IG1vZGUgdGhhdCB3YXMgYmFrZWQg aW50byB0aGUgaW5saW5lIEpJVCBjb2RlLgorICAgIENvZGVMb2NhdGlvbkxhYmVsPEpTSW50ZXJu YWxQdHJUYWc+IGJhZFR5cGVEb25lVGFyZ2V0OworICAgIENvZGVMb2NhdGlvbkxhYmVsPEpTSW50 ZXJuYWxQdHJUYWc+IGJhZFR5cGVOZXh0SG90UGF0aFRhcmdldDsKKyAgICBDb2RlTG9jYXRpb25M YWJlbDxKU0ludGVybmFsUHRyVGFnPiBzbG93UGF0aFRhcmdldDsKICAgICBBcnJheVByb2ZpbGUq IGFycmF5UHJvZmlsZTsKLSAgICBpbnQxNl90IGJhZFR5cGVKdW1wVG9Eb25lOwotICAgIGludDE2 X3QgYmFkVHlwZUp1bXBUb05leHRIb3RQYXRoOwotICAgIGludDE2X3QgcmV0dXJuQWRkcmVzc1Rv U2xvd1BhdGg7CisgICAgdW5zaWduZWQgYnl0ZWNvZGVJbmRleDsKICAgICB1bnNpZ25lZCBzbG93 UGF0aENvdW50OwogICAgIFJlZlB0cjxKSVRTdHViUm91dGluZT4gc3R1YlJvdXRpbmU7CiAgICAg SWRlbnRpZmllciBjYWNoZWRJZDsKICAgICBXcml0ZUJhcnJpZXI8U3ltYm9sPiBjYWNoZWRTeW1i b2w7CiAgICAgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJbmZvOworICAgIEpJVEFycmF5TW9kZSBh cnJheU1vZGU7IC8vIFRoZSBhcnJheSBtb2RlIHRoYXQgd2FzIGJha2VkIGludG8gdGhlIGlubGlu ZSBKSVQgY29kZS4KICAgICBib29sIHRvb2tTbG93UGF0aCA6IDE7CiAgICAgYm9vbCBzZWVuIDog MTsKIH07CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVQuY3BwCShyZXZpc2lvbiAyMzY1ODQp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTg1MywxMCArODUzLDkgQEAgQ29tcGlsYXRpb25SZXN1bHQgSklUOjpsaW5rKCkKICAgICAgICAg ICAgIGlmIChKdW1wKHBhdGNoYWJsZU5vdEluZGV4SnVtcCkuaXNTZXQoKSkKICAgICAgICAgICAg ICAgICBub3RJbmRleEp1bXAgPSBDb2RlTG9jYXRpb25KdW1wPEpTSW50ZXJuYWxQdHJUYWc+KHBh dGNoQnVmZmVyLmxvY2F0aW9uT2Y8SlNJbnRlcm5hbFB0clRhZz4ocGF0Y2hhYmxlTm90SW5kZXhK dW1wKSk7CiAgICAgICAgICAgICBhdXRvIGJhZFR5cGVKdW1wID0gQ29kZUxvY2F0aW9uSnVtcDxK U0ludGVybmFsUHRyVGFnPihwYXRjaEJ1ZmZlci5sb2NhdGlvbk9mPEpTSW50ZXJuYWxQdHJUYWc+ KGJ5VmFsQ29tcGlsYXRpb25JbmZvLmJhZFR5cGVKdW1wKSk7Ci0gICAgICAgICAgICBDb2RlTG9j YXRpb25MYWJlbDxOb1B0clRhZz4gZG9uZVRhcmdldCA9IHBhdGNoQnVmZmVyLmxvY2F0aW9uT2Y8 Tm9QdHJUYWc+KGJ5VmFsQ29tcGlsYXRpb25JbmZvLmRvbmVUYXJnZXQpOwotICAgICAgICAgICAg Q29kZUxvY2F0aW9uTGFiZWw8Tm9QdHJUYWc+IG5leHRIb3RQYXRoVGFyZ2V0ID0gcGF0Y2hCdWZm ZXIubG9jYXRpb25PZjxOb1B0clRhZz4oYnlWYWxDb21waWxhdGlvbkluZm8ubmV4dEhvdFBhdGhU YXJnZXQpOwotICAgICAgICAgICAgQ29kZUxvY2F0aW9uTGFiZWw8Tm9QdHJUYWc+IHNsb3dQYXRo VGFyZ2V0ID0gcGF0Y2hCdWZmZXIubG9jYXRpb25PZjxOb1B0clRhZz4oYnlWYWxDb21waWxhdGlv bkluZm8uc2xvd1BhdGhUYXJnZXQpOwotICAgICAgICAgICAgQ29kZUxvY2F0aW9uQ2FsbDxOb1B0 clRhZz4gcmV0dXJuQWRkcmVzcyA9IHBhdGNoQnVmZmVyLmxvY2F0aW9uT2Y8Tm9QdHJUYWc+KGJ5 VmFsQ29tcGlsYXRpb25JbmZvLnJldHVybkFkZHJlc3MpOworICAgICAgICAgICAgYXV0byBkb25l VGFyZ2V0ID0gQ29kZUxvY2F0aW9uTGFiZWw8SlNJbnRlcm5hbFB0clRhZz4ocGF0Y2hCdWZmZXIu bG9jYXRpb25PZjxKU0ludGVybmFsUHRyVGFnPihieVZhbENvbXBpbGF0aW9uSW5mby5kb25lVGFy Z2V0KSk7CisgICAgICAgICAgICBhdXRvIG5leHRIb3RQYXRoVGFyZ2V0ID0gQ29kZUxvY2F0aW9u TGFiZWw8SlNJbnRlcm5hbFB0clRhZz4ocGF0Y2hCdWZmZXIubG9jYXRpb25PZjxKU0ludGVybmFs UHRyVGFnPihieVZhbENvbXBpbGF0aW9uSW5mby5uZXh0SG90UGF0aFRhcmdldCkpOworICAgICAg ICAgICAgYXV0byBzbG93UGF0aFRhcmdldCA9IENvZGVMb2NhdGlvbkxhYmVsPEpTSW50ZXJuYWxQ dHJUYWc+KHBhdGNoQnVmZmVyLmxvY2F0aW9uT2Y8SlNJbnRlcm5hbFB0clRhZz4oYnlWYWxDb21w aWxhdGlvbkluZm8uc2xvd1BhdGhUYXJnZXQpKTsKIAogICAgICAgICAgICAgKmJ5VmFsQ29tcGls YXRpb25JbmZvLmJ5VmFsSW5mbyA9IEJ5VmFsSW5mbygKICAgICAgICAgICAgICAgICBieVZhbENv bXBpbGF0aW9uSW5mby5ieXRlY29kZUluZGV4LApAQCAtODY1LDkgKzg2NCw5IEBAIENvbXBpbGF0 aW9uUmVzdWx0IEpJVDo6bGluaygpCiAgICAgICAgICAgICAgICAgZXhjZXB0aW9uSGFuZGxlciwK ICAgICAgICAgICAgICAgICBieVZhbENvbXBpbGF0aW9uSW5mby5hcnJheU1vZGUsCiAgICAgICAg ICAgICAgICAgYnlWYWxDb21waWxhdGlvbkluZm8uYXJyYXlQcm9maWxlLAotICAgICAgICAgICAg ICAgIGRpZmZlcmVuY2VCZXR3ZWVuQ29kZVB0cihiYWRUeXBlSnVtcCwgZG9uZVRhcmdldCksCi0g ICAgICAgICAgICAgICAgZGlmZmVyZW5jZUJldHdlZW5Db2RlUHRyKGJhZFR5cGVKdW1wLCBuZXh0 SG90UGF0aFRhcmdldCksCi0gICAgICAgICAgICAgICAgZGlmZmVyZW5jZUJldHdlZW5Db2RlUHRy KHJldHVybkFkZHJlc3MsIHNsb3dQYXRoVGFyZ2V0KSk7CisgICAgICAgICAgICAgICAgZG9uZVRh cmdldCwKKyAgICAgICAgICAgICAgICBuZXh0SG90UGF0aFRhcmdldCwKKyAgICAgICAgICAgICAg ICBzbG93UGF0aFRhcmdldCk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMzMl82NC5jcHAJKHJldmlzaW9uIDIzNjU4NCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTAyMiwxMCArMTAyMiwxMCBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVI YXNJbmRleGVkUHJvcGVyCiAKICAgICBMaW5rQnVmZmVyIHBhdGNoQnVmZmVyKCp0aGlzLCBtX2Nv ZGVCbG9jayk7CiAgICAgCi0gICAgcGF0Y2hCdWZmZXIubGluayhiYWRUeXBlLCBDb2RlTG9jYXRp b25MYWJlbDxOb1B0clRhZz4oTWFjcm9Bc3NlbWJsZXJDb2RlUHRyPE5vUHRyVGFnPjo6Y3JlYXRl RnJvbUV4ZWN1dGFibGVBZGRyZXNzKHJldHVybkFkZHJlc3MudmFsdWUoKSkpLmxhYmVsQXRPZmZz ZXQoYnlWYWxJbmZvLT5yZXR1cm5BZGRyZXNzVG9TbG93UGF0aCkpOwotICAgIHBhdGNoQnVmZmVy Lmxpbmsoc2xvd0Nhc2VzLCBDb2RlTG9jYXRpb25MYWJlbDxOb1B0clRhZz4oTWFjcm9Bc3NlbWJs ZXJDb2RlUHRyPE5vUHRyVGFnPjo6Y3JlYXRlRnJvbUV4ZWN1dGFibGVBZGRyZXNzKHJldHVybkFk ZHJlc3MudmFsdWUoKSkpLmxhYmVsQXRPZmZzZXQoYnlWYWxJbmZvLT5yZXR1cm5BZGRyZXNzVG9T bG93UGF0aCkpOwotICAgIAotICAgIHBhdGNoQnVmZmVyLmxpbmsoZG9uZSwgYnlWYWxJbmZvLT5i YWRUeXBlSnVtcC5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+YmFkVHlwZUp1bXBUb0RvbmUpKTsK KyAgICBwYXRjaEJ1ZmZlci5saW5rKGJhZFR5cGUsIGJ5VmFsSW5mby0+c2xvd1BhdGhUYXJnZXQp OworICAgIHBhdGNoQnVmZmVyLmxpbmsoc2xvd0Nhc2VzLCBieVZhbEluZm8tPnNsb3dQYXRoVGFy Z2V0KTsKKworICAgIHBhdGNoQnVmZmVyLmxpbmsoZG9uZSwgYnlWYWxJbmZvLT5iYWRUeXBlRG9u ZVRhcmdldCk7CiAKICAgICBieVZhbEluZm8tPnN0dWJSb3V0aW5lID0gRklOQUxJWkVfQ09ERV9G T1JfU1RVQigKICAgICAgICAgbV9jb2RlQmxvY2ssIHBhdGNoQnVmZmVyLCBKSVRTdHViUm91dGlu ZVB0clRhZywKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAko cmV2aXNpb24gMjM2NTg0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0MiwxMSArMTE0MiwxMSBAQCB2b2lkIEpJVDo6cHJp dmF0ZUNvbXBpbGVIYXNJbmRleGVkUHJvcGVyCiAKICAgICBMaW5rQnVmZmVyIHBhdGNoQnVmZmVy KCp0aGlzLCBtX2NvZGVCbG9jayk7CiAgICAgCi0gICAgcGF0Y2hCdWZmZXIubGluayhiYWRUeXBl LCBDb2RlTG9jYXRpb25MYWJlbDxOb1B0clRhZz4oTWFjcm9Bc3NlbWJsZXJDb2RlUHRyPE5vUHRy VGFnPjo6Y3JlYXRlRnJvbUV4ZWN1dGFibGVBZGRyZXNzKHJldHVybkFkZHJlc3MudmFsdWUoKSkp LmxhYmVsQXRPZmZzZXQoYnlWYWxJbmZvLT5yZXR1cm5BZGRyZXNzVG9TbG93UGF0aCkpOwotICAg IHBhdGNoQnVmZmVyLmxpbmsoc2xvd0Nhc2VzLCBDb2RlTG9jYXRpb25MYWJlbDxOb1B0clRhZz4o TWFjcm9Bc3NlbWJsZXJDb2RlUHRyPE5vUHRyVGFnPjo6Y3JlYXRlRnJvbUV4ZWN1dGFibGVBZGRy ZXNzKHJldHVybkFkZHJlc3MudmFsdWUoKSkpLmxhYmVsQXRPZmZzZXQoYnlWYWxJbmZvLT5yZXR1 cm5BZGRyZXNzVG9TbG93UGF0aCkpOwotICAgIAotICAgIHBhdGNoQnVmZmVyLmxpbmsoZG9uZSwg YnlWYWxJbmZvLT5iYWRUeXBlSnVtcC5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+YmFkVHlwZUp1 bXBUb0RvbmUpKTsKLSAgICAKKyAgICBwYXRjaEJ1ZmZlci5saW5rKGJhZFR5cGUsIGJ5VmFsSW5m by0+c2xvd1BhdGhUYXJnZXQpOworICAgIHBhdGNoQnVmZmVyLmxpbmsoc2xvd0Nhc2VzLCBieVZh bEluZm8tPnNsb3dQYXRoVGFyZ2V0KTsKKworICAgIHBhdGNoQnVmZmVyLmxpbmsoZG9uZSwgYnlW YWxJbmZvLT5iYWRUeXBlRG9uZVRhcmdldCk7CisKICAgICBieVZhbEluZm8tPnN0dWJSb3V0aW5l ID0gRklOQUxJWkVfQ09ERV9GT1JfU1RVQigKICAgICAgICAgbV9jb2RlQmxvY2ssIHBhdGNoQnVm ZmVyLCBKSVRTdHViUm91dGluZVB0clRhZywKICAgICAgICAgIkJhc2VsaW5lIGhhc19pbmRleGVk X3Byb3BlcnR5IHN0dWIgZm9yICVzLCByZXR1cm4gcG9pbnQgJXAiLCB0b0NTdHJpbmcoKm1fY29k ZUJsb2NrKS5kYXRhKCksIHJldHVybkFkZHJlc3MudmFsdWUoKSk7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcAkocmV2aXNpb24gMjM2 NTg0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9wZXJ0eUFjY2Vzcy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTEyMTEsMTIgKzEyMTEsMTIgQEAgdm9pZCBKSVQ6OnByaXZhdGVD b21waWxlR2V0QnlWYWwoQnlWYWxJbgogICAgIEp1bXAgZG9uZSA9IGp1bXAoKTsKIAogICAgIExp bmtCdWZmZXIgcGF0Y2hCdWZmZXIoKnRoaXMsIG1fY29kZUJsb2NrKTsKLSAgICAKLSAgICBwYXRj aEJ1ZmZlci5saW5rKGJhZFR5cGUsIENvZGVMb2NhdGlvbkxhYmVsPE5vUHRyVGFnPihNYWNyb0Fz c2VtYmxlckNvZGVQdHI8Tm9QdHJUYWc+OjpjcmVhdGVGcm9tRXhlY3V0YWJsZUFkZHJlc3MocmV0 dXJuQWRkcmVzcy52YWx1ZSgpKSkubGFiZWxBdE9mZnNldChieVZhbEluZm8tPnJldHVybkFkZHJl c3NUb1Nsb3dQYXRoKSk7Ci0gICAgcGF0Y2hCdWZmZXIubGluayhzbG93Q2FzZXMsIENvZGVMb2Nh dGlvbkxhYmVsPE5vUHRyVGFnPihNYWNyb0Fzc2VtYmxlckNvZGVQdHI8Tm9QdHJUYWc+OjpjcmVh dGVGcm9tRXhlY3V0YWJsZUFkZHJlc3MocmV0dXJuQWRkcmVzcy52YWx1ZSgpKSkubGFiZWxBdE9m ZnNldChieVZhbEluZm8tPnJldHVybkFkZHJlc3NUb1Nsb3dQYXRoKSk7Ci0gICAgCi0gICAgcGF0 Y2hCdWZmZXIubGluayhkb25lLCBieVZhbEluZm8tPmJhZFR5cGVKdW1wLmxhYmVsQXRPZmZzZXQo YnlWYWxJbmZvLT5iYWRUeXBlSnVtcFRvRG9uZSkpOwotICAgIAorCisgICAgcGF0Y2hCdWZmZXIu bGluayhiYWRUeXBlLCBieVZhbEluZm8tPnNsb3dQYXRoVGFyZ2V0KTsKKyAgICBwYXRjaEJ1ZmZl ci5saW5rKHNsb3dDYXNlcywgYnlWYWxJbmZvLT5zbG93UGF0aFRhcmdldCk7CisKKyAgICBwYXRj aEJ1ZmZlci5saW5rKGRvbmUsIGJ5VmFsSW5mby0+YmFkVHlwZURvbmVUYXJnZXQpOworCiAgICAg YnlWYWxJbmZvLT5zdHViUm91dGluZSA9IEZJTkFMSVpFX0NPREVfRk9SX1NUVUIoCiAgICAgICAg IG1fY29kZUJsb2NrLCBwYXRjaEJ1ZmZlciwgSklUU3R1YlJvdXRpbmVQdHJUYWcsCiAgICAgICAg ICJCYXNlbGluZSBnZXRfYnlfdmFsIHN0dWIgZm9yICVzLCByZXR1cm4gcG9pbnQgJXAiLCB0b0NT dHJpbmcoKm1fY29kZUJsb2NrKS5kYXRhKCksIHJldHVybkFkZHJlc3MudmFsdWUoKSk7CkBAIC0x MjM3LDkgKzEyMzcsOSBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVHZXRCeVZhbFdpdGhDYWNo CiAKICAgICBDb25jdXJyZW50SlNMb2NrZXIgbG9ja2VyKG1fY29kZUJsb2NrLT5tX2xvY2spOwog ICAgIExpbmtCdWZmZXIgcGF0Y2hCdWZmZXIoKnRoaXMsIG1fY29kZUJsb2NrKTsKLSAgICBwYXRj aEJ1ZmZlci5saW5rKHNsb3dDYXNlcywgQ29kZUxvY2F0aW9uTGFiZWw8Tm9QdHJUYWc+KE1hY3Jv QXNzZW1ibGVyQ29kZVB0cjxOb1B0clRhZz46OmNyZWF0ZUZyb21FeGVjdXRhYmxlQWRkcmVzcyhy ZXR1cm5BZGRyZXNzLnZhbHVlKCkpKS5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+cmV0dXJuQWRk cmVzc1RvU2xvd1BhdGgpKTsKLSAgICBwYXRjaEJ1ZmZlci5saW5rKGZhc3REb25lQ2FzZSwgYnlW YWxJbmZvLT5iYWRUeXBlSnVtcC5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+YmFkVHlwZUp1bXBU b0RvbmUpKTsKLSAgICBwYXRjaEJ1ZmZlci5saW5rKHNsb3dEb25lQ2FzZSwgYnlWYWxJbmZvLT5i YWRUeXBlSnVtcC5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+YmFkVHlwZUp1bXBUb05leHRIb3RQ YXRoKSk7CisgICAgcGF0Y2hCdWZmZXIubGluayhzbG93Q2FzZXMsIGJ5VmFsSW5mby0+c2xvd1Bh dGhUYXJnZXQpOworICAgIHBhdGNoQnVmZmVyLmxpbmsoZmFzdERvbmVDYXNlLCBieVZhbEluZm8t PmJhZFR5cGVEb25lVGFyZ2V0KTsKKyAgICBwYXRjaEJ1ZmZlci5saW5rKHNsb3dEb25lQ2FzZSwg YnlWYWxJbmZvLT5iYWRUeXBlTmV4dEhvdFBhdGhUYXJnZXQpOwogICAgIGlmICghbV9leGNlcHRp b25DaGVja3MuZW1wdHkoKSkKICAgICAgICAgcGF0Y2hCdWZmZXIubGluayhtX2V4Y2VwdGlvbkNo ZWNrcywgYnlWYWxJbmZvLT5leGNlcHRpb25IYW5kbGVyKTsKIApAQCAtMTI5NCw5ICsxMjk0LDkg QEAgdm9pZCBKSVQ6OnByaXZhdGVDb21waWxlUHV0QnlWYWwoQnlWYWxJbgogICAgIEp1bXAgZG9u ZSA9IGp1bXAoKTsKIAogICAgIExpbmtCdWZmZXIgcGF0Y2hCdWZmZXIoKnRoaXMsIG1fY29kZUJs b2NrKTsKLSAgICBwYXRjaEJ1ZmZlci5saW5rKGJhZFR5cGUsIENvZGVMb2NhdGlvbkxhYmVsPE5v UHRyVGFnPihNYWNyb0Fzc2VtYmxlckNvZGVQdHI8Tm9QdHJUYWc+OjpjcmVhdGVGcm9tRXhlY3V0 YWJsZUFkZHJlc3MocmV0dXJuQWRkcmVzcy52YWx1ZSgpKSkubGFiZWxBdE9mZnNldChieVZhbElu Zm8tPnJldHVybkFkZHJlc3NUb1Nsb3dQYXRoKSk7Ci0gICAgcGF0Y2hCdWZmZXIubGluayhzbG93 Q2FzZXMsIENvZGVMb2NhdGlvbkxhYmVsPE5vUHRyVGFnPihNYWNyb0Fzc2VtYmxlckNvZGVQdHI8 Tm9QdHJUYWc+OjpjcmVhdGVGcm9tRXhlY3V0YWJsZUFkZHJlc3MocmV0dXJuQWRkcmVzcy52YWx1 ZSgpKSkubGFiZWxBdE9mZnNldChieVZhbEluZm8tPnJldHVybkFkZHJlc3NUb1Nsb3dQYXRoKSk7 Ci0gICAgcGF0Y2hCdWZmZXIubGluayhkb25lLCBieVZhbEluZm8tPmJhZFR5cGVKdW1wLmxhYmVs QXRPZmZzZXQoYnlWYWxJbmZvLT5iYWRUeXBlSnVtcFRvRG9uZSkpOworICAgIHBhdGNoQnVmZmVy LmxpbmsoYmFkVHlwZSwgYnlWYWxJbmZvLT5zbG93UGF0aFRhcmdldCk7CisgICAgcGF0Y2hCdWZm ZXIubGluayhzbG93Q2FzZXMsIGJ5VmFsSW5mby0+c2xvd1BhdGhUYXJnZXQpOworICAgIHBhdGNo QnVmZmVyLmxpbmsoZG9uZSwgYnlWYWxJbmZvLT5iYWRUeXBlRG9uZVRhcmdldCk7CiAgICAgaWYg KG5lZWRzTGlua0ZvcldyaXRlQmFycmllcikgewogICAgICAgICBBU1NFUlQocmVtb3ZlQ29kZVB0 clRhZyhtX2NhbGxzLmxhc3QoKS5jYWxsZWUuZXhlY3V0YWJsZUFkZHJlc3MoKSkgPT0gcmVtb3Zl Q29kZVB0clRhZyhvcGVyYXRpb25Xcml0ZUJhcnJpZXJTbG93UGF0aCkpOwogICAgICAgICBwYXRj aEJ1ZmZlci5saW5rKG1fY2FsbHMubGFzdCgpLmZyb20sIG1fY2FsbHMubGFzdCgpLmNhbGxlZSk7 CkBAIC0xMzI4LDggKzEzMjgsOCBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVQdXRCeVZhbFdp dGhDYWNoCiAKICAgICBDb25jdXJyZW50SlNMb2NrZXIgbG9ja2VyKG1fY29kZUJsb2NrLT5tX2xv Y2spOwogICAgIExpbmtCdWZmZXIgcGF0Y2hCdWZmZXIoKnRoaXMsIG1fY29kZUJsb2NrKTsKLSAg ICBwYXRjaEJ1ZmZlci5saW5rKHNsb3dDYXNlcywgQ29kZUxvY2F0aW9uTGFiZWw8Tm9QdHJUYWc+ KE1hY3JvQXNzZW1ibGVyQ29kZVB0cjxOb1B0clRhZz46OmNyZWF0ZUZyb21FeGVjdXRhYmxlQWRk cmVzcyhyZXR1cm5BZGRyZXNzLnZhbHVlKCkpKS5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+cmV0 dXJuQWRkcmVzc1RvU2xvd1BhdGgpKTsKLSAgICBwYXRjaEJ1ZmZlci5saW5rKGRvbmVDYXNlcywg YnlWYWxJbmZvLT5iYWRUeXBlSnVtcC5sYWJlbEF0T2Zmc2V0KGJ5VmFsSW5mby0+YmFkVHlwZUp1 bXBUb0RvbmUpKTsKKyAgICBwYXRjaEJ1ZmZlci5saW5rKHNsb3dDYXNlcywgYnlWYWxJbmZvLT5z bG93UGF0aFRhcmdldCk7CisgICAgcGF0Y2hCdWZmZXIubGluayhkb25lQ2FzZXMsIGJ5VmFsSW5m by0+YmFkVHlwZURvbmVUYXJnZXQpOwogICAgIGlmICghbV9leGNlcHRpb25DaGVja3MuZW1wdHko KSkKICAgICAgICAgcGF0Y2hCdWZmZXIubGluayhtX2V4Y2VwdGlvbkNoZWNrcywgYnlWYWxJbmZv LT5leGNlcHRpb25IYW5kbGVyKTsKIAo=