aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-23 05:37:42 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2007-10-23 05:37:42 +0000
commit14966de855b13172ffe8f3c8c3da837330f1137f (patch)
tree4e5585ef608afb5c0d5924aee03293e15f13bdd9 /epan
parent7d937caae7817c60bedd80ddf11c732ac6bf7922 (diff)
Fix for bug 1931 and bug 1932:
A never ending while loop and a value to string mapping error. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23251 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-gdsdb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index 116c3bcc05..6da692aab0 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -604,7 +604,7 @@ gdsdb_receive(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
proto_tree_add_item(tree, hf_gdsdb_receive_messages, tvb,
offset, 4, FALSE);
offset += 4;
- while(tvb_bytes_exist(tvb, 0, 12)) {
+ while(tvb_bytes_exist(tvb, offset, 12)) {
proto_tree_add_item(tree, hf_gdsdb_receive_direction,
tvb, offset, 4, FALSE);
offset += 4;
@@ -1263,7 +1263,7 @@ dissect_gdsdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->cinfo, COL_INFO))
col_add_str(pinfo->cinfo, COL_INFO,
- match_strval(opcode, gdsdb_opcode));
+ val_to_str(opcode, gdsdb_opcode, "Unknown opcode %u"));
if (tree) {
ti = proto_tree_add_item(tree, proto_gdsdb, tvb, 0, -1,