From e78cce5fbd7a11b0d3122b6d64968c15ea3106f8 Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Tue, 23 Oct 2007 05:37:42 +0000 Subject: [PATCH] Fix for bug 1931 and bug 1932: A never ending while loop and a value to string mapping error. svn path=/trunk/; revision=23251 --- epan/dissectors/packet-gdsdb.c | 4 ++-- 1 file 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,