diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-02-26 23:42:15 -0500 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-27 21:23:09 +0000 |
| commit | c826191be02132251a9bd7cdaa44647b24bfce95 (patch) | |
| tree | 61acb2aad3b0243f22abe3084564a34161891635 /epan/wslua/wslua_struct.c | |
| parent | c875dc8597a6ff3a513cd6b8397626c331564f5e (diff) | |
Fix coverity warnings for all wslua files. (redux)
This fixes/addresses all the coverity warnings shown by
the buildbots. (I hope)
Change-Id: Ic2722df97c577d274e3cf3f0cbdca1902edde047
Reviewed-on: https://code.wireshark.org/review/423
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/wslua/wslua_struct.c')
| -rw-r--r-- | epan/wslua/wslua_struct.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/wslua/wslua_struct.c b/epan/wslua/wslua_struct.c index 3ef76458e6..1789356610 100644 --- a/epan/wslua/wslua_struct.c +++ b/epan/wslua/wslua_struct.c @@ -450,7 +450,7 @@ WSLUA_CONSTRUCTOR Struct_unpack (lua_State *L) { if (size == 0) { if (!lua_isnumber(L, -1)) luaL_error(L, "format `c0' needs a previous size"); - size = (guint32)lua_tonumber(L, -1); + size = wslua_toguint32(L, -1); lua_pop(L, 1); luaL_argcheck(L, pos+size <= ld, 2, "data string too short"); } @@ -515,8 +515,10 @@ WSLUA_CONSTRUCTOR Struct_tohex (lua_State *L) { s = luaL_checklstring(L,WSLUA_ARG_Struct_tohex_BYTESTRING,&len); - if (!s) + if (!s) { WSLUA_ARG_ERROR(Struct_tohex,BYTESTRING,"must be a Lua string"); + return 0; + } lowercase = wslua_optbool(L,WSLUA_OPTARG_Struct_tohex_LOWERCASE,FALSE); sep = luaL_optstring(L,WSLUA_OPTARG_Struct_tohex_SEPARATOR,NULL); @@ -535,8 +537,10 @@ WSLUA_CONSTRUCTOR Struct_fromhex (lua_State *L) { s = luaL_checklstring(L,WSLUA_ARG_Struct_fromhex_HEXBYTES,&len); - if (!s) + if (!s) { WSLUA_ARG_ERROR(Struct_tohex,BYTESTRING,"must be a Lua string"); + return 0; + } sep = luaL_optstring(L,WSLUA_OPTARG_Struct_fromhex_SEPARATOR,NULL); |