[Bug 14889] com.livecode.math: Emit errors when converting to base 10.

peter-b · peter-b · commit 90dd9927c6d7 · 2015-03-12T09:47:49.000Z
diff --git a/libscript/src/module-math.cpp b/libscript/src/module-math.cpp
@@ -361,14 +361,18 @@ extern "C" MC_DLLEXPORT void MCMathEvalConvertToBase10(MCStringRef p_operand, in
     
     bool t_negative;
     uinteger_t t_result;
-    bool t_error;
+    bool t_error = false;
     if (MCMathConvertToBase10(p_operand, p_source_base, t_negative, t_result, t_error))
     {
         if ((t_negative && t_result > INTEGER_MAX) || (!t_negative && t_result > abs(INTEGER_MIN)))
             MCErrorCreateAndThrow(kMCGenericErrorTypeInfo, "reason", MCSTR("integer overflow"), nil);
         else
             r_output = t_negative ? -t_result : t_result;
     }
+	else if (t_error)
+	{
+		MCErrorCreateAndThrow(kMCGenericErrorTypeInfo, "reason", MCSTR("integer overflow, or invalid character in source"), nil);
+	}
 }
 
 extern "C" MC_DLLEXPORT void MCMathEvalConvertFromBase10(integer_t p_operand, integer_t p_dest_base, MCStringRef& r_output)
diff --git a/tests/lcb/stdlib/math.lcb b/tests/lcb/stdlib/math.lcb
@@ -18,6 +18,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 module com.livecode.math.tests
 
 use com.livecode.math
+use com.livecode.foreign
 use com.livecode.__INTERNAL._testlib
 
 -- Empirically-chosen epsilon for floating-point comparisons
@@ -198,9 +199,14 @@ public handler TestMaxList()
 	skip test "max (empty list)" because "Can't test for errors"
 end handler
 
+handler TestBaseConvert_InvalidFormat() as LCUInt
+	return "0xf004" converted from base 16 -- bug 14889
+end handler
 public handler TestBaseConvertFrom()
 	test "convert from hex" when "6A" converted from base 16 is 106
 	test "convert from binary" when "1001010" converted from base 2 is 74
+
+	MCUnitTestHandlerThrows(TestBaseConvert_InvalidFormat, "convert from hex (0x)")
 end handler
 
 public handler TestBaseConvertTo()

Original file line number	Diff line number	Diff line change
`@@ -361,14 +361,18 @@ extern "C" MC_DLLEXPORT void MCMathEvalConvertToBase10(MCStringRef p_operand, in`
`361`	`361`
`362`	`362`	`bool t_negative;`
`363`	`363`	`uinteger_t t_result;`
`364`		`- bool t_error;`
	`364`	`+ bool t_error = false;`
`365`	`365`	`if (MCMathConvertToBase10(p_operand, p_source_base, t_negative, t_result, t_error))`
`366`	`366`	`{`
`367`	`367`	`if ((t_negative && t_result > INTEGER_MAX) \|\| (!t_negative && t_result > abs(INTEGER_MIN)))`
`368`	`368`	`MCErrorCreateAndThrow(kMCGenericErrorTypeInfo, "reason", MCSTR("integer overflow"), nil);`
`369`	`369`	`else`
`370`	`370`	`r_output = t_negative ? -t_result : t_result;`
`371`	`371`	`}`
	`372`	`+ else if (t_error)`
	`373`	`+ {`
	`374`	`+ MCErrorCreateAndThrow(kMCGenericErrorTypeInfo, "reason", MCSTR("integer overflow, or invalid character in source"), nil);`
	`375`	`+ }`
`372`	`376`	`}`
`373`	`377`
`374`	`378`	`extern "C" MC_DLLEXPORT void MCMathEvalConvertFromBase10(integer_t p_operand, integer_t p_dest_base, MCStringRef& r_output)`