diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-03-17 15:37:28 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-03-17 15:37:28 +0000 |
| commit | 92377b21dff45cafc0dc5e465bab098757c707e1 (patch) | |
| tree | 05df88c9f08975b59471cf6880e1f50a32ed87a5 /epan/dissectors/packet-agentx.c | |
| parent | 858867667903c238be572b47317d0290a3e330ce (diff) | |
From Jakub Zawadzki: Simpler patch to resolve bug 5755 to properly display all
strings in dissect_octet_string() without having to allocate extra memory.
svn path=/trunk/; revision=36207
Diffstat (limited to 'epan/dissectors/packet-agentx.c')
| -rw-r--r-- | epan/dissectors/packet-agentx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index 47fcc300f2..989e2d7aeb 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -300,15 +300,13 @@ static int dissect_octet_string(tvbuff_t *tvb, proto_tree *tree, int offset, char flags) { guint32 n_oct, p_noct; - guint8 *str_buf; NORLEL(flags, n_oct, tvb, offset); p_noct = PADDING(n_oct); - 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, str_buf); + proto_tree_add_item(tree, hf_ostring, tvb, offset + 4, n_oct, FALSE); return p_noct + 4; } |