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

more type check

Browse Source
This commit is contained in:
Cloud Wu
2015-04-01 13:22:09 +08:00
parent 41b447d41a
commit 6b87f159b4
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lualib-src/sproto/lsproto.c
View File

@@ -122,7 +122,8 @@ encode(const struct sproto_arg *args) {
return 0; return 0;
} }
if (!lua_istable(L, -1)) { if (!lua_istable(L, -1)) {
return luaL_error(L, "%s is not a table", args->tagname); return luaL_error(L, ".*%s(%d) should be a table (Is a %s)",
args->tagname, args->index, lua_typename(L, lua_type(L, -1)));
} }
if (self->array_index) { if (self->array_index) {
lua_replace(L, self->array_index); lua_replace(L, self->array_index);
@@ -177,6 +178,10 @@ encode(const struct sproto_arg *args) {
} }
case SPROTO_TBOOLEAN: { case SPROTO_TBOOLEAN: {
int v = lua_toboolean(L, -1); int v = lua_toboolean(L, -1);
if (!lua_isboolean(L,-1)) {
return luaL_error(L, ".%s[%d] is not a boolean (Is a %s)",
args->tagname, args->index, lua_typename(L, lua_type(L, -1)));
}
*(int *)args->value = v; *(int *)args->value = v;
lua_pop(L,1); lua_pop(L,1);
return 4; return 4;
@@ -200,9 +205,13 @@ encode(const struct sproto_arg *args) {
struct encode_ud sub; struct encode_ud sub;
int r; int r;
int top = lua_gettop(L); int top = lua_gettop(L);
if (!lua_istable(L, top)) {
return luaL_error(L, ".%s[%d] is not a table (Is a %s)",
args->tagname, args->index, lua_typename(L, lua_type(L, -1)));
}
sub.L = L; sub.L = L;
sub.st = args->subtype; sub.st = args->subtype;
sub.tbl_index = lua_gettop(L); sub.tbl_index = top;
sub.array_tag = NULL; sub.array_tag = NULL;
sub.array_index = 0; sub.array_index = 0;
sub.deep = self->deep + 1; sub.deep = self->deep + 1;