the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error check for internal overflow of numerical constant

Browse Source 
See bug #2026
This commit is contained in:
bbbradsmith
2023-05-02 21:27:02 -04:00
parent 805e98a7aa
commit bf5b37a3b2
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cc65/scanner.c
View File

@@ -522,6 +522,7 @@ static void NumericConst (void)
char C; char C;
unsigned DigitVal; unsigned DigitVal;
unsigned long IVal; /* Value */ unsigned long IVal; /* Value */
int Overflow;
/* Get the pp-number first, then parse on it */ /* Get the pp-number first, then parse on it */
CopyPPNumber (&Src); CopyPPNumber (&Src);
@@ -575,6 +576,7 @@ static void NumericConst (void)
/* Since we now know the correct base, convert the input into a number */ /* Since we now know the correct base, convert the input into a number */
SB_SetIndex (&Src, Index); SB_SetIndex (&Src, Index);
IVal = 0; IVal = 0;
Overflow = 0;
while ((C = SB_Peek (&Src)) != '\0' && (Base <= 10 ? IsDigit (C) : IsXDigit (C))) { while ((C = SB_Peek (&Src)) != '\0' && (Base <= 10 ? IsDigit (C) : IsXDigit (C))) {
DigitVal = HexVal (C); DigitVal = HexVal (C);
if (DigitVal >= Base) { if (DigitVal >= Base) {
@@ -582,9 +584,17 @@ static void NumericConst (void)
SB_Clear (&Src); SB_Clear (&Src);
break; break;
} }
IVal = (IVal * Base) + DigitVal; if ((((unsigned long)(IVal * Base)) / Base) != IVal)
Overflow = 1;
IVal = IVal * Base;
if (((unsigned long)(IVal + DigitVal)) < IVal)
Overflow = 1;
IVal += DigitVal;
SB_Skip (&Src); SB_Skip (&Src);
} }
if (Overflow)
Error ("Numerical constant \"%s\" too large for internal 32-bit representation",
SB_GetConstBuf (&Src));
/* Distinguish between integer and floating point constants */ /* Distinguish between integer and floating point constants */
if (!IsFloat) { if (!IsFloat) {