Use tvb_get_string_enc() rather than tvb_get_string(). The version of

the AR.drone Developer Guide I found online mentioned ASCII but not
UTF-8.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54923 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c
index d08cd77697c4aacef7d84cdd1cd98950e5f0578a..84081e2f058bc98c712ab340712184d45a224a90 100644 (file)
--- a/epan/dissectors/packet-ar_drone.c
+++ b/epan/dissectors/packet-ar_drone.c
@@ -150,9 +150,9 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
         if (offset < master_offset)
             return master_offset;
 
-        command = tvb_get_string(wmem_packet_scope(), tvb, master_offset, offset-master_offset);
+        command = tvb_get_string_enc(wmem_packet_scope(), tvb, master_offset, offset-master_offset, ENC_ASCII|ENC_NA);
         sub_item = proto_tree_add_string(ar_tree, hf_command, tvb, master_offset, -1,
-            tvb_get_string(wmem_packet_scope(), tvb, master_offset+3, offset-master_offset-3));
+            tvb_get_string_enc(wmem_packet_scope(), tvb, master_offset+3, offset-master_offset-3, ENC_ASCII|ENC_NA));
 
         if (!strncmp(command, "AT*PCMD", 7))
         {
@@ -545,7 +545,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
             }
             ti = proto_tree_add_item(sub_tree, hf_CTRL_mode, tvb, offset, length, ENC_ASCII|ENC_NA);
             proto_item_append_text(ti, "%s",
-                    str_to_str(tvb_get_string(wmem_packet_scope(), tvb, offset, length), CTRL_mode_vs, " (Unknown Mode)"));
+                    str_to_str(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII|ENC_NA), CTRL_mode_vs, " (Unknown Mode)"));
             offset += (length + 1);
 
             /* Add File Size */