aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-05-24 19:32:46 -0700
committerGuy Harris <guy@alum.mit.edu>2019-05-25 02:34:00 +0000
commit2114dba1effebba50cdb611b2650b0a4a37761e4 (patch)
tree2e3cdde770a34f0d75921e256d361e61a680779d
parentcf89939a1966c37348ca14620c0afa9ca3a23c01 (diff)
*Little-endian* UTF-16.
ENC_UTF_16 does *not* go with ENC_NA; ENC_NA is for cases where the byte order is "not applicable", such as a 1-byte number or a character encoding where every character is encoded in 1 byte, but UTF-16 isn't one of those cases, as a character is encoded in either 1 or 2 2-byte values. This being a Windows thing, the byte order is little-endian. Change-Id: Iab0db3fa2c5d2c25be209e4ed0ebd57827edbcd8 Reviewed-on: https://code.wireshark.org/review/33347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-tnef.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index 018b6f7273..3d68ea8810 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -419,7 +419,7 @@ static void dissect_mapiprops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
offset = dissect_counted_values(tvb, offset, hf_tnef_PropValue_bin, pinfo, prop_tree, TRUE, ENC_NA);
break;
case PT_UNICODE:
- offset = dissect_counted_values (tvb, offset, hf_tnef_PropValue_lpszW, pinfo, prop_tree, TRUE, ENC_UTF_16|ENC_NA);
+ offset = dissect_counted_values (tvb, offset, hf_tnef_PropValue_lpszW, pinfo, prop_tree, TRUE, ENC_UTF_16|ENC_LITTLE_ENDIAN);
break;
case PT_CLSID:
offset = nspi_dissect_struct_MAPIUID(tvb, offset, pinfo, prop_tree, &di, drep, hf_tnef_PropValue_lpguid, 0);