nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better control of overflows in size computations

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2004-12-01 13:46:18 -02:00
parent 0ed8519127
commit 97e2dab1fb
3 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
llex.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: llex.c,v 2.4 2004/09/22 14:02:00 roberto Exp roberto $
** $Id: llex.c,v 2.5 2004/11/24 19:16:03 roberto Exp roberto $
** Lexical Analyzer
** See Copyright Notice in lua.h
*/
@@ -26,12 +26,6 @@
#define next(ls) (ls->current = zgetc(ls->z))
#define save(ls,c) { \
Mbuffer *b = ls->buff; \
if (b->n + 1 > b->buffsize) \
luaZ_resizebuffer(ls->L, b, ((b->buffsize*2) + LUA_MINBUFFER)); \
b->buffer[b->n++] = cast(char, c); }
#define currIsNewline(ls) (ls->current == '\n' || ls->current == '\r')
@@ -48,6 +42,22 @@ static const char *const token2string [] = {
};
#define save_and_next(ls) (save(ls, ls->current), next(ls))
static void save (LexState *ls, int c) {
Mbuffer *b = ls->buff;
if (b->n + 1 > b->buffsize) {
size_t newsize;
if (b->buffsize >= MAX_SIZET/2)
luaX_lexerror(ls, "lexical element too long", 0);
newsize = b->buffsize * 2;
luaZ_resizebuffer(ls->L, b, newsize);
}
b->buffer[b->n++] = cast(char, c);
}
void luaX_init (lua_State *L) {
int i;
for (i=0; i<NUM_RESERVED; i++) {
@@ -130,6 +140,7 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) {
ls->linenumber = 1;
ls->lastline = 1;
ls->source = source;
luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER); /* initialize buffer */
next(ls); /* read first char */
}
@@ -143,12 +154,6 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) {
static void save_and_next (LexState *ls) {
save(ls, ls->current);
next(ls);
}
/* LUA_NUMBER */
static void read_numeral (LexState *ls, SemInfo *seminfo) {