Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-13 14:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bison: check for int overflow in token numbers

Browse Source 
* 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.
This commit is contained in:
Paul Eggert
2019-10-17 11:35:48 -07:00
parent 052215a138
commit 8a4ec5d4e4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/symtab.c
View File

@@ -30,6 +30,7 @@
#include "complain.h" #include "complain.h"
#include "getargs.h" #include "getargs.h"
#include "gram.h" #include "gram.h"
#include "intprops.h"
#include "quote.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) && *user_token_numberp != user_token_number)
complain (&loc, complaint, _("redefining user token number of %s"), complain (&loc, complaint, _("redefining user token number of %s"),
sym->tag); sym->tag);
else if (user_token_number == INT_MAX)
complain (&loc, complaint, _("user token number of %s too large"),
sym->tag);
else else
{ {
*user_token_numberp = user_token_number; *user_token_numberp = user_token_number;
@@ -1005,7 +1009,11 @@ symbols_token_translations_init (void)
{ {
sym_content *this = symbols[i]->content; sym_content *this = symbols[i]->content;
if (this->user_token_number == USER_NUMBER_UNDEFINED) 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) if (this->user_token_number > max_user_token_number)
max_user_token_number = this->user_token_number; max_user_token_number = this->user_token_number;
} }