diff options
Diffstat (limited to 'epan/dissectors/packet-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 6783402575..6ba3e1b453 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -593,7 +593,7 @@ static gboolean verify_control_frame_crc(tvbuff_t * tvb, packet_info * pinfo, pr guint8 crc = 0; guint8 * data = NULL; /* Get data. */ - data = tvb_get_ephemeral_string(tvb, 0, tvb_length(tvb)); + data = tvb_get_string(wmem_packet_scope(), tvb, 0, tvb_length(tvb)); /* Include only FT flag bit in CRC calculation. */ data[0] = data[0] & 1; /* Calculate crc7 sum. */ @@ -613,7 +613,7 @@ static gboolean verify_header_crc(tvbuff_t * tvb, packet_info * pinfo, proto_ite guint8 crc = 0; guint8 * data = NULL; /* Get data of header with first byte removed. */ - data = tvb_get_ephemeral_string(tvb, 1, header_length-1); + data = tvb_get_string(wmem_packet_scope(), tvb, 1, header_length-1); /* Calculate crc7 sum. */ crc = crc7update(0, data, header_length-1); crc = crc7finalize(crc); /* finalize crc */ @@ -633,7 +633,7 @@ static gboolean verify_header_crc_edch(tvbuff_t * tvb, packet_info * pinfo, prot /* First create new subset of header with first byte removed. */ tvbuff_t * headtvb = tvb_new_subset(tvb, 1, header_length-1, header_length-1); /* Get data of header with first byte removed. */ - data = tvb_get_ephemeral_string(headtvb, 0, header_length-1); + data = tvb_get_string(wmem_packet_scope(), headtvb, 0, header_length-1); /* Remove first 4 bits of the remaining data which are Header CRC cont. */ data[0] = data[0] & 0x0f; crc = crc11_307_noreflect_noxor(data, header_length-1); @@ -980,7 +980,7 @@ dissect_spare_extension_and_crc(tvbuff_t *tvb, packet_info *pinfo, ENC_BIG_ENDIAN); if (preferences_payload_checksum) { guint16 calc_crc, read_crc; - guint8 * data = tvb_get_ephemeral_string(tvb, header_length, offset-header_length); + guint8 * data = tvb_get_string(wmem_packet_scope(), tvb, header_length, offset-header_length); calc_crc = crc16_8005_noreflect_noxor(data, offset-header_length); read_crc = tvb_get_bits16(tvb, offset*8, 16, FALSE); @@ -3753,7 +3753,7 @@ heur_dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data * with the corresponding generator polynomial: G(D) = D7+D6+D2+1. See subclause 7.2. */ length = tvb_length(tvb); - buf = (unsigned char *)ep_tvb_memdup(tvb, 0, length); + buf = (unsigned char *)tvb_memdup(wmem_packet_scope(), tvb, 0, length); buf[0] = 01; calc_crc = crc7update(calc_crc, buf, length); |