From dc738b145fe17a8e40a3e95f01f7b9c208185cd9 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Tue, 13 Mar 2018 17:37:12 -0400 Subject: [PATCH] core: Remove incorrect usage of attribute_malloc. GCC documentation states that when __attribute__((malloc)) is used it should not return storage which contains any valid pointers. It specifically mentions that realloc functions should not have the malloc attribute, but this also means that complex initializers which could contain initialized pointers should not use this attribute. Change-Id: If507f33ffb3ca3b83b702196eb0e8215d27fc7d2 --- include/asterisk/channel.h | 4 ++-- include/asterisk/datastore.h | 2 +- include/asterisk/stringfields.h | 2 +- include/asterisk/utils.h | 2 +- main/channel.c | 2 +- utils/extconf.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 393c020fc9..7b406e52bd 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1098,7 +1098,7 @@ enum ama_flags { * \deprecated You should use the ast_datastore_alloc() generic function instead. * \version 1.6.1 deprecated */ -struct ast_datastore * attribute_malloc ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid) +struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid) __attribute__((deprecated)); /*! @@ -1157,7 +1157,7 @@ struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const * and "default" context. * \note Since 12.0.0 this function returns with the newly created channel locked. */ -struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 16))) +struct ast_channel * __attribute__((format(printf, 15, 16))) __ast_channel_alloc(int needqueue, int state, const char *cid_num, const char *cid_name, const char *acctcode, const char *exten, const char *context, const struct ast_assigned_ids *assignedids, diff --git a/include/asterisk/datastore.h b/include/asterisk/datastore.h index 8f59fd3cf7..e920fc0b83 100644 --- a/include/asterisk/datastore.h +++ b/include/asterisk/datastore.h @@ -80,7 +80,7 @@ struct ast_datastore { * \param file, line, function * \version 1.6.1 moved here and renamed from ast_channel_datastore_alloc */ -struct ast_datastore * attribute_malloc __ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid, +struct ast_datastore *__ast_datastore_alloc(const struct ast_datastore_info *info, const char *uid, const char *file, int line, const char *function); #define ast_datastore_alloc(info, uid) __ast_datastore_alloc(info, uid, __FILE__, __LINE__, __PRETTY_FUNCTION__) diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h index 0e0d20acaf..81575ac2df 100644 --- a/include/asterisk/stringfields.h +++ b/include/asterisk/stringfields.h @@ -443,7 +443,7 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr, struct ast_string_ * \internal * \brief internal version of ast_calloc_with_stringfields */ -void * attribute_malloc __ast_calloc_with_stringfields(unsigned int num_structs, +void *__ast_calloc_with_stringfields(unsigned int num_structs, size_t struct_size, size_t field_mgr_offset, size_t field_mgr_pool_offset, size_t pool_size, const char *file, int lineno, const char *func); diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 876e53c293..290f7a30e3 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -610,7 +610,7 @@ void * attribute_malloc _ast_calloc(size_t num, size_t len, const char *file, in _ast_realloc((p), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -void * attribute_malloc _ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func), +void *_ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func), { void *newp; diff --git a/main/channel.c b/main/channel.c index 48963c7292..70e0bff8d5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -790,7 +790,7 @@ static int does_id_conflict(const char *uniqueid) } /*! \brief Create a new channel structure */ -static struct ast_channel * attribute_malloc __attribute__((format(printf, 15, 0))) +static struct ast_channel *__attribute__((format(printf, 15, 0))) __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char *cid_name, const char *acctcode, const char *exten, const char *context, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, enum ama_flags amaflag, struct ast_endpoint *endpoint, diff --git a/utils/extconf.c b/utils/extconf.c index 690d06e7c6..97cfaa9a68 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -816,7 +816,7 @@ void * attribute_malloc _ast_calloc(size_t num, size_t len, const char *file, in _ast_realloc((p), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__) AST_INLINE_API( -void * attribute_malloc _ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func), +void *_ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func), { void *newp; -- 2.47.2