diff options
| author | novakji <j.novak@netsystem.cz> | 2016-11-12 21:16:53 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-13 01:38:15 +0000 |
| commit | 5b348a48e5b240f703f400be3161fd4bc3caa56e (patch) | |
| tree | c77a7b2b2cbd2ca85b8848160a2b5021affc3544 | |
| parent | efe95fa8fd79d4c087ce587143c000dd61218bc0 (diff) | |
| download | wireshark-5b348a48e5b240f703f400be3161fd4bc3caa56e.tar.gz | |
Allocate transport_info->encoding_name from correct memory pool
Bug: 13127
Change-Id: I09893fadc6f64316a373ddb8ac72e07a6743e149
Reviewed-on: https://code.wireshark.org/review/18758
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-sdp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 42027193f1..befdb9fd55 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1402,7 +1402,8 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto return; /* Invalid */ } - transport_info->encoding_name[pt] = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); + /* String is file scope allocated because transport_info is connection related */ + transport_info->encoding_name[pt] = (char*)tvb_get_string_enc(wmem_file_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); next_offset = next_offset + 1; offset = next_offset; @@ -1947,7 +1948,8 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex transport_info->media_count = -1; for (n = 0; n < SDP_NO_OF_PT; n++) { - transport_info->encoding_name[n] = wmem_strdup(wmem_packet_scope(), UNKNOWN_ENCODING); + /* String is file scope allocated because transport_info is connection related */ + transport_info->encoding_name[n] = wmem_strdup(wmem_file_scope(), UNKNOWN_ENCODING); } for (n = 0; n < SDP_MAX_RTP_CHANNELS; n++) { transport_info->media[n].rtp_dyn_payload = rtp_dyn_payload_new(); |