fix a potential end-of-buffer issue in tccelf.c

also read characters one at a time when PARSE_DEBUG is set; after this
patch, things seem to work with that.
master
Philip 2015-04-30 21:31:32 +00:00
parent 2e04fa8872
commit 951a43ea6c
2 changed files with 6 additions and 3 deletions

View File

@ -3275,6 +3275,11 @@ static int ld_next(TCCState *s1, char *name, int name_size)
goto parse_name;
}
break;
case '\\':
ch = handle_eob();
if (ch != '\\')
goto redo;
/* fall through */
/* case 'a' ... 'z': */
case 'a':
case 'b':
@ -3330,7 +3335,6 @@ static int ld_next(TCCState *s1, char *name, int name_size)
case 'Y':
case 'Z':
case '_':
case '\\':
case '.':
case '$':
case '~':
@ -3462,7 +3466,6 @@ ST_FUNC int tcc_load_ldscript(TCCState *s1)
char filename[1024];
int t, ret;
ch = file->buf_ptr[0];
ch = handle_eob();
for(;;) {
t = ld_next(s1, cmd, sizeof(cmd));

View File

@ -386,7 +386,7 @@ static int tcc_peekc_slow(BufferedFile *bf)
if (bf->buf_ptr >= bf->buf_end) {
if (bf->fd != -1) {
#if defined(PARSE_DEBUG)
len = 8;
len = 1;
#else
len = IO_BUF_SIZE;
#endif