osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Strings in the CUPS browsing protocol are UTF-8. 

Change-Id: I594a22acf9202f7b7ca2e4ee3c58c308c2cd7019
Reviewed-on: https://code.wireshark.org/review/33390
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2019-05-27 17:43:23 -07:00
parent c5fdbc5644
commit 1d88e9b25f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-cups.c
View File

@ -261,7 +261,7 @@ get_quoted_string(tvbuff_t *tvb, gint offset, gint *next_offset, guint *len)
if (o != -1) {
offset++;
l = o - offset;
s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_ASCII);
s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_UTF_8);
offset = o + 1;
}
}
@ -282,7 +282,7 @@ get_unquoted_string(tvbuff_t *tvb, gint offset, gint *next_offset, guint *len)
o = tvb_ws_mempbrk_pattern_guint8(tvb, offset, -1, &pbrk_whitespace, NULL);
if (o != -1) {
l = o - offset;
s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_ASCII);
s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_UTF_8);
offset = o;
}
@ -359,16 +359,16 @@ proto_register_cups(void)
{ "State", "cups.state", FT_UINT8, BASE_HEX,
VALS(cups_state_values), 0x0, NULL, HFILL }},
{ &hf_cups_uri,
{ "URI", "cups.uri", FT_STRING, BASE_NONE,
{ "URI", "cups.uri", FT_STRING, STR_UNICODE,
NULL, 0x0, NULL, HFILL }},
{ &hf_cups_location,
{ "Location", "cups.location", FT_STRING, BASE_NONE,
{ "Location", "cups.location", FT_STRING, STR_UNICODE,
NULL, 0x0, NULL, HFILL }},
{ &hf_cups_information,
{ "Information", "cups.information", FT_STRING, BASE_NONE,
{ "Information", "cups.information", FT_STRING, STR_UNICODE,
NULL, 0x0, NULL, HFILL }},
{ &hf_cups_make_model,
{ "Make and model", "cups.make_model", FT_STRING, BASE_NONE,
{ "Make and model", "cups.make_model", FT_STRING, STR_UNICODE,
NULL, 0x0, NULL, HFILL }},
};