MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken embedded LFS image with 64bit values. 

The marshalling code wasn't taking into account the changing size of
the TValue struct.
This commit is contained in:
Johny Mattsson 2021-08-25 18:59:15 +10:00
parent 0690a7d181
commit dee19e2777
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lua/lua-5.3/lundump.c
View File

@ -145,11 +145,15 @@ static void *Store_(LoadState *S, void *a, int ndx, const void *e, size_t s
/* These compression maps must match the definitions in lobject.h etc. */ /* These compression maps must match the definitions in lobject.h etc. */
# define OFFSET_TSTRING (2*(sizeof(lu_int32)-sizeof(size_t))) # define OFFSET_TSTRING (2*(sizeof(lu_int32)-sizeof(size_t)))
# define FMT_TSTRING "AwwA" # define FMT_TSTRING "AwwA"
# define FMT_TVALUE "WA" #if defined(CONFIG_LUA_NUMBER_INT64) || defined(CONFIG_LUA_NUMBER_DOUBLE)
# define FMT_TVALUE "www"
#else
# define FMT_TVALUE "AW"
#endif
# define FMT_PROTO "AwwwwwwwwwwAAAAAAAA" # define FMT_PROTO "AwwwwwwwwwwAAAAAAAA"
# define FMT_UPVALUE "AW" # define FMT_UPVALUE "AW"
# define FMT_LOCVAR "Aww" # define FMT_LOCVAR "Aww"
# define FMT_ROTENTRY "AWA" # define FMT_ROTENTRY "A" FMT_TVALUE
# define FMT_ROTABLE "AWAA" # define FMT_ROTABLE "AWAA"
# define StoreR(S,a, i, v, f) Store_(S, (a), i, &(v), sizeof(v), f) # define StoreR(S,a, i, v, f) Store_(S, (a), i, &(v), sizeof(v), f)
# define Store(S, a, i, v) StoreR(S, (a), i, v, NULL) # define Store(S, a, i, v) StoreR(S, (a), i, v, NULL)