diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2009-05-23 15:14:45 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2009-05-24 12:17:09 +0200 |
| commit | 911aae05b5d3ffd2543333e27cf06778381c7b3c (patch) | |
| tree | 33330b37bf5ede3156f1a7984f1692073223e454 /src/scanner.l | |
| parent | 04b38c4c173cef3b1b12163f1cf5a9b3cef8cb4a (diff) | |
New upstream release 15.7a, fixing CVE-2009-014815.7a-1
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scanner.l b/src/scanner.l index ef32a41..8c5160d 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -44,7 +44,7 @@ #define IFLEVELINC 5 /* #if nesting level size increment */ -static char const rcsid[] = "$Id: scanner.l,v 1.7 2004/01/08 14:07:20 broeker Exp $"; +static char const rcsid[] = "$Id: scanner.l,v 1.8 2007/03/09 23:54:34 broeker Exp $"; int first; /* buffer index for first char of symbol */ int last; /* buffer index for last char of symbol */ @@ -95,8 +95,8 @@ int comment(void); #else /* Assume this is the AT&T/SCO style lex */ #undef input -#define input() ((yytchar=(yytchar=yysptr>yysbuf?*(unsigned char *)--yysptr:getc(yyin))=='/'?comment():yytchar)==EOF?0:yytchar) -#define noncommentinput() ((yytchar=yysptr>yysbuf?*--yysptr:getc(yyin))==EOF?0:yytchar) +#define input() ((yytchar=(yytchar=yysptr>yysbuf?*(unsigned char *)--yysptr:getc(yyin))=='/'?comment():yytchar)==EOF?LEXEOF:yytchar) +#define noncommentinput() ((yytchar=yysptr>yysbuf?*--yysptr:getc(yyin))==EOF?LEXEOF:yytchar) #undef unput #define unput(c) (*yysptr++=(c)) @@ -685,7 +685,7 @@ comment_input(void) c = getc (yyin); - return c; + return (c == EOF) ? LEXEOF : c; } int |