osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Coverity CID 746734: Dead default in switch. (No need to backport) 

svn path=/trunk/; revision=47461
This commit is contained in:
Chris Maynard 2013-02-04 02:44:04 +00:00
parent f2beeac1d0
commit 97af002693
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
epan/dissectors/packet-bt-utp.c
View File

@ -158,7 +158,6 @@ static gint
get_utp_version(tvbuff_t *tvb) {
guint8 v0_flags, v0_ext;
guint8 v1_ver_type, v1_ext;
gint version;
guint len;
/* Simple heuristics inspired by code from utp.cpp */
@ -178,31 +177,18 @@ get_utp_version(tvbuff_t *tvb) {
if (((v1_ver_type & 0x0f) == 1) &&
((v1_ver_type>>4) < ST_NUM_STATES) &&
(v1_ext < EXT_NUM_EXT)) {
version = 1; /* V1 */
if (len < V1_FIXED_HDR_SIZE)
return -1;
return 1;
}
else if ((v0_flags < ST_NUM_STATES) ||
(v0_ext < EXT_NUM_EXT)) {
version = 0; /* V0 */
if (len < V0_FIXED_HDR_SIZE)
return -1;
return 0;
}
else
return -1;
switch(version) {
case 0:
if (len < V0_FIXED_HDR_SIZE)
return -1;
break;
case 1:
if (len < V1_FIXED_HDR_SIZE)
return -1;
break;
default:
return -1;
}
return version;
}
static int