Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

When printing an error message, don't choke if tok->buf is NULL.

This commit is contained in:
Guido van Rossum 1991-06-07 13:58:56 +00:00
parent 64b4552069
commit 56b07c8ad9
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Parser/parsetok.c
View File

@ -89,17 +89,21 @@ parsefile(fp, filename, g, start, ps1, ps2, n_ret)
char *p; char *p;
fprintf(stderr, "Parsing error: file %s, line %d:\n", fprintf(stderr, "Parsing error: file %s, line %d:\n",
filename, tok->lineno); filename, tok->lineno);
*tok->inp = '\0'; if (tok->buf == NULL)
if (tok->inp > tok->buf && tok->inp[-1] == '\n') fprintf(stderr, "(EOF)\n");
tok->inp[-1] = '\0'; else {
fprintf(stderr, "%s\n", tok->buf); *tok->inp = '\0';
for (p = tok->buf; p < tok->cur; p++) { if (tok->inp > tok->buf && tok->inp[-1] == '\n')
if (*p == '\t') tok->inp[-1] = '\0';
putc('\t', stderr); fprintf(stderr, "%s\n", tok->buf);
else for (p = tok->buf; p < tok->cur; p++) {
putc(' ', stderr); if (*p == '\t')
putc('\t', stderr);
else
putc(' ', stderr);
}
fprintf(stderr, "^\n");
} }
fprintf(stderr, "^\n");
} }
tok_free(tok); tok_free(tok);
return ret; return ret;