devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

lua fix mem_read_write, strtol

Browse source 
back when I wrote this I was running the sim on a 32 bit machine
I didn't catch the hardcoded LONG_MAX reference or the fact that
lua_tointeger maxes ot at 32 bits

on 64 bit machines strtol caused all kinds of issues especially since
it returned the real LONG_MIN/MAX values

Change-Id: I3571ebbd9df333f7cbf4077562412c27429bfadc
This commit is contained in:
William Wilgus 2019-08-28 00:56:08 -05:00
parent b99d4d7fa9
commit c251d1879f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/plugins/lua/rocklib.c
View file

@ -642,8 +642,8 @@ RB_WRAP(strncasecmp)
static int mem_read_write(lua_State *L, uintptr_t address, size_t maxsize) static int mem_read_write(lua_State *L, uintptr_t address, size_t maxsize)
{ {
intptr_t offset = (intptr_t) luaL_optint(L, 1, 0); intptr_t offset = (intptr_t) luaL_optnumber(L, 1, 0);
size_t size = (size_t) luaL_optint(L, 2, maxsize); size_t size = (size_t) luaL_optnumber(L, 2, maxsize);
size_t written; size_t written;
int type = lua_type(L, 3); int type = lua_type(L, 3);
@ -651,6 +651,7 @@ static int mem_read_write(lua_State *L, uintptr_t address, size_t maxsize)
{ {
/* allows pointer within structure to be calculated offset */ /* allows pointer within structure to be calculated offset */
offset = -(address + offset); offset = -(address + offset);
luaL_argcheck(L, ((size_t) offset) <= maxsize, 1, ERR_IDX_RANGE);
size = (size_t) maxsize - offset; size = (size_t) maxsize - offset;
} }

2
apps/plugins/lua/strtol.c
View file

@ -2,7 +2,7 @@
extern unsigned long int strtoul(const char *ptr, char **endptr, int base); extern unsigned long int strtoul(const char *ptr, char **endptr, int base);
#define ABS_LONG_MIN 2147483648UL #define ABS_LONG_MIN LONG_MAX
long int strtol(const char *nptr, char **endptr, int base) long int strtol(const char *nptr, char **endptr, int base)
{ {
int neg=0; int neg=0;