lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: call lua_tolstring for bson dict key

Browse Source
This commit is contained in:
云风
2014-02-25 14:58:19 +08:00
parent 2166ce3c96
commit eb188eeaa3
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,18 +404,17 @@ append_one(struct bson *bs, lua_State *L, const char *key, size_t sz) {
} }
static inline int static inline int
bson_numstr( char *str, int i ) { bson_numstr( char *str, unsigned int i ) {
if ( i < MAX_NUMBER) { if ( i < MAX_NUMBER) {
memcpy( str, bson_numstrs[i], 4 ); memcpy( str, bson_numstrs[i], 4 );
return bson_numstr_len[i]; return bson_numstr_len[i];
} else { } else {
return sprintf( str,"%d", i ); return sprintf( str,"%u", i );
} }
} }
static void static void
pack_dict(lua_State *L, struct bson *b, bool isarray) { 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) {
@@ -423,21 +422,36 @@ pack_dict(lua_State *L, struct bson *b, bool isarray) {
char numberkey[8]; char numberkey[8];
const char * key = NULL; const char * key = NULL;
size_t sz; size_t sz;
switch(kt) { if (isarray) {
case LUA_TNUMBER: if (kt != LUA_TNUMBER) {
sz = bson_numstr(numberkey, lua_tointeger(L,-2)-arraydec); luaL_error(L, "Invalid array key type : %s", lua_typename(L, kt));
key = numberkey; return;
break; }
case LUA_TSTRING: sz = bson_numstr(numberkey, lua_tounsigned(L,-2)-1);
key = lua_tolstring(L,-2,&sz); key = numberkey;
break;
default:
luaL_error(L, "Invalid key type : %s", lua_typename(L, kt));
return;
}
append_one(b, L, key, sz); append_one(b, L, key, sz);
lua_pop(L,1); lua_pop(L,1);
} else {
switch(kt) {
case LUA_TNUMBER:
// copy key, don't change key type
lua_pushvalue(L,-2);
lua_insert(L,-2);
key = lua_tolstring(L,-2,&sz);
append_one(b, L, key, sz);
lua_pop(L,2);
break;
case LUA_TSTRING:
key = lua_tolstring(L,-2,&sz);
append_one(b, L, key, sz);
lua_pop(L,1);
break;
default:
luaL_error(L, "Invalid key type : %s", lua_typename(L, kt));
return;
}
}
} }
write_byte(b,0); write_byte(b,0);
write_length(b, b->size - length, length); write_length(b, b->size - length, length);