diff options
| author | Moshe Kaplan <me@moshekaplan.com> | 2020-12-20 21:30:28 -0500 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2020-12-22 14:56:38 +0000 |
| commit | e16166a74cca1d66e2c302e257cf94aebb380599 (patch) | |
| tree | 8834b4b8390fca83dd7bc1b4b9e6a7bb276e1d7e /epan/dissectors/packet-dbus.c | |
| parent | 7b27b444cbd94853b399da770e0dad4b91ef23ac (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/dissectors/packet-dbus.c')
| -rw-r--r-- | epan/dissectors/packet-dbus.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index 4fd951c90f..a6a3d33fa7 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -698,8 +698,7 @@ reader_next(dbus_type_reader_t *reader, int hf, int ett, dbus_val_t *value) { is_single_complete_type = TRUE; } else if (array_len <= DBUS_MAX_ARRAY_LEN) { int end_offset = ptvcursor_current_offset(packet->cursor) + array_len; - dbus_type_reader_t *child = (dbus_type_reader_t *)wmem_alloc( - wmem_packet_scope(), sizeof(dbus_type_reader_t)); + dbus_type_reader_t *child = wmem_new(wmem_packet_scope(), dbus_type_reader_t); *child = (dbus_type_reader_t){ .packet = reader->packet, .signature = reader->signature, @@ -722,8 +721,7 @@ reader_next(dbus_type_reader_t *reader, int hf, int ett, dbus_val_t *value) { is_single_complete_type = FALSE; ptvcursor_add_with_subtree(packet->cursor, hf != -1 ? hf : hf_dbus_type_struct, SUBTREE_UNDEFINED_LENGTH, ENC_NA, ett != -1 ? ett : ett_dbus_type_struct); - dbus_type_reader_t *child = (dbus_type_reader_t *)wmem_alloc( - wmem_packet_scope(), sizeof(dbus_type_reader_t)); + dbus_type_reader_t *child = wmem_new(wmem_packet_scope(), dbus_type_reader_t); *child = (dbus_type_reader_t){ .packet = reader->packet, .signature = reader->signature, @@ -742,8 +740,7 @@ reader_next(dbus_type_reader_t *reader, int hf, int ett, dbus_val_t *value) { const char *variant_signature = add_dbus_string(packet, hf_dbus_type_variant_signature, 1); value->string = variant_signature; if (variant_signature && is_dbus_signature_valid(variant_signature)) { - dbus_type_reader_t *child = (dbus_type_reader_t *)wmem_alloc( - wmem_packet_scope(), sizeof(dbus_type_reader_t)); + dbus_type_reader_t *child = wmem_new(wmem_packet_scope(), dbus_type_reader_t); *child = (dbus_type_reader_t){ .packet = reader->packet, .signature = variant_signature, @@ -770,8 +767,7 @@ reader_next(dbus_type_reader_t *reader, int hf, int ett, dbus_val_t *value) { proto_item *dict_entry = ptvcursor_add_with_subtree(packet->cursor, hf != -1 ? hf : hf_dbus_type_dict_entry, SUBTREE_UNDEFINED_LENGTH, ENC_NA, ett != -1 ? ett : ett_dbus_type_dict_entry); - dbus_type_reader_t *child = (dbus_type_reader_t *)wmem_alloc( - wmem_packet_scope(), sizeof(dbus_type_reader_t)); + dbus_type_reader_t *child = wmem_new(wmem_packet_scope(), dbus_type_reader_t); *child = (dbus_type_reader_t){ .packet = reader->packet, .signature = reader->signature, |