aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@honeywell.com>2015-06-11 22:30:58 -0700
committerPascal Quantin <pascal.quantin@gmail.com>2015-06-11 17:35:06 +0000
commit74421b35c2c79fddd0c596a609b997e80e5570cc (patch)
treee4217e0fd952cf5efa6e3f6960e7f34e901c1766
parentf0c0081673726d4f45ae5833a2f4aa6e447af447 (diff)
AMQP 1.0: 'char' should be 4-bytes UTF32
Change-Id: I219b65fd989e1811eda9e2b7197148e6b22ef97a Reviewed-on: https://code.wireshark.org/review/8887 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r--epan/dissectors/packet-amqp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 0185cb2a9f..097509618d 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -10950,8 +10950,9 @@ format_amqp_1_0_char(tvbuff_t *tvb,
guint offset, guint bound _U_, guint length _U_,
const char **value)
{
- *value = tvb_format_text(tvb, offset, 1);
- return 1;
+ /* one UTF-32BE encoded Unicode character */
+ *value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_UCS_4|ENC_BIG_ENDIAN);
+ return 4;
}
static int