diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2018-08-21 03:11:40 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2018-08-21 03:11:40 (GMT) |
| commit | 3e26e42c905852394fa136f1cc564dac98b56166 (patch) | |
| tree | aab8651b7351b994e334daf42d0b102689a6d8d7 /Parser/parsetok.c | |
| parent | cdbf50cba1664f72ae6621a89c324a32fea70377 (diff) | |
| download | cpython-3e26e42c905852394fa136f1cc564dac98b56166.zip cpython-3e26e42c905852394fa136f1cc564dac98b56166.tar.gz cpython-3e26e42c905852394fa136f1cc564dac98b56166.tar.bz2 | |
bpo-34400: Fix more undefined behavior in parsetok.c (GH-8833)
Diffstat (limited to 'Parser/parsetok.c')
| -rw-r--r-- | Parser/parsetok.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Parser/parsetok.c b/Parser/parsetok.c index b9c9fe8..a1580e6 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -252,11 +252,13 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, } } #endif - if (a >= tok->line_start) + if (a != NULL && a >= tok->line_start) { col_offset = Py_SAFE_DOWNCAST(a - tok->line_start, intptr_t, int); - else + } + else { col_offset = -1; + } if ((err_ret->error = PyParser_AddToken(ps, (int)type, str, |