diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-06-19 14:25:50 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-06-19 14:25:50 +0000 |
| commit | 7c59ac028086d017ad82498ed1acafcb4ed0c05b (patch) | |
| tree | 3ae269cdea0221ab0ba1f83719ce4da9c71d4ed4 /epan/dissectors/packet-gsm_sms.c | |
| parent | e64ba28e3bac65cb8f4c8e5086b6f1cd590fd3ec (diff) | |
Fix bug #7378: Wireshark 1.8.0rc1: gsm_a_dtap SMS 7-bit default alphabet regression w.r.t. 1.6.8
proto_item_add_string() can be only used with ASCII strings.
svn path=/trunk/; revision=43362
Diffstat (limited to 'epan/dissectors/packet-gsm_sms.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 6aa246bc60..e0a192ac1f 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -2728,9 +2728,9 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb (udl > SMS_MAX_MESSAGE_SIZE ? SMS_MAX_MESSAGE_SIZE : udl), tvb_get_ptr(tvb , offset , length) , messagebuf); messagebuf[out_len] = '\0'; - proto_tree_add_string(subtree, hf_gsm_sms_text, tvb, offset, - length, - gsm_sms_chars_to_utf8(messagebuf, out_len)); + utf8_text = gsm_sms_chars_to_utf8(messagebuf, out_len); + proto_tree_add_string_format_value(subtree, hf_gsm_sms_text, tvb, offset, + length, utf8_text, "%s", utf8_text); } else { @@ -2751,9 +2751,10 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb tvb_get_ptr(sm_tvb, total_sms_len, p_frag_params->length), messagebuf); messagebuf[out_len] = '\0'; - proto_tree_add_string(subtree, hf_gsm_sms_text, sm_tvb, - total_sms_len, p_frag_params->length, - gsm_sms_chars_to_utf8(messagebuf, out_len)); + utf8_text = gsm_sms_chars_to_utf8(messagebuf, out_len); + proto_tree_add_string_format_value(subtree, hf_gsm_sms_text, sm_tvb, + total_sms_len, p_frag_params->length, + utf8_text, "%s", utf8_text); total_sms_len += p_frag_params->length; } |