201021 2019-08-21 19:13:48 -0700 Add missing exception check in canonicalizeLocaleList 2019-08-22 17:23:03 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 justin_michaud justin_michaud commit-queue darin ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1563894 0 justin_michaud 2019-08-21 19:13:48 -0700 Add missing exception check in canonicalizeLocaleList 1563895 1 376965 justin_michaud 2019-08-21 19:14:16 -0700 Created attachment 376965 Patch 1563896 2 justin_michaud 2019-08-21 19:15:27 -0700 <rdar://54456311> 1563898 3 376965 mark.lam 2019-08-21 19:17:25 -0700 Comment on attachment 376965 Patch r=me 1564135 4 376965 commit-queue 2019-08-22 11:18:11 -0700 Comment on attachment 376965 Patch Clearing flags on attachment: 376965 Committed r249020: <https://trac.webkit.org/changeset/249020> 1564136 5 commit-queue 2019-08-22 11:18:12 -0700 All reviewed patches have been landed. Closing bug. 1564301 6 376965 darin 2019-08-22 16:39:16 -0700 Comment on attachment 376965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376965&action=review > Source/JavaScriptCore/runtime/IntlObject.cpp:552 > JSString* tag = kValue.toString(&state); > RETURN_IF_EXCEPTION(scope, Vector<String>()); > > - String canonicalizedTag = canonicalizeLanguageTag(tag->value(&state)); > + auto tagValue = tag->value(&state); Better idiom for this is toWTFString. 1564318 7 376965 mark.lam 2019-08-22 16:59:35 -0700 Comment on attachment 376965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376965&action=review >> Source/JavaScriptCore/runtime/IntlObject.cpp:552 >> + auto tagValue = tag->value(&state); > > Better idiom for this is toWTFString. toWTFString() doesn't help here. We already know that the tag is a JSString above. toWTFString() would do a lot of busy work before calling JSString::value() anyway. If your proposal is to replace the toString() call above also, then that would not work because it does not handle exceptions generated by the toString(). Basically, toWTFString() has this issue in general. 1564327 8 376965 darin 2019-08-22 17:23:03 -0700 Comment on attachment 376965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376965&action=review >>> Source/JavaScriptCore/runtime/IntlObject.cpp:552 >>> + auto tagValue = tag->value(&state); >> >> Better idiom for this is toWTFString. > > toWTFString() doesn't help here. We already know that the tag is a JSString above. toWTFString() would do a lot of busy work before calling JSString::value() anyway. If your proposal is to replace the toString() call above also, then that would not work because it does not handle exceptions generated by the toString(). Basically, toWTFString() has this issue in general. Yes, I meant replace the toString above. You’re saying that toWTFString doesn’t handle exceptions generated by toString correctly!? That must be fixed or we have to remove toWTFString! 376965 2019-08-21 19:14:16 -0700 2019-08-22 11:18:11 -0700 Patch bug-201021-20190821191415.patch text/plain 3431 justin_michaud U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MjE1NDI0NjJhOGZhYzAxZjBkNDEzNzM5M2I0ZTczYTViZDZlZWM2Li4yNmMyOGYwODM3Y2UwZGE5 YmQwODM2MjkxOGZlNTNlMTQzZjU0YjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxOS0wOC0yMSAgSnVzdGluIE1pY2hhdWQgIDxqdXN0aW5fbWljaGF1ZEBh cHBsZS5jb20+CisKKyAgICAgICAgQWRkIG1pc3NpbmcgZXhjZXB0aW9uIGNoZWNrIGluIGNhbm9u aWNhbGl6ZUxvY2FsZUxpc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMTAyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcnVudGltZS9JbnRsT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6Y2Fub25p Y2FsaXplTG9jYWxlTGlzdCk6CisKIDIwMTktMDgtMjAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBw bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBzdXBlcmZsdW91cyBzaXplIGFyZ3VtZW50IHRvIGFs bG9jYXRlQ2VsbCgpIGZvciBmaXhlZCBzaXplIG9iamVjdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0ludGxPYmplY3QuY3BwCmluZGV4IDhjY2I3ZTBiOTZiYTBjYWU1ZTJiOWUw ZmRkNDJiYTk3MDAwZDMyODUuLmJlNWFlYzA4NTIyNWFmOGNhYzRlMmUzNWI2NDM4NzdmYjE3MTg3 ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxPYmplY3Qu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxPYmplY3QuY3BwCkBA IC01NDksOSArNTQ5LDEyIEBAIFZlY3RvcjxTdHJpbmc+IGNhbm9uaWNhbGl6ZUxvY2FsZUxpc3Qo RXhlY1N0YXRlJiBzdGF0ZSwgSlNWYWx1ZSBsb2NhbGVzKQogICAgICAgICAgICAgSlNTdHJpbmcq IHRhZyA9IGtWYWx1ZS50b1N0cmluZygmc3RhdGUpOwogICAgICAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTihzY29wZSwgVmVjdG9yPFN0cmluZz4oKSk7CiAKLSAgICAgICAgICAgIFN0cmluZyBj YW5vbmljYWxpemVkVGFnID0gY2Fub25pY2FsaXplTGFuZ3VhZ2VUYWcodGFnLT52YWx1ZSgmc3Rh dGUpKTsKKyAgICAgICAgICAgIGF1dG8gdGFnVmFsdWUgPSB0YWctPnZhbHVlKCZzdGF0ZSk7Cisg ICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBWZWN0b3I8U3RyaW5nPigpKTsK KworICAgICAgICAgICAgU3RyaW5nIGNhbm9uaWNhbGl6ZWRUYWcgPSBjYW5vbmljYWxpemVMYW5n dWFnZVRhZyh0YWdWYWx1ZSk7CiAgICAgICAgICAgICBpZiAoY2Fub25pY2FsaXplZFRhZy5pc051 bGwoKSkgewotICAgICAgICAgICAgICAgIHRocm93RXhjZXB0aW9uKCZzdGF0ZSwgc2NvcGUsIGNy ZWF0ZVJhbmdlRXJyb3IoJnN0YXRlLCAiaW52YWxpZCBsYW5ndWFnZSB0YWc6ICIgKyB0YWctPnZh bHVlKCZzdGF0ZSkpKTsKKyAgICAgICAgICAgICAgICB0aHJvd0V4Y2VwdGlvbigmc3RhdGUsIHNj b3BlLCBjcmVhdGVSYW5nZUVycm9yKCZzdGF0ZSwgImludmFsaWQgbGFuZ3VhZ2UgdGFnOiAiICsg dGFnVmFsdWUpKTsKICAgICAgICAgICAgICAgICByZXR1cm4gVmVjdG9yPFN0cmluZz4oKTsKICAg ICAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0No YW5nZUxvZwppbmRleCBiMzdiZDdlNzEzZDgyZGZlNDEyNmQzNzFiMDUxMWY4YjQzYWQ2ZDdkLi5i ZWQ0MWQ2MDE0N2VkODVlMzEzMmRiNTliOWQ1MWQ1Y2U2MmNjM2RjIDEwMDY0NAotLS0gYS9KU1Rl c3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDE5LTA4LTIxICBKdXN0aW4gTWljaGF1ZCAgPGp1c3Rpbl9taWNoYXVkQGFwcGxlLmNvbT4KKwor ICAgICAgICBBZGQgbWlzc2luZyBleGNlcHRpb24gY2hlY2sgaW4gY2Fub25pY2FsaXplTG9jYWxl TGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAx MDIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBz dHJlc3MvbWlzc2luZy1leGNlcHRpb24tY2hlY2staW4tY2Fub25pY2FsaXplTG9jYWxlTGlzdC5q czogQWRkZWQuCisgICAgICAgIChjYXRjaCk6CisKIDIwMTktMDgtMjAgIFl1c3VrZSBTdXp1a2kg IDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBBcnJheS5wcm90b3R5cGUudG9T dHJpbmcgc2hvdWxkIG5vdCBnZXQgImpvaW4iIGZ1bmN0aW9uIGVhY2ggdGltZQpkaWZmIC0tZ2l0 IGEvSlNUZXN0cy9zdHJlc3MvbWlzc2luZy1leGNlcHRpb24tY2hlY2staW4tY2Fub25pY2FsaXpl TG9jYWxlTGlzdC5qcyBiL0pTVGVzdHMvc3RyZXNzL21pc3NpbmctZXhjZXB0aW9uLWNoZWNrLWlu LWNhbm9uaWNhbGl6ZUxvY2FsZUxpc3QuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmRjYzkyY2MyODBlNzg3Mzg3 ZjNkODM2ZTFhYWY1N2U3YTI1M2I2YQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNz L21pc3NpbmctZXhjZXB0aW9uLWNoZWNrLWluLWNhbm9uaWNhbGl6ZUxvY2FsZUxpc3QuanMKQEAg LTAsMCArMSwyMCBAQAordHJ5IHsKK2NvbnN0IHMxID0gKC0xKS50b0xvY2FsZVN0cmluZygpLnBh ZEVuZCgyKiozMS0xLCAnYWEnKTsKKydhJy50b0xvY2FsZUxvd2VyQ2FzZShzMSk7Cit9IGNhdGNo IChlKSB7IGV4Y2VwdGlvbiA9IGUgfQoraWYgKGV4Y2VwdGlvbiAhPSAiRXJyb3I6IE91dCBvZiBt ZW1vcnkiKQorICAgIHRocm93ICJGQUlMRUQiOworCit0cnkgeworY29uc3QgczEgPSAoLTEpLnRv TG9jYWxlU3RyaW5nKCkucGFkRW5kKDIqKjMxLTEsICdhYScpOworJ2EnLnRvTG9jYWxlVXBwZXJD YXNlKHMxKTsKK30gY2F0Y2ggKGUpIHsgZXhjZXB0aW9uMiA9IGUgfQoraWYgKGV4Y2VwdGlvbjIg IT0gIkVycm9yOiBPdXQgb2YgbWVtb3J5IikKKyAgICB0aHJvdyAiRkFJTEVEIjsKKwordHJ5IHsK K2NvbnN0IHMxID0gKC0xKS50b0xvY2FsZVN0cmluZygpLnBhZEVuZCgyKiozMS0xLCAnYWEnKTsK KydhJy5sb2NhbGVDb21wYXJlKCdiJywgczEpOworfSBjYXRjaCAoZSkgeyBleGNlcHRpb24zID0g ZSB9CitpZiAoZXhjZXB0aW9uMyAhPSAiRXJyb3I6IE91dCBvZiBtZW1vcnkiKQorICAgIHRocm93 ICJGQUlMRUQiOwo=