aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-04-07 08:52:38 +0200
committerStig Bjørlykke <stig@bjorlykke.org>2015-04-07 06:58:52 +0000
commita49e5523d0f32a3562d1c079aa8de32f5bb02de3 (patch)
tree13ac5a23d80db2cbdaa83c80f64cdde52b7cd032
parent0a729d8d66a26246978588a30c8978c1d745fe7f (diff)
DMP: Handle encoded 7bit string as binary.
This bug was introduced when rewriting tvb_get_string() to handle encoding (and thus handling ASCII string different). Change-Id: Ia37a9d075fb58c8d6c26af811e96f7ca1e82af3d Reviewed-on: https://code.wireshark.org/review/7962 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-rw-r--r--epan/dissectors/packet-dmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 74f4dc356b..2dcac3d72d 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -1646,7 +1646,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo,
static gchar *dissect_7bit_string (tvbuff_t *tvb, gint offset, gint length)
{
- guchar *encoded = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII);
+ guchar *encoded = (guchar *)tvb_memdup (wmem_packet_scope(), tvb, offset, length);
guchar *decoded = (guchar *)wmem_alloc0 (wmem_packet_scope(), (size_t)(length * 1.2) + 1);
guchar rest = 0, bits = 1;
gint len = 0, i;