diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-10-17 11:35:48 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-10-17 11:51:20 -0700 |
commit | 8a4ec5d4e4decd58a151b68ab0288b0925124dc0 (patch) | |
tree | 8e397d5751c4388fdbd1b8bd8ad2aa66ebce07ce /src | |
parent | 052215a138ab6a4091d59ba95565e2d0cef5f35f (diff) | |
download | bison-8a4ec5d4e4decd58a151b68ab0288b0925124dc0.tar.gz |
bison: check for int overflow in token numbers
* src/symtab.c: Include intprops.h
(symbol_user_token_number_set): Don’t allow user_token_number ==
INT_MAX because too much other code adds 1 to the user token number.
(symbols_token_translations_init): Complain on integer overflow
instead of indulging in undefined behavior.
Diffstat (limited to 'src')
-rw-r--r-- | src/symtab.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/symtab.c b/src/symtab.c index f2454725..a619d177 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -30,6 +30,7 @@ #include "complain.h" #include "getargs.h" #include "gram.h" +#include "intprops.h" #include "quote.h" @@ -549,6 +550,9 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc) && *user_token_numberp != user_token_number) complain (&loc, complaint, _("redefining user token number of %s"), sym->tag); + else if (user_token_number == INT_MAX) + complain (&loc, complaint, _("user token number of %s too large"), + sym->tag); else { *user_token_numberp = user_token_number; @@ -1005,7 +1009,11 @@ symbols_token_translations_init (void) { sym_content *this = symbols[i]->content; if (this->user_token_number == USER_NUMBER_UNDEFINED) - this->user_token_number = ++max_user_token_number; + { + if (INT_ADD_WRAPV (max_user_token_number, 1, &max_user_token_number)) + complain (NULL, fatal, _("token number too large")); + this->user_token_number = max_user_token_number; + } if (this->user_token_number > max_user_token_number) max_user_token_number = this->user_token_number; } |