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

A round of increasing robustness against buffer overruns.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@21917 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-06-10 07:36:26 +00:00
parent 7408a69952
commit 00f605b930
11 changed files with 98 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
glslang/MachineIndependent/preprocessor/tokens.c
View file

@ -316,6 +316,9 @@ int ReadToken(TokenStream *pTok, yystypepp * yylvalpp)
symbol_name[len] = ch;
len++;
ch = lReadByte(pTok);
} else {
ShPpErrorToInfoLog("token too long");
break;
}
}
symbol_name[len] = '\0';
@ -325,9 +328,13 @@ int ReadToken(TokenStream *pTok, yystypepp * yylvalpp)
break;
case CPP_STRCONSTANT:
len = 0;
while ((ch = lReadByte(pTok)) != 0)
while ((ch = lReadByte(pTok)) != 0) {
if (len < MAX_STRING_LEN)
string_val[len++] = ch;
else
break;
}
string_val[len] = 0;
yylvalpp->sc_ident = LookUpAddString(atable, string_val);
break;
@ -340,6 +347,9 @@ int ReadToken(TokenStream *pTok, yystypepp * yylvalpp)
symbol_name[len] = ch;
len++;
ch = lReadByte(pTok);
} else {
ShPpErrorToInfoLog("token too long");
break;
}
}
symbol_name[len] = '\0';
@ -356,6 +366,9 @@ int ReadToken(TokenStream *pTok, yystypepp * yylvalpp)
symbol_name[len] = ch;
len++;
ch = lReadByte(pTok);
} else {
ShPpErrorToInfoLog("token too long");
break;
}
}
symbol_name[len] = '\0';
@ -443,7 +456,7 @@ void UngetToken(int token, yystypepp * yylvalpp) {
void DumpTokenStream(FILE *fp, TokenStream *s, yystypepp * yylvalpp) {
int token;
const int maxSize = 100;
const int maxSize = MAX_SYMBOL_NAME_LEN + 5;
char str[100];
if (fp == 0) fp = stdout;