felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check all Subtract implementations for overflow.

Browse Source
This commit is contained in:
Dianne Skoll
2021-01-30 15:15:02 -05:00
parent 429a64f29e
commit 2123bf4b18
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/expr.c
View File

@@ -876,7 +876,9 @@ static int Subtract(void)
/* If it's a date minus an int, do subtraction, checking for underflow */ /* If it's a date minus an int, do subtraction, checking for underflow */
if (v1.type == DATE_TYPE && v2.type == INT_TYPE) { if (v1.type == DATE_TYPE && v2.type == INT_TYPE) {
int old = v1.v.val;
v1.v.val -= v2.v.val; v1.v.val -= v2.v.val;
if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
if (v1.v.val < 0) return E_DATE_OVER; if (v1.v.val < 0) return E_DATE_OVER;
PushValStack(v1); PushValStack(v1);
return OK; return OK;
@@ -885,7 +887,9 @@ static int Subtract(void)
/* If it's a datetime minus an int or a time, do subtraction, /* If it's a datetime minus an int or a time, do subtraction,
* checking for underflow */ * checking for underflow */
if (v1.type == DATETIME_TYPE && (v2.type == INT_TYPE || v2.type == TIME_TYPE)) { if (v1.type == DATETIME_TYPE && (v2.type == INT_TYPE || v2.type == TIME_TYPE)) {
int old = v1.v.val;
v1.v.val -= v2.v.val; v1.v.val -= v2.v.val;
if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
if (v1.v.val < 0) return E_DATE_OVER; if (v1.v.val < 0) return E_DATE_OVER;
PushValStack(v1); PushValStack(v1);
return OK; return OK;
@@ -903,7 +907,9 @@ static int Subtract(void)
if ((v1.type == TIME_TYPE && v2.type == TIME_TYPE) || if ((v1.type == TIME_TYPE && v2.type == TIME_TYPE) ||
(v1.type == DATETIME_TYPE && v2.type == DATETIME_TYPE) || (v1.type == DATETIME_TYPE && v2.type == DATETIME_TYPE) ||
(v1.type == DATE_TYPE && v2.type == DATE_TYPE)) { (v1.type == DATE_TYPE && v2.type == DATE_TYPE)) {
int old = v1.v.val;
v1.v.val -= v2.v.val; v1.v.val -= v2.v.val;
if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
v1.type = INT_TYPE; v1.type = INT_TYPE;
PushValStack(v1); PushValStack(v1);
return OK; return OK;