[MERGE chakra-core#4433 @mattzeunert] Return invalid date when parsing out of range date/month value

jackhorton · jackhorton · commit 8c3cda6586ec · 2017-12-19T09:33:57.000-08:00
Merge pull request chakra-core#4433 from mattzeunert:fix-invalid-month Re-opening chakra-core#4378 as a new PR as the signing tool wasn't picking up the old one. Fixes chakra-core#4329 regarding how invalid dates are parsed. For example, new Date('13/40/2000') was previously parsed as Feb 09 2001 instead of Invalid Date.
diff --git a/lib/Runtime/Library/DateImplementation.cpp b/lib/Runtime/Library/DateImplementation.cpp
@@ -1484,7 +1484,9 @@ namespace Js {
             continue;
         }
 
-        if (lwNil == lwYear || lwNil == lwMonth || lwNil == lwDate)
+        if (lwNil == lwYear ||
+            lwNil == lwMonth || lwMonth > 11 ||
+            lwNil == lwDate || lwDate > 31)
         {
             goto LError;
         }
diff --git a/test/Date/DateParse.js b/test/Date/DateParse.js
@@ -174,3 +174,19 @@ WScript.Echo(Date.parse("2011/11-08 19:48:43"));
 
 // Multiple 'T's aren't allowed
 WScript.Echo(Date.parse("2011-11-08TT19:48:43"));
+
+// Parse dates with out of range month values
+
+datestring = "13/01/2000";
+WScript.Echo(Date.parse(datestring));
+
+datestring = "2000-13-01";
+WScript.Echo(Date.parse(datestring));
+
+// Parse dates with out of range date values
+
+datestring = "01/40/2000";
+WScript.Echo(Date.parse(datestring));
+
+datestring = "2000-01-40";
+WScript.Echo(Date.parse(datestring));
diff --git a/test/Date/DateParse_es5.baseline b/test/Date/DateParse_es5.baseline
@@ -117,3 +117,7 @@ NaN
 1320810523000
 1320810523000
 NaN
+NaN
+NaN
+NaN
+NaN

Original file line number	Diff line number	Diff line change
`@@ -1484,7 +1484,9 @@ namespace Js {`
`1484`	`1484`	`continue;`
`1485`	`1485`	`}`
`1486`	`1486`
`1487`		`- if (lwNil == lwYear \|\| lwNil == lwMonth \|\| lwNil == lwDate)`
	`1487`	`+ if (lwNil == lwYear \|\|`
	`1488`	`+ lwNil == lwMonth \|\| lwMonth > 11 \|\|`
	`1489`	`+ lwNil == lwDate \|\| lwDate > 31)`
`1488`	`1490`	`{`
`1489`	`1491`	`goto LError;`
`1490`	`1492`	`}`