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 /shared/memzip | |
| parent | 480659b1ac758c377568c93c0ccda6a232f744ca (diff) | |
| download | micropython-5015779a6f4a180233a78ec8b5fd1ea095057a91.tar.gz micropython-5015779a6f4a180233a78ec8b5fd1ea095057a91.zip | |
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 'shared/memzip')
| -rw-r--r-- | shared/memzip/lexermemzip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/memzip/lexermemzip.c b/shared/memzip/lexermemzip.c index 6b26961bdc..1915a04c01 100644 --- a/shared/memzip/lexermemzip.c +++ b/shared/memzip/lexermemzip.c @@ -5,15 +5,15 @@ #include "py/mperrno.h" #include "memzip.h" -mp_lexer_t *mp_lexer_new_from_file(const char *filename) +mp_lexer_t *mp_lexer_new_from_file(qstr filename) { void *data; size_t len; - if (memzip_locate(filename, &data, &len) != MZ_OK) { + if (memzip_locate(qstr_str(filename), &data, &len) != MZ_OK) { mp_raise_OSError(MP_ENOENT); } - return mp_lexer_new_from_str_len(qstr_from_str(filename), (const char *)data, (mp_uint_t)len, 0); + return mp_lexer_new_from_str_len(filename, (const char *)data, (mp_uint_t)len, 0); } |