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

Merge pull request #619 from cloudwu/bsonfix

Browse Source 
destroy bson object when encode error
This commit is contained in:
云风
2017-04-20 18:43:37 +08:00
committed by GitHub
parent dab5a4e308 999a941110
commit b7d79ff343
1 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,15 +551,17 @@ static void
pack_ordered_dict(lua_State *L, struct bson *b, int n, int depth) { pack_ordered_dict(lua_State *L, struct bson *b, int n, int depth) {
int length = reserve_length(b); int length = reserve_length(b);
int i; int i;
size_t sz;
// the first key is at index n
const char * key = lua_tolstring(L, n, &sz);
for (i=0;i<n;i+=2) { for (i=0;i<n;i+=2) {
size_t sz;
const char * key = lua_tolstring(L, i+1, &sz);
if (key == NULL) { if (key == NULL) {
luaL_error(L, "Argument %d need a string", i+1); luaL_error(L, "Argument %d need a string", i+1);
} }
lua_pushvalue(L, i+2); lua_pushvalue(L, i+1);
append_one(b, L, key, sz, depth); append_one(b, L, key, sz, depth);
lua_pop(L,1); lua_pop(L,1);
key = lua_tolstring(L, i+2, &sz); // next key
} }
write_byte(b,0); write_byte(b,0);
write_length(b, b->size - length, length); write_length(b, b->size - length, length);
@@ -938,36 +940,66 @@ bson_meta(lua_State *L) {
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
} }
static int
encode_bson(lua_State *L) {
struct bson *b = lua_touserdata(L, 2);
lua_settop(L, 1);
if (luaL_getmetafield(L, -1, "__pairs") != LUA_TNIL) {
pack_meta_dict(L, b, 0);
} else {
pack_simple_dict(L, b, 0);
}
void * ud = lua_newuserdata(L, b->size);
memcpy(ud, b->ptr, b->size);
return 1;
}
static int static int
lencode(lua_State *L) { lencode(lua_State *L) {
struct bson b; struct bson b;
bson_create(&b);
lua_settop(L,1); lua_settop(L,1);
luaL_checktype(L, 1, LUA_TTABLE); luaL_checktype(L, 1, LUA_TTABLE);
if (luaL_getmetafield(L, -1, "__pairs") != LUA_TNIL) { bson_create(&b);
pack_meta_dict(L, &b, 0); lua_pushcfunction(L, encode_bson);
} else { lua_pushvalue(L, 1);
pack_simple_dict(L, &b, 0); lua_pushlightuserdata(L, &b);
if (lua_pcall(L, 2, 1, 0) != LUA_OK) {
bson_destroy(&b);
return lua_error(L);
} }
void * ud = lua_newuserdata(L, b.size);
memcpy(ud, b.ptr, b.size);
bson_destroy(&b); bson_destroy(&b);
bson_meta(L); bson_meta(L);
return 1; return 1;
} }
static int
encode_bson_byorder(lua_State *L) {
int n = lua_gettop(L);
struct bson *b = lua_touserdata(L, n);
lua_settop(L, --n);
pack_ordered_dict(L, b, n, 0);
lua_settop(L,0);
void * ud = lua_newuserdata(L, b->size);
memcpy(ud, b->ptr, b->size);
return 1;
}
static int static int
lencode_order(lua_State *L) { lencode_order(lua_State *L) {
struct bson b; struct bson b;
bson_create(&b);
int n = lua_gettop(L); int n = lua_gettop(L);
if (n%2 != 0) { if (n%2 != 0) {
return luaL_error(L, "Invalid ordered dict"); return luaL_error(L, "Invalid ordered dict");
} }
pack_ordered_dict(L, &b, n, 0); bson_create(&b);
lua_settop(L,1); lua_pushvalue(L, 1); // copy the first arg to n
void * ud = lua_newuserdata(L, b.size); lua_pushcfunction(L, encode_bson_byorder);
memcpy(ud, b.ptr, b.size); lua_replace(L, 1);
lua_pushlightuserdata(L, &b);
if (lua_pcall(L, n+1, 1, 0) != LUA_OK) {
bson_destroy(&b);
return lua_error(L);
}
bson_destroy(&b); bson_destroy(&b);
bson_meta(L); bson_meta(L);
return 1; return 1;