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

FiveCo Legacy: Fix raw bytes as UTF-8

This commit is contained in:
João Valverde 2022-10-26 11:55:19 +01:00
parent 62d6fb85c7
commit 8920effd27
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-5co-legacy.c
View File

@ -261,7 +261,6 @@ dissect_FiveCoLegacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
guint8 ucRegAdd, ucRegSize;
guint32 unOffset;
guint32 unSize;
char *string_buf = NULL;
/* Load protocol payload length (including checksum) */
tcp_data_length = tvb_captured_length(tvb);
@ -521,10 +520,7 @@ dissect_FiveCoLegacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
aRegisters[ucRegAdd].nsWsHeaderID,
tvb, i, ucRegSize,
ENC_NA);
string_buf = wmem_alloc(wmem_packet_scope(), (size_t)ucRegSize + 1);
// Get string from tvb with an extra char for null terminaison
tvb_get_raw_bytes_as_string(tvb, i, string_buf, (size_t)ucRegSize + 1);
proto_item_append_text(fiveco_data_item, ": %.16s", string_buf);
proto_item_append_text(fiveco_data_item, ": %s", tvb_format_text(pinfo->pool, tvb, i, ucRegSize));
i += ucRegSize;
}
// else display raw data in hex
@ -650,10 +646,7 @@ dissect_FiveCoLegacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
aRegisters[ucRegAdd].nsWsHeaderID,
tvb, i, ucRegSize,
ENC_NA);
string_buf = wmem_alloc(wmem_packet_scope(), (size_t)ucRegSize + 1);
// Get string from tvb with an extra char for null terminaison
tvb_get_raw_bytes_as_string(tvb, i, string_buf, (size_t)ucRegSize + 1);
proto_item_append_text(fiveco_data_item, ": %.16s", string_buf);
proto_item_append_text(fiveco_data_item, ": %s", tvb_format_text(pinfo->pool, tvb, i, ucRegSize));
i += ucRegSize;
}
// else display raw data in hex
@ -694,9 +687,7 @@ dissect_FiveCoLegacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
break;
case FLASH_AREA_ANSWER:
if ( header_data_length > 1 ) {
string_buf = wmem_alloc(wmem_packet_scope(), header_data_length);
tvb_get_raw_bytes_as_string(tvb, tcp_data_offset, string_buf, header_data_length - 1);
proto_item_append_text(fiveco_data_item, " (%s)", string_buf);
proto_item_append_text(fiveco_data_item, " (%s)", tvb_format_text(pinfo->pool, tvb, tcp_data_offset, header_data_length - 1));
}
break;