Skip to content

fix: avoid pointer-arith error #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid pointer-arith error #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,7 @@ static bool cdata_from_lua_cdata(lua_State *L, struct ctype *ct, void *ptr, int

static bool cdata_from_lua_table(lua_State *L, struct ctype *ct, void *ptr, int idx, bool cast)
{
const uint8_t *sptr = (const uint8_t *)ptr;
int i = 0;

if (ct->type == CTYPE_ARRAY) {
Expand All @@ -856,7 +857,7 @@ static bool cdata_from_lua_table(lua_State *L, struct ctype *ct, void *ptr, int
lua_pop(L, 1);
break;
}
cdata_from_lua(L, ct->array->ct, ptr + ctype_sizeof(ct->array->ct) * i++, lua_absindex(L, -1), cast);
cdata_from_lua(L, ct->array->ct, (void *)(sptr + ctype_sizeof(ct->array->ct) * i++), lua_absindex(L, -1), cast);
lua_pop(L, 1);
}
return true;
Expand All @@ -871,7 +872,7 @@ static bool cdata_from_lua_table(lua_State *L, struct ctype *ct, void *ptr, int
}

if (!lua_isnil(L, -1))
cdata_from_lua(L, field->ct, ptr + field->offset, lua_absindex(L, -1), cast);
cdata_from_lua(L, field->ct, (void *)(sptr + field->offset), lua_absindex(L, -1), cast);
lua_pop(L, 1);
}
return true;
Expand Down Expand Up @@ -968,7 +969,7 @@ static int cdata_from_lua(lua_State *L, struct ctype *ct, void *ptr, int idx, bo

static int cdata_index_ptr(lua_State *L, struct cdata *cd, struct ctype *ct, bool to)
{
void *ptr = cdata_type(cd) == CTYPE_PTR ? cdata_ptr_ptr(cd) : cdata_ptr(cd);
const uint8_t *sptr = (const uint8_t *)(cdata_type(cd) == CTYPE_PTR ? cdata_ptr_ptr(cd) : cdata_ptr(cd));
int idx;

if (ct->type == CTYPE_VOID) {
Expand All @@ -992,7 +993,7 @@ static int cdata_index_ptr(lua_State *L, struct cdata *cd, struct ctype *ct, boo
}
lua_pop(L, 2);

cdata_to_lua(L, ct, ptr + ctype_sizeof(ct) * idx);
cdata_to_lua(L, ct, (void *)(sptr + ctype_sizeof(ct) * idx));

if (luaL_testudata(L, -1, CDATA_MT)) {
lua_rawgetp(L, LUA_REGISTRYINDEX, cd);
Expand All @@ -1002,7 +1003,7 @@ static int cdata_index_ptr(lua_State *L, struct cdata *cd, struct ctype *ct, boo
}
return 1;
} else {
return cdata_from_lua(L, ct, ptr + ctype_sizeof(ct) * idx, 3, false);
return cdata_from_lua(L, ct, (void *)(sptr + ctype_sizeof(ct) * idx), 3, false);
}
}

Expand Down Expand Up @@ -1033,7 +1034,7 @@ static struct crecord_field *cdata_crecord_find_field(

static int cdata_index_crecord(lua_State *L, struct cdata *cd, struct ctype *ct, bool to)
{
void *ptr = cdata_type(cd) == CTYPE_PTR ? cdata_ptr_ptr(cd) : cdata_ptr(cd);
const uint8_t *sptr = (const uint8_t *)(cdata_type(cd) == CTYPE_PTR ? cdata_ptr_ptr(cd) : cdata_ptr(cd));
struct crecord *rc = ct->rc;
struct crecord_field *field;
size_t offset = 0;
Expand Down Expand Up @@ -1077,7 +1078,7 @@ static int cdata_index_crecord(lua_State *L, struct cdata *cd, struct ctype *ct,
}

if (to) {
cdata_to_lua(L, field->ct, ptr + offset);
cdata_to_lua(L, field->ct, (void *)(sptr + offset));
if (luaL_testudata(L, -1, CDATA_MT)) {
lua_rawgetp(L, LUA_REGISTRYINDEX, cd);
lua_pushvalue(L, -2);
Expand All @@ -1086,7 +1087,7 @@ static int cdata_index_crecord(lua_State *L, struct cdata *cd, struct ctype *ct,
}
return 1;
} else {
return cdata_from_lua(L, field->ct, ptr + offset, 3, false);
return cdata_from_lua(L, field->ct, (void *)(sptr + offset), 3, false);
}
}

Expand Down