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

dvb_chartbl: remove wmem_packet_scope 

Short-circuit on a null tree, so that we can reliably use
PNODE_POOL(tree) for a memory pool instead of the global packet scope.
This commit is contained in:
Evan Huus 2021-09-07 09:56:31 -04:00 committed by Wireshark GitLab Utility
parent d5a3824f54
commit 36f9bb412b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dvb_chartbl.c
View File

@ -269,6 +269,9 @@ void
dvb_add_chartbl(proto_tree *tree, int hf,
tvbuff_t *tvb, gint offset, gint length, dvb_encoding_e encoding)
{
if (tree == NULL)
return;
if (length==0) {
proto_item *pi;
@ -280,7 +283,7 @@ dvb_add_chartbl(proto_tree *tree, int hf,
proto_tree_add_bytes_format_value(tree, hf,
tvb, offset, length, NULL, "%s (%s)",
val_to_str_const(encoding, dvb_string_encoding_vals, "Unknown"),
tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, length, ' '));
tvb_bytes_to_str_punct(PNODE_POOL(tree), tvb, offset, length, ' '));
}
}