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 /wiretap/netmon.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 'wiretap/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index d15deaf068..d30c6176c7 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -464,7 +464,7 @@ wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info) /* This is a netmon file */ wth->file_type_subtype = file_type; - netmon = (netmon_t *)g_malloc0(sizeof(netmon_t)); + netmon = g_new0(netmon_t, 1); wth->priv = (void *)netmon; wth->subtype_read = netmon_read; wth->subtype_seek_read = netmon_seek_read; @@ -1633,7 +1633,7 @@ gboolean netmon_dump_open(wtap_dumper *wdh, int *err, gchar **err_info _U_) wdh->subtype_write = netmon_dump; wdh->subtype_finish = netmon_dump_finish; - netmon = (netmon_dump_t *)g_malloc(sizeof(netmon_dump_t)); + netmon = g_new(netmon_dump_t, 1); wdh->priv = (void *)netmon; netmon->frame_table_offset = CAPTUREFILE_HEADER_SIZE; netmon->got_first_record_time = FALSE; |