XS: secaudit issue #17

Author: Patrick Soquet

xs/sources/xsMath.c

@@ -295,44 +295,66 @@ void fx_Math_hypot(txMachine* the)
 
 void fx_Math_idiv(txMachine* the)
 {
-	txInteger x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
-	txInteger y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
+	txS8 x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
+	txS8 y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
 	if (y == 0) {
 		mxResult->kind = XS_NUMBER_KIND;
 		mxResult->value.number = C_NAN;
 	}
 	else {
-		mxResult->kind = XS_INTEGER_KIND;
-		mxResult->value.integer = x / y;
+		txS8 r = x / y;
+		if ((-2147483648LL <= r) && (r <= 2147483647LL)) {
+			mxResult->kind = XS_INTEGER_KIND;
+			mxResult->value.integer = (txInteger)r;
+		}
+		else {
+			mxResult->kind = XS_NUMBER_KIND;
+			mxResult->value.number = (txNumber)r;
+		}
 	}
 }
 
 void fx_Math_idivmod(txMachine* the)
 {
-	txInteger x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
-	txInteger y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
+	txS8 x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
+	txS8 y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
 	if (y == 0) {
 		mxPushNumber(C_NAN);
 		mxPushNumber(C_NAN);
 	}
 	else {
-		mxPushInteger(x / y);
-		mxPushInteger((x % y + y) % y);
+		txS8 r = x / y;
+		if ((-2147483648LL <= r) && (r <= 2147483647LL))
+			mxPushInteger((txInteger)r);
+		else
+			mxPushNumber((txNumber)r);
+		r = (x % y + y) % y;
+		if ((-2147483648LL <= r) && (r <= 2147483647LL))
+			mxPushInteger((txInteger)r);
+		else
+			mxPushNumber((txNumber)r);
 	}
 	fxConstructArrayEntry(the, mxResult);
 }
 
 void fx_Math_imod(txMachine* the)
 {
-	txInteger x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
-	txInteger y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
+	txS8 x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
+	txS8 y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
 	if (y == 0) {
 		mxResult->kind = XS_NUMBER_KIND;
 		mxResult->value.number = C_NAN;
 	}
 	else {
-		mxResult->kind = XS_INTEGER_KIND;
-		mxResult->value.integer = (x % y + y) % y;
+		txS8 r = (x % y + y) % y;
+		if ((-2147483648LL <= r) && (r <= 2147483647LL)) {
+			mxResult->kind = XS_INTEGER_KIND;
+			mxResult->value.integer = (txInteger)r;
+		}
+		else {
+			mxResult->kind = XS_NUMBER_KIND;
+			mxResult->value.number = (txNumber)r;
+		}
 	}
 }
 
@@ -368,15 +390,22 @@ void fx_Math_imuldiv(txMachine* the)
 
 void fx_Math_irem(txMachine* the)
 {
-	txInteger x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
-	txInteger y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
+	txS8 x = (mxArgc > 0) ? fxToInteger(the, mxArgv(0)) : 0;
+	txS8 y = (mxArgc > 1) ? fxToInteger(the, mxArgv(1)) : 0;
 	if (y == 0) {
 		mxResult->kind = XS_NUMBER_KIND;
 		mxResult->value.number = C_NAN;
 	}
 	else {
-		mxResult->kind = XS_INTEGER_KIND;
-		mxResult->value.integer = x % y;
+		txS8 r = x % y;
+		if ((-2147483648LL <= r) && (r <= 2147483647LL)) {
+			mxResult->kind = XS_INTEGER_KIND;
+			mxResult->value.integer = (txInteger)r;
+		}
+		else {
+			mxResult->kind = XS_NUMBER_KIND;
+			mxResult->value.number = (txNumber)r;
+		}
 	}
 }