Fix bug 11162

Fraser J. Gordon · Fraser J. Gordon · commit 40fc365ecb5e · 2013-09-10T15:11:28.000+01:00
Date format string parsing has been made less strict in its processing, now collapsing one or more spaces together to allow a ' ' in a format string to match one or more input spaces. Additionally, spaces in the input after a formatting specifier was successfully matched are ignored. With these changes, both "10:41 PM" and "10:41PM" are accepted as valid times; previously, only the former was acceptable.
diff --git a/engine/src/date.cpp b/engine/src/date.cpp
@@ -445,6 +445,16 @@ static bool datetime_parse(const MCDateTimeLocale *p_locale, int4 p_century_cuto
 				t_valid = true;
 			break;
 			}
+			
+			// FG-2013-09-10 [[ Bug 11162 ]]
+			// Trailing spaces after an accepted format specifier should be squashed
+			if (t_valid && !t_skip)
+			{
+				while (p_format[1] != '\0' && isspace(p_format[1]))
+					p_format++;
+				while (t_input_length > 1 && isspace(t_input[1]))
+					t_input++, t_input_length--;
+			}
 
 		}
 		else if (*p_format != *t_input)
@@ -474,6 +484,13 @@ static bool datetime_parse(const MCDateTimeLocale *p_locale, int4 p_century_cuto
 		}
 		else
 		{
+			// FG-2013-09-10 [[ Bug 11162 ]]
+			// One or more spaces in the format string should accept any number of input spaces
+			while (t_input_length > 0 && isspace(*t_input))
+				t_input += 1, t_input_length -= 1;
+			while (*p_format != '\0' && isspace(*p_format))
+				p_format++;
+			
 			if (t_input_length > 0)
 			{
 				t_input += 1;

Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,16 @@ static bool datetime_parse(const MCDateTimeLocale *p_locale, int4 p_century_cuto`
`445`	`445`	`t_valid = true;`
`446`	`446`	`break;`
`447`	`447`	`}`
	`448`	`+`
	`449`	`+ // FG-2013-09-10 [[ Bug 11162 ]]`
	`450`	`+ // Trailing spaces after an accepted format specifier should be squashed`
	`451`	`+ if (t_valid && !t_skip)`
	`452`	`+ {`
	`453`	`+ while (p_format[1] != '\0' && isspace(p_format[1]))`
	`454`	`+ p_format++;`
	`455`	`+ while (t_input_length > 1 && isspace(t_input[1]))`
	`456`	`+ t_input++, t_input_length--;`
	`457`	`+ }`
`448`	`458`
`449`	`459`	`}`
`450`	`460`	`else if (p_format != t_input)`
`@@ -474,6 +484,13 @@ static bool datetime_parse(const MCDateTimeLocale *p_locale, int4 p_century_cuto`
`474`	`484`	`}`
`475`	`485`	`else`
`476`	`486`	`{`
	`487`	`+ // FG-2013-09-10 [[ Bug 11162 ]]`
	`488`	`+ // One or more spaces in the format string should accept any number of input spaces`
	`489`	`+ while (t_input_length > 0 && isspace(*t_input))`
	`490`	`+ t_input += 1, t_input_length -= 1;`
	`491`	`+ while (p_format != '\0' && isspace(p_format))`
	`492`	`+ p_format++;`
	`493`	`+`
`477`	`494`	`if (t_input_length > 0)`
`478`	`495`	`{`
`479`	`496`	`t_input += 1;`