From 2411eae9edb562e80c45962c74945238a94e5d3b Mon Sep 17 00:00:00 2001 From: George Hopkins Date: Wed, 2 Sep 2020 12:05:25 +0200 Subject: multipart: fix deallocation of invalid parts Fixes #16741 --- epan/dissectors/packet-multipart.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index 2e2bf7f9b6..e1cb045248 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -339,14 +339,13 @@ get_multipart_info(packet_info *pinfo, http_message_info_t *message_info) parameters = unfold_and_compact_mime_header(message_info->media_str, &dummy); start_boundary = ws_find_media_type_parameter(wmem_packet_scope(), parameters, "boundary"); - - if(!start_boundary) { + if (!start_boundary) { return NULL; } - if(strncmp(type, "multipart/encrypted", sizeof("multipart/encrypted")-1) == 0) { + + if (strncmp(type, "multipart/encrypted", sizeof("multipart/encrypted") - 1) == 0) { start_protocol = ws_find_media_type_parameter(wmem_packet_scope(), parameters, "protocol"); - if(!start_protocol) { - g_free(start_boundary); + if (!start_protocol) { return NULL; } } -- cgit v1.2.3