237573 2022-03-07 18:22:44 -0800 Remove invalid ASSERT in LocaleIDBuilder::overrideLanguageScriptRegion(). 2022-03-08 01:10:38 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1849060 0 mark.lam 2022-03-07 18:22:44 -0800 localeIDBufferForLanguageTagWithNullTerminator() uses uloc_forLanguageTag, and uloc_forLanguageTag can return an empty (0 length) localeID. LocaleIDBuilder::initialize() uses localeIDBufferForLanguageTagWithNullTerminator() to return a buffer sized based on the localeID it contains. However, when the localeID is not found, we currently erroneously return a non-empty buffer. This patch fixes this by adding a length check, and returning an empty buffer if the localeID length is 0. rdar://83326232 1849061 1 mark.lam 2022-03-07 18:23:14 -0800 <rdar://problem/83326232> 1849063 2 454059 mark.lam 2022-03-07 18:29:36 -0800 Created attachment 454059 proposed patch. 1849065 3 454059 ysuzuki 2022-03-07 18:32:59 -0800 Comment on attachment 454059 proposed patch. r=me 1849073 4 454059 mark.lam 2022-03-07 19:21:16 -0800 Comment on attachment 454059 proposed patch. Looks like my fix is wrong. Will investigate. 1849080 5 mark.lam 2022-03-07 20:03:29 -0800 Turns out the ASSERT(length) in LocaleIDBuilder::overrideLanguageScriptRegion() is simply incorrect. The length can be 0 if uloc_forLanguageTag returns a 0 length in localeIDBufferForLanguageTagWithNullTerminator(). LocaleIDBuilder::overrideLanguageScriptRegion() already handles this scenario correctly. We just need to remove this incorrect ASSERT. 1849081 6 454064 mark.lam 2022-03-07 20:08:36 -0800 Created attachment 454064 [fast-cq] proposed patch. 1849084 7 454064 ysuzuki 2022-03-07 20:14:42 -0800 Comment on attachment 454064 [fast-cq] proposed patch. r=me 1849151 8 454064 mark.lam 2022-03-08 01:07:17 -0800 Comment on attachment 454064 [fast-cq] proposed patch. Thanks for the review. Landing now. 1849152 9 ews-feeder 2022-03-08 01:10:35 -0800 Committed r290981 (248159@main): <https://commits.webkit.org/248159@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454064. 454059 2022-03-07 18:29:36 -0800 2022-03-07 20:00:38 -0800 proposed patch. bug-237573.patch text/plain 3254 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyOTA5NjgpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIyLTAzLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBIYW5kbGUgZW1wdHkgbG9jYWxlSUQgaW4gbG9jYWxlSURCdWZmZXJGb3JM YW5ndWFnZVRhZ1dpdGhOdWxsVGVybWluYXRvcigpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NTczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84 MzMyNjIzMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHN0cmVzcy9oYW5kbGUtZW1wdHktbG9jYWxlSUQtaW4tbG9jYWxlSURCdWZmZXJGb3JMYW5n dWFnZVRhZ1dpdGhOdWxsVGVybWluYXRvci5qczogQWRkZWQuCisKIDIwMjItMDMtMDMgIFRvbSBU YXJ0YXJpbiAgPHRvbUBsZWFuaW5ndGVjaC5jb20+CiAKICAgICAgICAgW0pTQ10gVXBkYXRlIHdh c20gYnJhbmNoIGhpbnRpbmcKSW5kZXg6IEpTVGVzdHMvc3RyZXNzL2hhbmRsZS1lbXB0eS1sb2Nh bGVJRC1pbi1sb2NhbGVJREJ1ZmZlckZvckxhbmd1YWdlVGFnV2l0aE51bGxUZXJtaW5hdG9yLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIEpTVGVzdHMvc3RyZXNzL2hhbmRsZS1lbXB0eS1sb2NhbGVJRC1pbi1s b2NhbGVJREJ1ZmZlckZvckxhbmd1YWdlVGFnV2l0aE51bGxUZXJtaW5hdG9yLmpzCShub25leGlz dGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2hhbmRsZS1lbXB0eS1sb2NhbGVJRC1pbi1sb2NhbGVJ REJ1ZmZlckZvckxhbmd1YWdlVGFnV2l0aE51bGxUZXJtaW5hdG9yLmpzCSh3b3JraW5nIGNvcHkp CkBAIC0wLDAgKzEsMTAgQEAKK3ZhciBleGNlcHRpb247Cit0cnkgeworICAgIG5ldyBJbnRsLkxv Y2FsZSgndW5kJywgeyBsYW5ndWFnZTogJ3J1JyB9KS50b1N0cmluZygpOworfSBjYXRjaCAoZSkg eworICAgIGV4Y2VwdGlvbiA9IGU7Cit9CisKK2lmIChleGNlcHRpb24gIT0gIlJhbmdlRXJyb3I6 IGludmFsaWQgbGFuZ3VhZ2UgdGFnIikKKyAgICB0aHJvdyAiRkFJTEVEIjsKKwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyOTA5NjUpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDMt MDcgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIEhhbmRsZSBlbXB0 eSBsb2NhbGVJRCBpbiBsb2NhbGVJREJ1ZmZlckZvckxhbmd1YWdlVGFnV2l0aE51bGxUZXJtaW5h dG9yKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mzc1NzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgzMzI2MjMyPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGxvY2FsZUlEQnVmZmVyRm9yTGFuZ3Vh Z2VUYWdXaXRoTnVsbFRlcm1pbmF0b3IoKSB1c2VzIHVsb2NfZm9yTGFuZ3VhZ2VUYWcsIGFuZAor ICAgICAgICB1bG9jX2Zvckxhbmd1YWdlVGFnIGNhbiByZXR1cm4gYW4gZW1wdHkgKDAgbGVuZ3Ro KSBsb2NhbGVJRC4KKworICAgICAgICBMb2NhbGVJREJ1aWxkZXI6OmluaXRpYWxpemUoKSB1c2Vz IGxvY2FsZUlEQnVmZmVyRm9yTGFuZ3VhZ2VUYWdXaXRoTnVsbFRlcm1pbmF0b3IoKQorICAgICAg ICB0byByZXR1cm4gYSBidWZmZXIgc2l6ZWQgYmFzZWQgb24gdGhlIGxvY2FsZUlEIGl0IGNvbnRh aW5zLiAgSG93ZXZlciwgaWYgdGhlCisgICAgICAgIGxvY2FsZUlEIGlzIG5vdCBmb3VuZCwgd2Ug Y3VycmVudGx5IGVycm9uZW91c2x5IHJldHVybiBhIG5vbi1lbXB0eSBidWZmZXIuICBUaGlzCisg ICAgICAgIHBhdGNoIGZpeGVzIHRoaXMgYnkgYWRkaW5nIGEgbGVuZ3RoIGNoZWNrLCBhbmQgcmV0 dXJuaW5nIGFuIGVtcHR5IGJ1ZmZlciBpZiB0aGUKKyAgICAgICAgbG9jYWxlSUQgbGVuZ3RoIGlz IDAuCisKKyAgICAgICAgKiBydW50aW1lL0ludGxPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjps b2NhbGVJREJ1ZmZlckZvckxhbmd1YWdlVGFnV2l0aE51bGxUZXJtaW5hdG9yKToKKwogMjAyMi0w My0wNyAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NAaWdhbGlhLmNvbT4KIAogICAg ICAgICBBc3NlbWJseUhlbHBlcnNTcG9vbGVyczogdXNlIGxvYWQvc3RvcmUgcGFpciBvbiBBUk12 NwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdC5jcHAJ KHJldmlzaW9uIDI5MDk2NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxP YmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDMsNiArMzAzLDkgQEAgVmVjdG9yPGNoYXIs IDMyPiBsb2NhbGVJREJ1ZmZlckZvckxhbmd1YQogICAgIFZlY3RvcjxjaGFyLCAzMj4gYnVmZmVy KDMyKTsKICAgICBpbnQzMl90IHBhcnNlZExlbmd0aDsKICAgICBhdXRvIGJ1ZmZlckxlbmd0aCA9 IHVsb2NfZm9yTGFuZ3VhZ2VUYWcodGFnLmRhdGEoKSwgYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNp emUoKSwgJnBhcnNlZExlbmd0aCwgJnN0YXR1cyk7CisgICAgaWYgKCFidWZmZXJMZW5ndGgpCisg ICAgICAgIHJldHVybiB7IH07CisKICAgICBpZiAobmVlZHNUb0dyb3dUb1Byb2R1Y2VDU3RyaW5n KHN0YXR1cykpIHsKICAgICAgICAgLy8gQmVmb3JlIElDVSA2NCwgdGhlcmUncyBhIGNoYW5jZSB1 bG9jX2Zvckxhbmd1YWdlVGFnIHdpbGwgImJ1ZmZlciBvdmVyZmxvdyIgd2hpbGUgcmVxdWVzdGlu ZyBhICpzbWFsbGVyKiBzaXplLgogICAgICAgICBidWZmZXIucmVzaXplKGJ1ZmZlckxlbmd0aCAr IDEpOwo= 454064 2022-03-07 20:08:36 -0800 2022-03-08 01:10:37 -0800 [fast-cq] proposed patch. bug-237573.patch text/plain 2933 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyOTA5NjgpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIyLTAzLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBSZW1vdmUgaW52YWxpZCBBU1NFUlQgaW4gTG9jYWxlSURCdWlsZGVyOjpv dmVycmlkZUxhbmd1YWdlU2NyaXB0UmVnaW9uKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc1NzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgz MzI2MjMyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogc3RyZXNzL2hhbmRsZS1lbXB0eS1sb2NhbGVJRC1pbi1sb2NhbGVJREJ1ZmZlckZvckxhbmd1 YWdlVGFnV2l0aE51bGxUZXJtaW5hdG9yLmpzOiBBZGRlZC4KKwogMjAyMi0wMy0wMyAgVG9tIFRh cnRhcmluICA8dG9tQGxlYW5pbmd0ZWNoLmNvbT4KIAogICAgICAgICBbSlNDXSBVcGRhdGUgd2Fz bSBicmFuY2ggaGludGluZwpJbmRleDogSlNUZXN0cy9zdHJlc3MvaGFuZGxlLWVtcHR5LWxvY2Fs ZUlELWluLWxvY2FsZUlEQnVmZmVyRm9yTGFuZ3VhZ2VUYWdXaXRoTnVsbFRlcm1pbmF0b3IuanMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvaGFuZGxlLWVtcHR5LWxvY2FsZUlELWluLWxv Y2FsZUlEQnVmZmVyRm9yTGFuZ3VhZ2VUYWdXaXRoTnVsbFRlcm1pbmF0b3IuanMJKG5vbmV4aXN0 ZW50KQorKysgSlNUZXN0cy9zdHJlc3MvaGFuZGxlLWVtcHR5LWxvY2FsZUlELWluLWxvY2FsZUlE QnVmZmVyRm9yTGFuZ3VhZ2VUYWdXaXRoTnVsbFRlcm1pbmF0b3IuanMJKHdvcmtpbmcgY29weSkK QEAgLTAsMCArMSwzIEBACit2YXIgcmVzdWx0ID0gbmV3IEludGwuTG9jYWxlKCd1bmQnLCB7IGxh bmd1YWdlOiAncnUnIH0pLnRvU3RyaW5nKCk7CitpZiAocmVzdWx0ICE9ICJydSIpCisgICAgdGhy b3cgIkZBSUxFRCI7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI5MDk2 NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwyMiBAQAorMjAyMi0wMy0wNyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmVtb3ZlIGludmFsaWQgQVNTRVJUIGluIExvY2FsZUlEQnVpbGRlcjo6b3Zl cnJpZGVMYW5ndWFnZVNjcmlwdFJlZ2lvbigpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NTczCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MzMy NjIzMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGUgQVNTRVJUKGxlbmd0aCkgaW4gTG9jYWxlSURCdWlsZGVyOjpvdmVycmlkZUxhbmd1YWdlU2Ny aXB0UmVnaW9uKCkgaXMgc2ltcGx5CisgICAgICAgIGluY29ycmVjdC4gIFRoZSBsZW5ndGggY2Fu IGJlIDAgaWYgdWxvY19mb3JMYW5ndWFnZVRhZyByZXR1cm5zIGEgMCBsZW5ndGggaW4KKyAgICAg ICAgbG9jYWxlSURCdWZmZXJGb3JMYW5ndWFnZVRhZ1dpdGhOdWxsVGVybWluYXRvcigpLiAgTG9j YWxlSURCdWlsZGVyOjpvdmVycmlkZUxhbmd1YWdlU2NyaXB0UmVnaW9uKCkKKyAgICAgICAgYWxy ZWFkeSBoYW5kbGVzIHRoaXMgc2NlbmFyaW8gY29ycmVjdGx5LiAgV2UganVzdCBuZWVkIHRvIHJl bW92ZSB0aGlzIGluY29ycmVjdCBBU1NFUlQuCisKKyAgICAgICAgQWxzbyB2ZXJpZmllZCB0aGF0 IHdlJ3JlIHByb2R1Y2luZyB0aGUgc2FtZSByZXN1bHQgb24gdGhlIGF0dGFjaGVkIHRlc3QgY2Fz ZSBhcworICAgICAgICBDaHJvbWUgYW5kIEZpcmVmb3ggcHJvZHVjZXMuCisKKyAgICAgICAgKiBy dW50aW1lL0ludGxPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpsb2NhbGVJREJ1ZmZlckZvckxh bmd1YWdlVGFnV2l0aE51bGxUZXJtaW5hdG9yKToKKwogMjAyMi0wMy0wNyAgQW5nZWxvcyBPaWtv bm9tb3BvdWxvcyAgPGFuZ2Vsb3NAaWdhbGlhLmNvbT4KIAogICAgICAgICBBc3NlbWJseUhlbHBl cnNTcG9vbGVyczogdXNlIGxvYWQvc3RvcmUgcGFpciBvbiBBUk12NwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bExvY2FsZS5jcHAJKHJldmlzaW9uIDI5MDk2NSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxMb2NhbGUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMTcsNyArMTE3LDYgQEAgQ1N0cmluZyBMb2NhbGVJREJ1aWxkZXI6OnRvQ2Fu b25pY2FsKCkKIHZvaWQgTG9jYWxlSURCdWlsZGVyOjpvdmVycmlkZUxhbmd1YWdlU2NyaXB0UmVn aW9uKFN0cmluZ1ZpZXcgbGFuZ3VhZ2UsIFN0cmluZ1ZpZXcgc2NyaXB0LCBTdHJpbmdWaWV3IHJl Z2lvbikKIHsKICAgICB1bnNpZ25lZCBsZW5ndGggPSBzdHJsZW4obV9idWZmZXIuZGF0YSgpKTsK LSAgICBBU1NFUlQobGVuZ3RoKTsKIAogICAgIFN0cmluZ1ZpZXcgbG9jYWxlSURWaWV3IHsgbV9i dWZmZXIuZGF0YSgpLCBsZW5ndGggfTsKIAo=