From fc0e4e26e641e5b9b1f4a31276b496456f13ad1b Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 26 Jan 2018 23:07:34 +0100 Subject: [PATCH] : Add __alloc_size2() for functions taking number and size. Add it to calloc(). Pointed-out-by: zrj --- include/stdlib.h | 2 +- sys/sys/cdefs.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/stdlib.h b/include/stdlib.h index dfb3877f19..bb4295eb17 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -90,7 +90,7 @@ int atoi(const char *); long atol(const char *); void *bsearch(const void *, const void *, size_t, size_t, int (*)(const void *, const void *)); -void *calloc(size_t, size_t) __malloclike __heedresult; +void *calloc(size_t, size_t) __alloc_size2(1, 2) __malloclike __heedresult; div_t div(int, int) __pure2; void exit(int) __dead2; void free(void *); diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 2b5e31fd75..ef8d227880 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -168,6 +168,7 @@ #define __aligned(x) #define __alloc_align(x) #define __alloc_size(x) +#define __alloc_size2(n, x) #define __section(x) #define __always_inline #define __nonnull(...) @@ -229,9 +230,11 @@ #endif #if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__) -#define __alloc_size(x) __attribute__((__alloc_size__(x))) +#define __alloc_size(x) __attribute__((__alloc_size__(x))) +#define __alloc_size2(n, x) __attribute__((__alloc_size__(n, x))) #else #define __alloc_size(x) +#define __alloc_size2(n, x) #endif #if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__) -- 2.11.4.GIT