aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto_data.c
diff options
context:
space:
mode:
authorMoshe Kaplan <me@moshekaplan.com>2020-12-20 21:30:28 -0500
committerAndersBroman <a.broman58@gmail.com>2020-12-22 14:56:38 +0000
commite16166a74cca1d66e2c302e257cf94aebb380599 (patch)
tree8834b4b8390fca83dd7bc1b4b9e6a7bb276e1d7e /epan/proto_data.c
parent7b27b444cbd94853b399da770e0dad4b91ef23ac (diff)
Detect and replace bad allocation patterns
Adds a pre-commit hook for detecting and replacing occurrences of `g_malloc()` and `wmem_alloc()` with `g_new()` and `wmem_new()`, to improve the readability of Wireshark's code, and occurrences of `g_malloc(sizeof(struct myobj) * foo)` with `g_new(struct myobj, foo)` to prevent integer overflows Also fixes all existing occurrences across the codebase.
Diffstat (limited to 'epan/proto_data.c')
-rw-r--r--epan/proto_data.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/proto_data.c b/epan/proto_data.c
index 946a4795cb..5a851fab29 100644
--- a/epan/proto_data.c
+++ b/epan/proto_data.c
@@ -72,7 +72,7 @@ p_add_proto_data(wmem_allocator_t *tmp_scope, struct _packet_info* pinfo, int pr
DISSECTOR_ASSERT(!"invalid wmem scope");
}
- p1 = (proto_data_t *)wmem_alloc(scope, sizeof(proto_data_t));
+ p1 = wmem_new(scope, proto_data_t);
p1->proto = proto;
p1->key = key;