osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Fulko Hew via bug 5755: Fix dissect_octet_string() so it properly displays 

strings of any length.

svn path=/trunk/; revision=36199
This commit is contained in:
Chris Maynard 2011-03-16 14:51:53 +00:00
parent 9486d7dcc2
commit d40ddf49c6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-agentx.c
View File

@ -300,19 +300,15 @@ static int
dissect_octet_string(tvbuff_t *tvb, proto_tree *tree, int offset, char flags)
{
guint32 n_oct, p_noct;
char context[1024];
guint8 *str_buf;
NORLEL(flags, n_oct, tvb, offset);
p_noct = PADDING(n_oct);
if (n_oct >= 1024)
THROW(ReportedBoundsError);
if (n_oct > 0)
tvb_get_nstringz(tvb, offset + 4, n_oct, context);
context[n_oct]='\0';
str_buf = tvb_get_ephemeral_string(tvb, offset + 4, n_oct);
proto_tree_add_uint(tree, hf_ostring_len, tvb, offset, 4, n_oct);
proto_tree_add_string(tree, hf_ostring, tvb, offset + 4, n_oct, context);
proto_tree_add_string(tree, hf_ostring, tvb, offset + 4, n_oct, str_buf);
return p_noct + 4;
}