Skip to content
Permalink
Browse files

bison: check for int overflow when scanning

* src/scan-gram.l: Include errno.h, for errno.
(scan_integer, handle_syncline): Check for integer overflow.
* tests/input.at (too-large.y): Adjust to match new diagnostics.
  • Loading branch information
eggert committed Oct 17, 2019
1 parent 15c1b91 commit 052215a138ab6a4091d59ba95565e2d0cef5f35f
Showing with 8 additions and 2 deletions.
  1. +6 −2 src/scan-gram.l
  2. +2 −0 tests/input.at
@@ -21,6 +21,8 @@
%option prefix="gram_" outfile="lex.yy.c"

%{
#include <errno.h>

#include <c-ctype.h>
#include <mbswidth.h>
#include <quote.h>
@@ -818,9 +820,10 @@ scan_integer (char const *number, int base, location loc)
complain (&loc, Wyacc,
_("POSIX Yacc does not support hexadecimal literals"));

errno = 0;
long num = strtol (number, NULL, base);

if (! (0 <= num && num <= INT_MAX))
if (! (0 <= num && num <= INT_MAX && errno == 0))
{
complain (&loc, complaint, _("integer out of range: %s"),
quote (number));
@@ -896,8 +899,9 @@ static void
handle_syncline (char *args, location loc)
{
char *file;
errno = 0;
long lineno = strtol (args, &file, 10);
if (! (0 <= lineno && lineno <= INT_MAX))
if (! (0 <= lineno && lineno <= INT_MAX && errno == 0))
{
complain (&loc, Wother, _("line number overflow"));
lineno = INT_MAX;
@@ -1523,7 +1523,9 @@ start: TOO_LARGE_DEC TOO_LARGE_HEX

AT_BISON_CHECK([too-large.y], [1], [],
[[too-large.y:9.22-42: error: integer out of range: '999999999999999999999'
too-large.y:9.22-42: error: user token number of TOO_LARGE_DEC too large
too-large.y:10.24-44: error: integer out of range: '0xFFFFFFFFFFFFFFFFFFF'
too-large.y:10.24-44: error: user token number of TOO_LARGE_HEX too large
]])

AT_BISON_OPTION_POPDEFS

0 comments on commit 052215a

Please sign in to comment.
You can’t perform that action at this time.