o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmd/yacc: check that arg is safe to pass to <ctype.h> isX functions

Browse source 
The functions from <ctype.h> require that their argument be
representable as an unsigned char, anything else is an error.

Change-Id: I9dafc49c431b7a2550b041603f27bac3c0010eea
This commit is contained in:
Neven Sajko 2019-08-25 13:53:10 +00:00 • committed by Russ Cox
parent d2fae53d17
commit eb4aea5072
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cmd/yacc.c
View file

@ -349,6 +349,7 @@ void finact(void);
int defin(int, char*); int defin(int, char*);
void defout(int); void defout(int);
char* cstash(char*); char* cstash(char*);
int isvalidchar(long);
long gettok(void); long gettok(void);
int fdtype(int); int fdtype(int);
int chfind(int, char*); int chfind(int, char*);
@ -1680,6 +1681,12 @@ cstash(char *s)
return temp; return temp;
} }
int
isvalidchar(long i)
{
return (i & ~0xffUL) == 0;
}
long long
gettok(void) gettok(void)
{ {
@ -1774,6 +1781,8 @@ begin:
default: default:
/* number */ /* number */
if(!isvalidchar(c))
return c;
if(isdigit(c)) { if(isdigit(c)) {
numbval = c-'0'; numbval = c-'0';
base = (c=='0')? 8: 10; base = (c=='0')? 8: 10;
@ -1784,8 +1793,8 @@ begin:
} }
if(islower(c) || isupper(c) || c=='_' || c=='.' || c=='$') { if(islower(c) || isupper(c) || c=='_' || c=='.' || c=='$') {
i = 0; i = 0;
while(islower(c) || isupper(c) || isdigit(c) || while(isvalidchar(c) && (islower(c) || isupper(c) || isdigit(c) ||
c == '-' || c=='_' || c=='.' || c=='$') { c == '-' || c=='_' || c=='.' || c=='$')) {
if(reserve && isupper(c)) if(reserve && isupper(c))
c += 'a'-'A'; c += 'a'-'A';
rune = c; rune = c;
@ -2028,7 +2037,7 @@ swt:
s = -s; s = -s;
c = Bgetrune(finput); c = Bgetrune(finput);
} }
if(isdigit(c)) { if(isvalidchar(c) && isdigit(c)) {
j = 0; j = 0;
while(isdigit(c)) { while(isdigit(c)) {
j = j*10 + (c-'0'); j = j*10 + (c-'0');
@ -2052,7 +2061,7 @@ swt:
} }
goto loop; goto loop;
} }
if(isupper(c) || islower(c) || c == '_' || c == '.') { if(isvalidchar(c) && (isupper(c) || islower(c) || c == '_' || c == '.')) {
int tok; /* tok used oustide for type info */ int tok; /* tok used oustide for type info */
/* look for $name */ /* look for $name */
@ -2963,7 +2972,7 @@ gtnm(void)
sign = 0; sign = 0;
val = 0; val = 0;
while((c=Bgetrune(finput)) != Beof) { while((c=Bgetrune(finput)) != Beof) {
if(isdigit(c)) { if(isvalidchar(c) && isdigit(c)) {
val = val*10 + c-'0'; val = val*10 + c-'0';
continue; continue;
} }