209219 2020-03-17 21:35:34 -0700 WebCoreArgumentCoders should check bufferIsLargeEnoughToContain before allocating buffers 2020-03-18 20:01:13 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 209131 1 fujii fujii darin webkit-bug-importer oldest_to_newest 1631039 0 fujii 2020-03-17 21:35:34 -0700 WebCoreArgumentCoders should check bufferIsLargeEnoughToContain before allocating buffers This is a sub-task of Bug 209131. Bug 209131 – Don't allocate a buffer with the decoded size without ensuring bufferIsLargeEnoughToContain(size) 1631045 1 393822 fujii 2020-03-17 21:46:48 -0700 Created attachment 393822 Patch 1631063 2 393827 fujii 2020-03-18 01:13:42 -0700 Created attachment 393827 Patch 1631064 3 393828 fujii 2020-03-18 01:16:32 -0700 Created attachment 393828 Patch 1631266 4 393828 darin 2020-03-18 11:22:37 -0700 Comment on attachment 393828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393828&action=review > Source/WebKit/Shared/WebCoreArgumentCoders.cpp:158 > + if (!decoder.bufferIsLargeEnoughToContain<unsigned char>(bufferSize)) > + return false; This *needs* to be inside the #if USE(UNIX_DOMAIN_SOCKETS) and should be uint8_t, not unsigned char. > Source/WebKit/Shared/WebCoreArgumentCoders.cpp:199 > + data.resize(0); This is not needed. We can and should rely on being passed an empty vector. > Source/WebKit/Shared/WebCoreArgumentCoders.cpp:202 > decodeSharedBuffer(decoder, buffer); Strange and incorrect that this does not check the return result. Should say: if (!decodeSharedBuffer(decoder, buffer)) return false; 1631347 5 fujii 2020-03-18 13:54:06 -0700 Thank you for the review. Will fix. 1631349 6 393901 fujii 2020-03-18 13:56:29 -0700 Created attachment 393901 Patch 1631506 7 393901 fujii 2020-03-18 20:00:17 -0700 Comment on attachment 393901 Patch Clearing flags on attachment: 393901 Committed r258675: <https://trac.webkit.org/changeset/258675> 1631507 8 fujii 2020-03-18 20:00:21 -0700 All reviewed patches have been landed. Closing bug. 1631509 9 webkit-bug-importer 2020-03-18 20:01:13 -0700 <rdar://problem/60615337> 393822 2020-03-17 21:46:48 -0700 2020-03-18 01:13:38 -0700 Patch bug-209219-20200318134647.patch text/plain 2052 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5ZjU1NWVhMjNiMDJlNmJl NTM5OGFkNDg0NTY0M2I3OTk3ZDQ2NjkuLjc3MzdhZWIwMGFkMmExZmFjMDM0M2I3YmYxMjhmNjkz NjI3YjNjMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDMtMTcgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzIHNob3VsZCBjaGVjayBidWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluIGJlZm9y ZSBhbGxvY2F0aW5nIGJ1ZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwOTIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAg IChJUEM6OmRlY29kZVNoYXJlZEJ1ZmZlcik6IEFkZGVkIGNoZWNraW5nIG9mIGJ1ZmZlcklzTGFy Z2VFbm91Z2hUb0NvbnRhaW4uCisgICAgICAgIChJUEM6OmRlY29kZVR5cGVzQW5kRGF0YSk6IERv bid0IGFsbG9jYXRlIGEgYnVmZmVyIHdpdGggdGhlCisgICAgICAgIGRlY29kZWQgc2l6ZS4gYnVm ZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbiBjYW4ndCBiZSB1c2VkIGluIHRoaXMKKyAgICAgICAg Y2FzZSBiZWNhdXNlIFNoYXJlZEJ1ZmZlciBpcyBlbmNvZGVkIGFzIHZhcmlhYmxlIGxlbmd0aCBk YXRhLgorICAgICAgICBJbnN0ZWFkLCBhcHBlbmQgaXRlbXMgb25lLWJ5LW9uZS4KKwogMjAyMC0w My0xNyAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAg ICBFeHBhbmQgSW4tQXBwLUJyb3dzZXItUHJpdmFjeSB0ZXN0aW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwIGIvU291cmNlL1dlYktp dC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAppbmRleCBhZDdmMWQxOTE3MWU5NzZh NDAyNDZhYWUzYzc5NTU3ODFlOTE5NGU2Li5jNGJjNWEzNDQzYTk5MzNhMjMyZDc3ZjNkNDM5YjMx Zjc2MWY2ODcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1l bnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENv ZGVycy5jcHAKQEAgLTE1NCw2ICsxNTQsOSBAQCBzdGF0aWMgYm9vbCBkZWNvZGVTaGFyZWRCdWZm ZXIoRGVjb2RlciYgZGVjb2RlciwgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4mIGJ1ZmZlcikKICAgICBp ZiAoIWJ1ZmZlclNpemUpCiAgICAgICAgIHJldHVybiB0cnVlOwogCisgICAgaWYgKCFkZWNvZGVy LmJ1ZmZlcklzTGFyZ2VFbm91Z2hUb0NvbnRhaW48dW5zaWduZWQgY2hhcj4oYnVmZmVyU2l6ZSkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKwogI2lmIFVTRShVTklYX0RPTUFJTl9TT0NLRVRTKQog ICAgIFZlY3Rvcjx1aW50OF90PiBkYXRhOwogICAgIGRhdGEuZ3JvdyhidWZmZXJTaXplKTsKQEAg LTE5Myw5ICsxOTYsMTIgQEAgc3RhdGljIGJvb2wgZGVjb2RlVHlwZXNBbmREYXRhKERlY29kZXIm IGRlY29kZXIsIFZlY3RvcjxTdHJpbmc+JiB0eXBlcywgVmVjdG9yPFIKIAogICAgIEFTU0VSVChk YXRhU2l6ZSA9PSB0eXBlcy5zaXplKCkpOwogCi0gICAgZGF0YS5yZXNpemUoZGF0YVNpemUpOwot ICAgIGZvciAoYXV0byYgYnVmZmVyIDogZGF0YSkKKyAgICBkYXRhLnJlc2l6ZSgwKTsKKyAgICBm b3IgKGF1dG8mIGJ1ZmZlciA6IGRhdGEpIHsKKyAgICAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4g YnVmZmVyOwogICAgICAgICBkZWNvZGVTaGFyZWRCdWZmZXIoZGVjb2RlciwgYnVmZmVyKTsKKyAg ICAgICAgZGF0YS5hcHBlbmQoYnVmZmVyKTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K 393827 2020-03-18 01:13:42 -0700 2020-03-18 01:16:26 -0700 Patch bug-209219-20200318171341.patch text/plain 2076 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdjODk0OTA5YmQ3OTZiYTA3 NjlmMGI1YzYzMDY4ODk1MDA0ZjBhOTMuLjlhMWRjZGZmYTc3NzBmNTZmYWI1MDc4N2U1YjA0NWY2 YzFiOTFmYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDMtMTggIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzIHNob3VsZCBjaGVjayBidWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluIGJlZm9y ZSBhbGxvY2F0aW5nIGJ1ZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwOTIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAg IChJUEM6OmRlY29kZVNoYXJlZEJ1ZmZlcik6IEFkZGVkIGNoZWNraW5nIG9mIGJ1ZmZlcklzTGFy Z2VFbm91Z2hUb0NvbnRhaW4uCisgICAgICAgIChJUEM6OmRlY29kZVR5cGVzQW5kRGF0YSk6IERv bid0IGFsbG9jYXRlIGEgYnVmZmVyIHdpdGggdGhlCisgICAgICAgIGRlY29kZWQgc2l6ZS4gYnVm ZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbiBjYW4ndCBiZSB1c2VkIGluIHRoaXMKKyAgICAgICAg Y2FzZSBiZWNhdXNlIFNoYXJlZEJ1ZmZlciBpcyBlbmNvZGVkIGFzIHZhcmlhYmxlIGxlbmd0aCBk YXRhLgorICAgICAgICBJbnN0ZWFkLCBhcHBlbmQgaXRlbXMgb25lLWJ5LW9uZS4KKwogMjAyMC0w My0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJl ZE1lbW9yeTo6SGFuZGxlOjptX3NpemUgc2hvdWxkIGJlIG1vcmUgY29uc2lzdGVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKaW5kZXggYWQ3ZjFk MTkxNzFlOTc2YTQwMjQ2YWFlM2M3OTU1NzgxZTkxOTRlNi4uODg4MTkyMTcwNDQzOTM0YmU1ZjI0 MDUzOGMwOWRkYTZkNjYwZDEzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3Jl QXJndW1lbnRDb2RlcnMuY3BwCkBAIC0xNTQsNiArMTU0LDkgQEAgc3RhdGljIGJvb2wgZGVjb2Rl U2hhcmVkQnVmZmVyKERlY29kZXImIGRlY29kZXIsIFJlZlB0cjxTaGFyZWRCdWZmZXI+JiBidWZm ZXIpCiAgICAgaWYgKCFidWZmZXJTaXplKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAorICAgIGlm ICghZGVjb2Rlci5idWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluPHVuc2lnbmVkIGNoYXI+KGJ1 ZmZlclNpemUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICNpZiBVU0UoVU5JWF9ET01BSU5f U09DS0VUUykKICAgICBWZWN0b3I8dWludDhfdD4gZGF0YTsKICAgICBkYXRhLmdyb3coYnVmZmVy U2l6ZSk7CkBAIC0xOTMsOSArMTk2LDEyIEBAIHN0YXRpYyBib29sIGRlY29kZVR5cGVzQW5kRGF0 YShEZWNvZGVyJiBkZWNvZGVyLCBWZWN0b3I8U3RyaW5nPiYgdHlwZXMsIFZlY3RvcjxSCiAKICAg ICBBU1NFUlQoZGF0YVNpemUgPT0gdHlwZXMuc2l6ZSgpKTsKIAotICAgIGRhdGEucmVzaXplKGRh dGFTaXplKTsKLSAgICBmb3IgKGF1dG8mIGJ1ZmZlciA6IGRhdGEpCisgICAgZGF0YS5yZXNpemUo MCk7CisgICAgZm9yICh1aW50NjRfdCBpID0gMDsgaSA8IGRhdGFTaXplOyBpKyspIHsKKyAgICAg ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyOwogICAgICAgICBkZWNvZGVTaGFyZWRCdWZm ZXIoZGVjb2RlciwgYnVmZmVyKTsKKyAgICAgICAgZGF0YS5hcHBlbmQoYnVmZmVyKTsKKyAgICB9 CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K 393828 2020-03-18 01:16:32 -0700 2020-03-18 13:56:25 -0700 Patch bug-209219-20200318171631.patch text/plain 2085 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdjODk0OTA5YmQ3OTZiYTA3 NjlmMGI1YzYzMDY4ODk1MDA0ZjBhOTMuLjlhMWRjZGZmYTc3NzBmNTZmYWI1MDc4N2U1YjA0NWY2 YzFiOTFmYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDMtMTggIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzIHNob3VsZCBjaGVjayBidWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluIGJlZm9y ZSBhbGxvY2F0aW5nIGJ1ZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwOTIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAg IChJUEM6OmRlY29kZVNoYXJlZEJ1ZmZlcik6IEFkZGVkIGNoZWNraW5nIG9mIGJ1ZmZlcklzTGFy Z2VFbm91Z2hUb0NvbnRhaW4uCisgICAgICAgIChJUEM6OmRlY29kZVR5cGVzQW5kRGF0YSk6IERv bid0IGFsbG9jYXRlIGEgYnVmZmVyIHdpdGggdGhlCisgICAgICAgIGRlY29kZWQgc2l6ZS4gYnVm ZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbiBjYW4ndCBiZSB1c2VkIGluIHRoaXMKKyAgICAgICAg Y2FzZSBiZWNhdXNlIFNoYXJlZEJ1ZmZlciBpcyBlbmNvZGVkIGFzIHZhcmlhYmxlIGxlbmd0aCBk YXRhLgorICAgICAgICBJbnN0ZWFkLCBhcHBlbmQgaXRlbXMgb25lLWJ5LW9uZS4KKwogMjAyMC0w My0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJl ZE1lbW9yeTo6SGFuZGxlOjptX3NpemUgc2hvdWxkIGJlIG1vcmUgY29uc2lzdGVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKaW5kZXggYWQ3ZjFk MTkxNzFlOTc2YTQwMjQ2YWFlM2M3OTU1NzgxZTkxOTRlNi4uNGQwYWNkMDEyNDk4ZmQ4ZDgwMDZi MGRhOTI2MWJkZDQ4YmM4YmJlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3Jl QXJndW1lbnRDb2RlcnMuY3BwCkBAIC0xNTQsNiArMTU0LDkgQEAgc3RhdGljIGJvb2wgZGVjb2Rl U2hhcmVkQnVmZmVyKERlY29kZXImIGRlY29kZXIsIFJlZlB0cjxTaGFyZWRCdWZmZXI+JiBidWZm ZXIpCiAgICAgaWYgKCFidWZmZXJTaXplKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAorICAgIGlm ICghZGVjb2Rlci5idWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluPHVuc2lnbmVkIGNoYXI+KGJ1 ZmZlclNpemUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICNpZiBVU0UoVU5JWF9ET01BSU5f U09DS0VUUykKICAgICBWZWN0b3I8dWludDhfdD4gZGF0YTsKICAgICBkYXRhLmdyb3coYnVmZmVy U2l6ZSk7CkBAIC0xOTMsOSArMTk2LDEyIEBAIHN0YXRpYyBib29sIGRlY29kZVR5cGVzQW5kRGF0 YShEZWNvZGVyJiBkZWNvZGVyLCBWZWN0b3I8U3RyaW5nPiYgdHlwZXMsIFZlY3RvcjxSCiAKICAg ICBBU1NFUlQoZGF0YVNpemUgPT0gdHlwZXMuc2l6ZSgpKTsKIAotICAgIGRhdGEucmVzaXplKGRh dGFTaXplKTsKLSAgICBmb3IgKGF1dG8mIGJ1ZmZlciA6IGRhdGEpCisgICAgZGF0YS5yZXNpemUo MCk7CisgICAgZm9yICh1aW50NjRfdCBpID0gMDsgaSA8IGRhdGFTaXplOyBpKyspIHsKKyAgICAg ICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyOwogICAgICAgICBkZWNvZGVTaGFyZWRCdWZm ZXIoZGVjb2RlciwgYnVmZmVyKTsKKyAgICAgICAgZGF0YS5hcHBlbmQoV1RGTW92ZShidWZmZXIp KTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0K 393901 2020-03-18 13:56:29 -0700 2020-03-18 20:00:17 -0700 Patch bug-209219-20200319055628.patch text/plain 2184 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdjODk0OTA5YmQ3OTZiYTA3 NjlmMGI1YzYzMDY4ODk1MDA0ZjBhOTMuLjlhMWRjZGZmYTc3NzBmNTZmYWI1MDc4N2U1YjA0NWY2 YzFiOTFmYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDMtMTggIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzIHNob3VsZCBjaGVjayBidWZmZXJJc0xhcmdlRW5vdWdoVG9Db250YWluIGJlZm9y ZSBhbGxvY2F0aW5nIGJ1ZmZlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwOTIxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHA6CisgICAgICAg IChJUEM6OmRlY29kZVNoYXJlZEJ1ZmZlcik6IEFkZGVkIGNoZWNraW5nIG9mIGJ1ZmZlcklzTGFy Z2VFbm91Z2hUb0NvbnRhaW4uCisgICAgICAgIChJUEM6OmRlY29kZVR5cGVzQW5kRGF0YSk6IERv bid0IGFsbG9jYXRlIGEgYnVmZmVyIHdpdGggdGhlCisgICAgICAgIGRlY29kZWQgc2l6ZS4gYnVm ZmVySXNMYXJnZUVub3VnaFRvQ29udGFpbiBjYW4ndCBiZSB1c2VkIGluIHRoaXMKKyAgICAgICAg Y2FzZSBiZWNhdXNlIFNoYXJlZEJ1ZmZlciBpcyBlbmNvZGVkIGFzIHZhcmlhYmxlIGxlbmd0aCBk YXRhLgorICAgICAgICBJbnN0ZWFkLCBhcHBlbmQgaXRlbXMgb25lLWJ5LW9uZS4KKwogMjAyMC0w My0xNyAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJl ZE1lbW9yeTo6SGFuZGxlOjptX3NpemUgc2hvdWxkIGJlIG1vcmUgY29uc2lzdGVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5jcHAKaW5kZXggYWQ3ZjFk MTkxNzFlOTc2YTQwMjQ2YWFlM2M3OTU1NzgxZTkxOTRlNi4uZWM2YWE2Y2E4OTM0YmY2ZDFiOTI1 NjI5ODg0NWY5Mjk2M2VkZWQwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi Q29yZUFyZ3VtZW50Q29kZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3Jl QXJndW1lbnRDb2RlcnMuY3BwCkBAIC0xNTUsNiArMTU1LDkgQEAgc3RhdGljIGJvb2wgZGVjb2Rl U2hhcmVkQnVmZmVyKERlY29kZXImIGRlY29kZXIsIFJlZlB0cjxTaGFyZWRCdWZmZXI+JiBidWZm ZXIpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAjaWYgVVNFKFVOSVhfRE9NQUlOX1NPQ0tFVFMp CisgICAgaWYgKCFkZWNvZGVyLmJ1ZmZlcklzTGFyZ2VFbm91Z2hUb0NvbnRhaW48dWludDhfdD4o YnVmZmVyU2l6ZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIFZlY3Rvcjx1aW50OF90 PiBkYXRhOwogICAgIGRhdGEuZ3JvdyhidWZmZXJTaXplKTsKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlRml4ZWRMZW5ndGhEYXRhKGRhdGEuZGF0YSgpLCBkYXRhLnNpemUoKSwgMSkpCkBAIC0xOTMs OSArMTk2LDEyIEBAIHN0YXRpYyBib29sIGRlY29kZVR5cGVzQW5kRGF0YShEZWNvZGVyJiBkZWNv ZGVyLCBWZWN0b3I8U3RyaW5nPiYgdHlwZXMsIFZlY3RvcjxSCiAKICAgICBBU1NFUlQoZGF0YVNp emUgPT0gdHlwZXMuc2l6ZSgpKTsKIAotICAgIGRhdGEucmVzaXplKGRhdGFTaXplKTsKLSAgICBm b3IgKGF1dG8mIGJ1ZmZlciA6IGRhdGEpCi0gICAgICAgIGRlY29kZVNoYXJlZEJ1ZmZlcihkZWNv ZGVyLCBidWZmZXIpOworICAgIGZvciAodWludDY0X3QgaSA9IDA7IGkgPCBkYXRhU2l6ZTsgaSsr KSB7CisgICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlcjsKKyAgICAgICAgaWYgKCFk ZWNvZGVTaGFyZWRCdWZmZXIoZGVjb2RlciwgYnVmZmVyKSkKKyAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgZGF0YS5hcHBlbmQoV1RGTW92ZShidWZmZXIpKTsKKyAgICB9CiAKICAg ICByZXR1cm4gdHJ1ZTsKIH0K