diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-07-10 13:42:51 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-07-10 13:42:51 +0000 |
| commit | 7ab9808489a9270f5f59654540c3ab88458f7905 (patch) | |
| tree | c5c167e0e5cbf38fd9db9228eb9e1d13d695e838 /epan/dissectors/packet-armagetronad.c | |
| parent | 98f5096bbd8c3c49f9ad835ab1b31247781e7faa (diff) | |
Cast that guint16 into a char before trying to NULL terminate the string (so that we only set 1 byte to 0, not 2).
svn path=/trunk/; revision=25697
Diffstat (limited to 'epan/dissectors/packet-armagetronad.c')
| -rw-r--r-- | epan/dissectors/packet-armagetronad.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index 2f196a6d37..747ae61b13 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -142,14 +142,16 @@ static gboolean is_armagetronad_packet(tvbuff_t * tvb) } static void -add_message_data(tvbuff_t * tvb, gint offset, gint data_len, - proto_tree * tree) +add_message_data(tvbuff_t * tvb, gint offset, gint data_len, proto_tree * tree) { guint16 *data = NULL; if (tree) { + gchar *bptr; + data = tvb_memcpy(tvb, ep_alloc(data_len + 1), offset, data_len); - data[data_len] = '\0'; + bptr = (gchar *)data; + bptr[data_len] = '\0'; } if (data) { |