aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-q933.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-03-27 15:39:06 +0000
committerBill Meier <wmeier@newsguy.com>2011-03-27 15:39:06 +0000
commit7a77cdf0f1c2643f9ba4748e77c5b2e44fd80492 (patch)
treec5e4c220b5fc4990066c1f989ff96a85ed0d8fe6 /epan/dissectors/packet-q933.c
parenta4f03a1101b0a6a5ab0408b694fe4c14d30bbd4c (diff)
1. Fix bug in dissection of a field; Add two missing lines of code.
2. #if 0 if test "which will never be true"; Add XXX comment svn path=/trunk/; revision=36369
Diffstat (limited to 'epan/dissectors/packet-q933.c')
-rw-r--r--epan/dissectors/packet-q933.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index 31732ee63f..ee73a85e49 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -581,6 +581,8 @@ dissect_q933_bearer_capability_ie(tvbuff_t *tvb, int offset, int len,
"Parity: %s",
val_to_str(octet & 0x07, q933_l1_parity_vals,
"Unknown (0x%X)"));
+ offset += 1;
+ len -= 1;
if (octet & Q933_IE_VL_EXTENSION)
goto l1_done;
@@ -707,8 +709,10 @@ l2_done:
add_l3_info = (octet & 0x0F) << 4;
if (octet & Q933_IE_VL_EXTENSION)
goto l3_done;
+#if 0 /* XXX: len is always >0 at this point; is field always 2 bytes (if not Q933_IE_VL_EXTENSION) ? */
if (len == 0)
return;
+#endif
octet = tvb_get_guint8(tvb, offset + 1);
add_l3_info |= (octet & 0x0F);
proto_tree_add_text(tree, tvb, offset, 2,