mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-21 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tests): fixes for using vim.mpack and more ASAN

Browse Source
This commit is contained in:
bfredl
2023-02-01 12:54:22 +01:00
parent d6279f9392
commit f8f82901cd
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mpack/lmpack.c
View File

@@ -644,7 +644,13 @@ static void lmpack_unparse_enter(mpack_parser_t *parser, mpack_node_t *node)
mpack_node_t *n;
int has_meta = lua_getmetatable(L, -1);
if (packer->ext != LUA_NOREF && has_meta) {
int has_mtdict = false;
if (has_meta && packer->mtdict != LUA_NOREF) {
lmpack_geti(L, packer->reg, packer->mtdict); // [table, metatable, mtdict]
has_mtdict = lua_rawequal(L, -1, -2);
lua_pop(L, 1); // [table, metatable];
}
if (packer->ext != LUA_NOREF && has_meta && !has_mtdict) {
/* check if there's a handler for this metatable */
lmpack_geti(L, packer->reg, packer->ext);
lua_pushvalue(L, -2);
@@ -701,14 +707,7 @@ static void lmpack_unparse_enter(mpack_parser_t *parser, mpack_node_t *node)
}
}
int is_array = 1;
if (has_meta) {
// stack: [table, metatable]
if (packer->mtdict != LUA_NOREF) {
lmpack_geti(L, packer->reg, packer->mtdict); // [table, metatable, mtdict]
is_array = !lua_rawequal(L, -1, -2);
lua_pop(L, 1); // [table, metatable];
}
lua_pop(L, 1); // [table]
}
@@ -726,6 +725,7 @@ static void lmpack_unparse_enter(mpack_parser_t *parser, mpack_node_t *node)
lua_pop(L, 1);
}
int is_array = !has_mtdict;
len = lmpack_objlen(L, &is_array);
if (is_array) {
node->tok = mpack_pack_array(len);

11
src/mpack/object.c
View File

@@ -128,8 +128,11 @@ MPACK_API int mpack_unparse(mpack_parser_t *parser, char **buf, size_t *buflen,
return status;
}
MPACK_API void mpack_parser_copy(mpack_parser_t *dst, mpack_parser_t *src)
MPACK_API void mpack_parser_copy(mpack_parser_t *d, mpack_parser_t *s)
{
// workaround UBSAN being NOT happy with a flexible array member with arr[N>1] initial size
mpack_one_parser_t *dst = (mpack_one_parser_t *)d;
mpack_one_parser_t *src = (mpack_one_parser_t *)s;
mpack_uint32_t i;
mpack_uint32_t dst_capacity = dst->capacity;
assert(src->capacity <= dst_capacity);
@@ -148,8 +151,9 @@ static int mpack_parser_full(mpack_parser_t *parser)
return parser->size == parser->capacity;
}
static mpack_node_t *mpack_parser_push(mpack_parser_t *parser)
static mpack_node_t *mpack_parser_push(mpack_parser_t *p)
{
mpack_one_parser_t *parser = (mpack_one_parser_t *)p;
mpack_node_t *top;
assert(parser->size < parser->capacity);
top = parser->items + parser->size + 1;
@@ -162,8 +166,9 @@ static mpack_node_t *mpack_parser_push(mpack_parser_t *parser)
return top;
}
static mpack_node_t *mpack_parser_pop(mpack_parser_t *parser)
static mpack_node_t *mpack_parser_pop(mpack_parser_t *p)
{
mpack_one_parser_t *parser = (mpack_one_parser_t *)p;
mpack_node_t *top, *parent;
assert(parser->size);
top = parser->items + parser->size;