diff options
Diffstat (limited to 'py/frozenmod.c')
| -rw-r--r-- | py/frozenmod.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/py/frozenmod.c b/py/frozenmod.c index 7158f6ea8..5464d0af9 100644 --- a/py/frozenmod.c +++ b/py/frozenmod.c @@ -135,16 +135,21 @@ mp_import_stat_t mp_frozen_stat(const char *str) { } int mp_find_frozen_module(const char *str, size_t len, void **data) { - // The +8/-8 account for the .frozen/ path prefix used on frozen modules. + // If the frozen module pseudo dir (e.g., ".frozen/") is a prefix of str, remove it. + if (strncmp(str, MP_FROZEN_FAKE_DIR_SLASH, MP_FROZEN_FAKE_DIR_SLASH_LENGTH) == 0) { + str = str + MP_FROZEN_FAKE_DIR_SLASH_LENGTH; + len = len - MP_FROZEN_FAKE_DIR_SLASH_LENGTH; + } + #if MICROPY_MODULE_FROZEN_STR - mp_lexer_t *lex = mp_lexer_frozen_str(str + 8, len - 8); + mp_lexer_t *lex = mp_lexer_frozen_str(str, len); if (lex != NULL) { *data = lex; return MP_FROZEN_STR; } #endif #if MICROPY_MODULE_FROZEN_MPY - const mp_raw_code_t *rc = mp_find_frozen_mpy(str + 8, len - 8); + const mp_raw_code_t *rc = mp_find_frozen_mpy(str, len); if (rc != NULL) { *data = (void*)rc; return MP_FROZEN_MPY; |