[[ Bug 12104 ]] Convert command fails with invalid date

runrevali · runrevali · commit a6b4c640493d · 2014-04-03T10:23:02.000+01:00
diff --git a/docs/notes/bugfix-12104.md b/docs/notes/bugfix-12104.md
@@ -0,0 +1 @@
+# Convert command fails with invalid date since 7.0
diff --git a/engine/src/date.cpp b/engine/src/date.cpp
@@ -1094,8 +1094,8 @@ bool MCD_convert_to_datetime(MCExecContext &ctxt, MCValueRef p_input, Convert_fo
 					return false;
 			}
 			
-            
-			if (!MCValueIsEmpty(p_input))
+            // AL-2014-03-04: [[ Bug 12104 ]] If we have more to parse here, then parsing failed.
+			if (MCStringGetLength(*t_string) > t_offset)
 				return false;
             
 			if ((t_valid_dateitems & DATETIME_ITEM_DATE) != DATETIME_ITEM_DATE)
@@ -1312,7 +1312,8 @@ bool MCD_convert_from_datetime(MCExecContext &ctxt, MCDateTime p_datetime, Conve
 			t_buffer = t_new;
 		}
 		
-		ctxt.SetTheResultToValue(t_buffer);
+        // AL-2014-03-04: [[ Bug 12104 ]] The result should be empty if conversion is successful.
+		//ctxt.SetTheResultToValue(t_buffer);
 		r_output = t_buffer;
 	}
     

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Convert command fails with invalid date since 7.0`
Original file line number	Diff line number	Diff line change
`@@ -1094,8 +1094,8 @@ bool MCD_convert_to_datetime(MCExecContext &ctxt, MCValueRef p_input, Convert_fo`
`1094`	`1094`	`return false;`
`1095`	`1095`	`}`
`1096`	`1096`
`1097`		`-`
`1098`		`- if (!MCValueIsEmpty(p_input))`
	`1097`	`+ // AL-2014-03-04: [[ Bug 12104 ]] If we have more to parse here, then parsing failed.`
	`1098`	`+ if (MCStringGetLength(*t_string) > t_offset)`
`1099`	`1099`	`return false;`
`1100`	`1100`
`1101`	`1101`	`if ((t_valid_dateitems & DATETIME_ITEM_DATE) != DATETIME_ITEM_DATE)`
`@@ -1312,7 +1312,8 @@ bool MCD_convert_from_datetime(MCExecContext &ctxt, MCDateTime p_datetime, Conve`
`1312`	`1312`	`t_buffer = t_new;`
`1313`	`1313`	`}`
`1314`	`1314`
`1315`		`- ctxt.SetTheResultToValue(t_buffer);`
	`1315`	`+ // AL-2014-03-04: [[ Bug 12104 ]] The result should be empty if conversion is successful.`
	`1316`	`+ //ctxt.SetTheResultToValue(t_buffer);`
`1316`	`1317`	`r_output = t_buffer;`
`1317`	`1318`	`}`
`1318`	`1319`