nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1881930 - Be more strict about delimiter after day of week r=arai

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D207674
This commit is contained in:
Vinny Diehl 2024-04-19 06:06:14 +00:00
parent bcc703fbc9
commit 69bdd20b2c
2 changed files with 10 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
js/src/jsdate.cpp
View file

@ -1387,11 +1387,12 @@ static bool ParseDate(DateTimeInfo::ForceUTC forceUTC, const CharT* s,
if (IsAsciiDigit(s[index])) { if (IsAsciiDigit(s[index])) {
break; break;
} }
} else { } else if (!strchr(" ,.-/", s[index])) {
// Reject numbers directly after letters e.g. foo2 // We're only allowing the above delimiters after the day of
if (IsAsciiDigit(s[index]) && IsAsciiAlpha(s[index - 1])) { // week to prevent things such as "foo_1" from being parsed
return false; // as a date, which may break software which uses this function
} // to determine whether or not something is a date.
return false;
} }
} }
@ -3668,8 +3669,8 @@ static bool ToDateString(JSContext* cx, const CallArgs& args, ClippedTime t) {
if (!locale) { if (!locale) {
return false; return false;
} }
return FormatDate(cx, ForceUTC(cx->realm()), locale, return FormatDate(cx, ForceUTC(cx->realm()), locale, t.toDouble(),
t.toDouble(), FormatSpec::DateTime, args.rval()); FormatSpec::DateTime, args.rval());
} }
static bool DateNoArguments(JSContext* cx, const CallArgs& args) { static bool DateNoArguments(JSContext* cx, const CallArgs& args) {

2
js/src/tests/non262/Date/parse-day-of-week.js
View file

@ -63,6 +63,8 @@ const rejected = [
"Sep 26 1995 foo", "Sep 26 1995 foo",
"1995 foo Sep 26", "1995 foo Sep 26",
"foo2 Sep 26 1995", "foo2 Sep 26 1995",
"Tuesday_Sep 26 1995",
"foo_12",
]; ];
for (const format of formats) { for (const format of formats) {