lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: lua-bson , don't dec index when pack dict

Browse Source
This commit is contained in:
云风
2013-11-11 20:55:02 +08:00
parent ffd48633c2
commit ec13a89ee4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lualib-src/lua-bson.c
View File

@@ -247,7 +247,7 @@ write_double(struct bson *b, lua_Number d) {
} }
} }
static void pack_dict(lua_State *L, struct bson *b); static void pack_dict(lua_State *L, struct bson *b, bool array);
static inline void static inline void
append_key(struct bson *bs, int type, const char *key, size_t sz) { append_key(struct bson *bs, int type, const char *key, size_t sz) {
@@ -291,7 +291,7 @@ append_table(struct bson *bs, lua_State *L, const char *key, size_t sz) {
} else { } else {
append_key(bs, BSON_DOCUMENT, key, sz); append_key(bs, BSON_DOCUMENT, key, sz);
} }
pack_dict(L, bs); pack_dict(L, bs, isarray);
} }
static void static void
@@ -414,7 +414,8 @@ bson_numstr( char *str, int i ) {
} }
static void static void
pack_dict(lua_State *L, struct bson *b) { pack_dict(lua_State *L, struct bson *b, bool isarray) {
int arraydec = isarray ? 1 : 0;
int length = reserve_length(b); int length = reserve_length(b);
lua_pushnil(L); lua_pushnil(L);
while(lua_next(L,-2) != 0) { while(lua_next(L,-2) != 0) {
@@ -424,7 +425,7 @@ pack_dict(lua_State *L, struct bson *b) {
size_t sz; size_t sz;
switch(kt) { switch(kt) {
case LUA_TNUMBER: case LUA_TNUMBER:
sz = bson_numstr(numberkey, lua_tointeger(L,-2)-1); sz = bson_numstr(numberkey, lua_tointeger(L,-2)-arraydec);
key = numberkey; key = numberkey;
break; break;
case LUA_TSTRING: case LUA_TSTRING:
@@ -794,7 +795,7 @@ lencode(lua_State *L) {
bson_create(&b); bson_create(&b);
lua_settop(L,1); lua_settop(L,1);
luaL_checktype(L, 1, LUA_TTABLE); luaL_checktype(L, 1, LUA_TTABLE);
pack_dict(L,&b); pack_dict(L, &b, false);
void * ud = lua_newuserdata(L, b.size); void * ud = lua_newuserdata(L, b.size);
memcpy(ud, b.ptr, b.size); memcpy(ud, b.ptr, b.size);
bson_destroy(&b); bson_destroy(&b);
@@ -1132,4 +1133,3 @@ luaopen_bson(lua_State *L) {
return 1; return 1;
} }