diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2023-09-27 13:43:50 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-10-12 15:17:59 +1100 |
| commit | 5015779a6f4a180233a78ec8b5fd1ea095057a91 (patch) | |
| tree | d034986dcc9dde9631838918822cca1ef7f3941a /py/lexer.c | |
| parent | 480659b1ac758c377568c93c0ccda6a232f744ca (diff) | |
py/builtinevex: Handle invalid filenames for execfile.
If a non-string buffer was passed to execfile, then it would be passed
as a non-null-terminated char* to mp_lexer_new_from_file.
This changes mp_lexer_new_from_file to take a qstr instead (as in almost
all cases a qstr will be created from this input anyway to set the
`__file__` attribute on the module).
This now makes execfile require a string (not generic buffer) argument,
which is probably a good fix to make anyway.
Fixes issue #12522.
This work was funded through GitHub Sponsors.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Diffstat (limited to 'py/lexer.c')
| -rw-r--r-- | py/lexer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/lexer.c b/py/lexer.c index 6b28f2215..9587f6b16 100644 --- a/py/lexer.c +++ b/py/lexer.c @@ -879,10 +879,10 @@ mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, size_t len #if MICROPY_READER_POSIX || MICROPY_READER_VFS -mp_lexer_t *mp_lexer_new_from_file(const char *filename) { +mp_lexer_t *mp_lexer_new_from_file(qstr filename) { mp_reader_t reader; mp_reader_new_file(&reader, filename); - return mp_lexer_new(qstr_from_str(filename), reader); + return mp_lexer_new(filename, reader); } #if MICROPY_HELPER_LEXER_UNIX |