summaryrefslogtreecommitdiff
path: root/epan/wslua/wslua_dumper.c
diff options
context:
space:
mode:
authorHadriel Kaplan <hadrielk@yahoo.com>2014-02-26 23:42:15 -0500
committerGerald Combs <gerald@wireshark.org>2014-02-27 21:23:09 +0000
commitc826191be02132251a9bd7cdaa44647b24bfce95 (patch)
tree61acb2aad3b0243f22abe3084564a34161891635 /epan/wslua/wslua_dumper.c
parentc875dc8597a6ff3a513cd6b8397626c331564f5e (diff)
downloadwireshark-c826191be02132251a9bd7cdaa44647b24bfce95.tar.gz
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_dumper.c')
-rw-r--r--epan/wslua/wslua_dumper.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c
index 6da3f4003e..7db98ef41a 100644
--- a/epan/wslua/wslua_dumper.c
+++ b/epan/wslua/wslua_dumper.c
@@ -253,8 +253,10 @@ WSLUA_METHOD Dumper_close(lua_State* L) {
Dumper* dp = (Dumper*)luaL_checkudata(L, 1, "Dumper");
int err;
- if (! *dp)
+ if (! *dp) {
WSLUA_ERROR(Dumper_close,"Cannot operate on a closed dumper");
+ return 0;
+ }
g_hash_table_remove(dumper_encaps,*dp);
@@ -303,16 +305,22 @@ WSLUA_METHOD Dumper_dump(lua_State* L) {
ts = luaL_checknumber(L,WSLUA_ARG_Dumper_dump_TIMESTAMP);
ph = checkPseudoHeader(L,WSLUA_ARG_Dumper_dump_PSEUDOHEADER);
- if (!ph) WSLUA_ARG_ERROR(Dumper_dump,TIMESTAMP,"need a PseudoHeader");
+ if (!ph) {
+ WSLUA_ARG_ERROR(Dumper_dump,TIMESTAMP,"need a PseudoHeader");
+ return 0;
+ }
ba = checkByteArray(L,WSLUA_ARG_Dumper_dump_BYTEARRAY);
- if (! ba) WSLUA_ARG_ERROR(Dumper_dump,BYTEARRAY,"must be a ByteArray");
+ if (! ba) {
+ WSLUA_ARG_ERROR(Dumper_dump,BYTEARRAY,"must be a ByteArray");
+ return 0;
+ }
memset(&pkthdr, 0, sizeof(pkthdr));
- pkthdr.ts.secs = (unsigned)floor(ts);
- pkthdr.ts.nsecs = (unsigned)floor((ts - (double)pkthdr.ts.secs) * 1000000000);
+ pkthdr.ts.secs = (unsigned int)(floor(ts));
+ pkthdr.ts.nsecs = (unsigned int)(floor((ts - (double)pkthdr.ts.secs) * 1000000000));
pkthdr.len = ba->len;
pkthdr.caplen = ba->len;
@@ -347,8 +355,10 @@ WSLUA_METHOD Dumper_new_for_current(lua_State* L) {
filename = cross_plat_fname(fname);
- if (! lua_pinfo )
+ if (! lua_pinfo ) {
WSLUA_ERROR(Dumper_new_for_current,"Cannot be used outside a tap or a dissector");
+ return 0;
+ }
encap = lua_pinfo->fd->lnk_t;
@@ -394,7 +404,10 @@ WSLUA_METHOD Dumper_dump_current(lua_State* L) {
if (!d) return 0;
- if (! lua_pinfo ) WSLUA_ERROR(Dumper_new_for_current,"Cannot be used outside a tap or a dissector");
+ if (! lua_pinfo ) {
+ WSLUA_ERROR(Dumper_new_for_current,"Cannot be used outside a tap or a dissector");
+ return 0;
+ }
data_src = (struct data_source*) (lua_pinfo->data_src->data);
if (!data_src)