Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 5 deletions

diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index 7040213f56..a6f8b42040 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1387,11 +1387,12 @@ static bool ParseDate(DateTimeInfo::ForceUTC forceUTC, const CharT* s,
       if (IsAsciiDigit(s[index])) {
         break;
       }
-    } else {
-      // Reject numbers directly after letters e.g. foo2
-      if (IsAsciiDigit(s[index]) && IsAsciiAlpha(s[index - 1])) {
-        return false;
-      }
+    } else if (!strchr(" ,.-/", s[index])) {
+      // We're only allowing the above delimiters after the day of
+      // week to prevent things such as "foo_1" from being parsed
+      // as a date, which may break software which uses this function
+      // to determine whether or not something is a date.
+      return false;
     }
   }