aboutsummaryrefslogtreecommitdiffstats
path: root/epan/print_stream.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/print_stream.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/print_stream.c')
-rw-r--r--epan/print_stream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/print_stream.c b/epan/print_stream.c
index 3c3cb74092..a694216171 100644
--- a/epan/print_stream.c
+++ b/epan/print_stream.c
@@ -664,7 +664,7 @@ print_stream_text_alloc(gboolean to_file, FILE *fh)
output->color_type = COLOR_NONE;
}
- stream = (print_stream_t *)g_malloc(sizeof (print_stream_t));
+ stream = g_new(print_stream_t, 1);
stream->ops = &print_text_ops;
stream->data = output;
@@ -834,7 +834,7 @@ print_stream_ps_alloc(gboolean to_file, FILE *fh)
output->to_file = to_file;
output->fh = fh;
- stream = (print_stream_t *)g_malloc(sizeof (print_stream_t));
+ stream = g_new(print_stream_t, 1);
stream->ops = &print_ps_ops;
stream->data = output;