summaryrefslogtreecommitdiff
path: root/scripts/coccinelle/calloc.cocci
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/coccinelle/calloc.cocci')
-rw-r--r--scripts/coccinelle/calloc.cocci15
1 files changed, 9 insertions, 6 deletions
diff --git a/scripts/coccinelle/calloc.cocci b/scripts/coccinelle/calloc.cocci
index 8a295eb4fd..fbda88e538 100644
--- a/scripts/coccinelle/calloc.cocci
+++ b/scripts/coccinelle/calloc.cocci
@@ -1,16 +1,19 @@
// Use calloc or realloc as appropriate instead of multiply-and-alloc
@malloc_to_calloc@
-expression a,b;
+identifier f =~ "(tor_malloc|tor_malloc_zero)";
+expression a;
+constant b;
@@
-- tor_malloc(a * b)
+- f(a * b)
+ tor_calloc(a, b)
-@malloc_zero_to_calloc@
-expression a, b;
+@calloc_arg_order@
+expression a;
+type t;
@@
-- tor_malloc_zero(a * b)
-+ tor_calloc(a, b)
+- tor_calloc(sizeof(t), a)
++ tor_calloc(a, sizeof(t))
@realloc_to_reallocarray@
expression a, b;