bpo-34400: Fix more undefined behavior in parsetok.c (GH-8833)

This commit is contained in:
Zackery Spytz 2018-08-20 21:11:40 -06:00 committed by Benjamin Peterson
parent cdbf50cba1
commit 3e26e42c90
1 changed files with 4 additions and 2 deletions

View File

@ -252,11 +252,13 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
} }
} }
#endif #endif
if (a >= tok->line_start) if (a != NULL && a >= tok->line_start) {
col_offset = Py_SAFE_DOWNCAST(a - tok->line_start, col_offset = Py_SAFE_DOWNCAST(a - tok->line_start,
intptr_t, int); intptr_t, int);
else }
else {
col_offset = -1; col_offset = -1;
}
if ((err_ret->error = if ((err_ret->error =
PyParser_AddToken(ps, (int)type, str, PyParser_AddToken(ps, (int)type, str,