BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glslang PP: make decimal number parser clearer and add boundary tests. Also, disable the warning for "do {} while (true);"

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31215 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2015-05-16 01:15:41 +00:00
parent 84ea15f444
commit b06127c513
4 changed files with 92 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
glslang/MachineIndependent/preprocessor/PpScanner.cpp
View file

@ -432,19 +432,21 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
} else {
// Finish handling signed and unsigned integers
int numericLen = len;
int uint = 0;
bool uint = false;
if (ch == 'u' || ch == 'U') {
if (len < TPpToken::maxTokenLength)
ppToken->name[len++] = (char)ch;
uint = 1;
uint = true;
} else
pp->ungetChar();
ppToken->name[len] = '\0';
ppToken->name[len] = '\0';
ival = 0;
for (ii = 0; ii < numericLen; ii++) {
ch = ppToken->name[ii] - '0';
if ((ival > 0x19999999u) || (ival == 0x19999999u && ch >= 6)) {
const unsigned oneTenthMaxInt = 0xFFFFFFFFu / 10;
const unsigned remainderMaxInt = 0xFFFFFFFFu - 10 * oneTenthMaxInt;
for (int i = 0; i < numericLen; i++) {
ch = ppToken->name[i] - '0';
if ((ival > oneTenthMaxInt) || (ival == oneTenthMaxInt && ch > remainderMaxInt)) {
pp->parseContext.error(ppToken->loc, "numeric literal too big", "", "");
ival = 0xFFFFFFFFu;
break;