From fb7f1823da621ed11531f1b3283760c1102fc675 Mon Sep 17 00:00:00 2001 From: Uli Heilmeier Date: Mon, 24 Jan 2022 21:59:58 +0100 Subject: [PATCH] 5co: Fix failed assertion Check length before calling tvb_get_raw_bytes_as_string() Related to #17890 --- epan/dissectors/packet-5co-legacy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-5co-legacy.c b/epan/dissectors/packet-5co-legacy.c index 54c9c75410..0f529c5366 100644 --- a/epan/dissectors/packet-5co-legacy.c +++ b/epan/dissectors/packet-5co-legacy.c @@ -693,9 +693,11 @@ dissect_FiveCoLegacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * " (%d bytes to load into flash at offset %d)", unSize, unOffset); break; case FLASH_AREA_ANSWER: - 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); + 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); + } break; case WRITE_REGISTER_ANSWER: