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

epan: more work to avoid global memory pool 

A few helpers weren't in exception-throwing paths and can just free
unscoped memory. The macro in proto.c is only used in contexts with a
tree, so just use the tree's scope there.
This commit is contained in:
Evan Huus 2021-09-08 11:14:30 -04:00 committed by Wireshark GitLab Utility
parent 197b67cf8c
commit bb1286dc3c
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/proto.c
View File

@ -6179,7 +6179,7 @@ get_full_length(header_field_info *hfinfo, tvbuff_t *tvb, const gint start,
if (length == -1) {
/* This can throw an exception */
/* XXX - do this without fetching the string? */
tvb_get_stringz_enc(wmem_packet_scope(), tvb, start, &length, encoding);
wmem_free(NULL, tvb_get_stringz_enc(NULL, tvb, start, &length, encoding));
}
item_length = length;
break;
@ -12692,9 +12692,9 @@ proto_tree_add_bits_format_value(proto_tree *tree, const int hfindex,
return item;
}
#define CREATE_VALUE_STRING(dst,format,ap) \
#define CREATE_VALUE_STRING(tree,dst,format,ap) \
va_start(ap, format); \
dst = wmem_strdup_vprintf(wmem_packet_scope(), format, ap); \
dst = wmem_strdup_vprintf(PNODE_POOL(tree), format, ap); \
va_end(ap);
proto_item *
@ -12725,7 +12725,7 @@ proto_tree_add_uint_bits_format_value(proto_tree *tree, const int hfindex,
break;
}
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}
@ -12758,7 +12758,7 @@ proto_tree_add_uint64_bits_format_value(proto_tree *tree, const int hfindex,
break;
}
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}
@ -12779,7 +12779,7 @@ proto_tree_add_float_bits_format_value(proto_tree *tree, const int hfindex,
DISSECTOR_ASSERT_FIELD_TYPE(hf_field, FT_FLOAT);
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}
@ -12812,7 +12812,7 @@ proto_tree_add_int_bits_format_value(proto_tree *tree, const int hfindex,
break;
}
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}
@ -12845,7 +12845,7 @@ proto_tree_add_int64_bits_format_value(proto_tree *tree, const int hfindex,
break;
}
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}
@ -12866,7 +12866,7 @@ proto_tree_add_boolean_bits_format_value(proto_tree *tree, const int hfindex,
DISSECTOR_ASSERT_FIELD_TYPE(hf_field, FT_BOOLEAN);
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}
@ -12887,7 +12887,7 @@ proto_tree_add_boolean_bits_format_value64(proto_tree *tree, const int hfindex,
DISSECTOR_ASSERT_FIELD_TYPE(hf_field, FT_BOOLEAN);
CREATE_VALUE_STRING(dst, format, ap);
CREATE_VALUE_STRING(tree, dst, format, ap);
return proto_tree_add_bits_format_value(tree, hfindex, tvb, bit_offset, no_of_bits, &value, dst);
}

14
epan/tvbuff_base64.c
View File

@ -184,10 +184,13 @@ tvbuff_t*
base64_tvb_to_new_tvb(tvbuff_t* parent, int offset, int length)
{
tvbuff_t* tvb;
char* data;
char* data, *tmp;
gsize len;
data = g_base64_decode(tvb_get_string_enc(wmem_packet_scope(), parent, offset, length, ENC_ASCII), &len);
tmp = tvb_get_string_enc(NULL, parent, offset, length, ENC_ASCII);
data = g_base64_decode(tmp, &len);
wmem_free(NULL, tmp);
tvb = tvb_new_child_real_data(parent, (const guint8*)data, (gint)len, (gint)len);
tvb_set_free_cb(tvb, g_free);
@ -199,10 +202,13 @@ tvbuff_t*
base64uri_tvb_to_new_tvb(tvbuff_t* parent, int offset, int length)
{
tvbuff_t* tvb;
char* data;
char* data, *tmp;
gsize len = 0;
data = g_base64uri_decode(tvb_get_string_enc(wmem_packet_scope(), parent, offset, length, ENC_ASCII), &len);
tmp = tvb_get_string_enc(NULL, parent, offset, length, ENC_ASCII);
data = g_base64uri_decode(tmp, &len);
wmem_free(NULL, tmp);
tvb = tvb_new_child_real_data(parent, (const guint8*)data, (gint)len, (gint)len);
tvb_set_free_cb(tvb, g_free);