mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-03 20:38:59 +00:00
58cf8b69da
The main problem here was that cstdlib was undefining free thereby causing the proper debug macros to not be used. ast_h323.cxx has been changed to call ast_free instead to avoid the issue. A few other issues were addressed: - There were a few instances of functions improperly passing ast_free instead of ast_free_ptr. - Some clean up was done to avoid the debug macros intentionally being redefined. (copied below from Kevin's commit, appreciate the help) - disable astmm.h from doing anything when STANDALONE is defined, which is used by the tools in the utils/ directory that use parts of Asterisk header files in hackish ways; also ensure that utils/extconf.c and utils/conf2ael.c are compiled with STANDALONE defined. (closes issue #13593) Reported by: pj git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
129 lines
3.6 KiB
C
129 lines
3.6 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 1999 - 2006, Digium, Inc.
|
|
*
|
|
* Mark Spencer <markster@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
* \brief Asterisk memory usage debugging
|
|
*/
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef _ASTERISK_ASTMM_H
|
|
#define _ASTERISK_ASTMM_H
|
|
|
|
#ifndef STANDALONE
|
|
|
|
#define __AST_DEBUG_MALLOC
|
|
|
|
#include "asterisk.h"
|
|
|
|
/* Include these now to prevent them from being needed later */
|
|
#include <sys/types.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
|
|
/* Undefine any macros */
|
|
#undef malloc
|
|
#undef calloc
|
|
#undef realloc
|
|
#undef strdup
|
|
#undef strndup
|
|
#undef asprintf
|
|
#undef vasprintf
|
|
#undef free
|
|
|
|
void *__ast_calloc(size_t nmemb, size_t size, const char *file, int lineno, const char *func);
|
|
void *__ast_calloc_cache(size_t nmemb, size_t size, const char *file, int lineno, const char *func);
|
|
void *__ast_malloc(size_t size, const char *file, int lineno, const char *func);
|
|
void __ast_free(void *ptr, const char *file, int lineno, const char *func);
|
|
void *__ast_realloc(void *ptr, size_t size, const char *file, int lineno, const char *func);
|
|
char *__ast_strdup(const char *s, const char *file, int lineno, const char *func);
|
|
char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const char *func);
|
|
int __ast_asprintf(const char *file, int lineno, const char *func, char **strp, const char *format, ...)
|
|
__attribute__((format(printf, 5, 6)));
|
|
int __ast_vasprintf(char **strp, const char *format, va_list ap, const char *file, int lineno, const char *func)
|
|
__attribute__((format(printf, 2, 0)));
|
|
void __ast_mm_init(void);
|
|
|
|
|
|
/* Provide our own definitions */
|
|
#define calloc(a,b) \
|
|
__ast_calloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_calloc(a,b) \
|
|
__ast_calloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_calloc_cache(a,b) \
|
|
__ast_calloc_cache(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define malloc(a) \
|
|
__ast_malloc(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_malloc(a) \
|
|
__ast_malloc(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define free(a) \
|
|
__ast_free(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_free(a) \
|
|
__ast_free(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define realloc(a,b) \
|
|
__ast_realloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_realloc(a,b) \
|
|
__ast_realloc(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define strdup(a) \
|
|
__ast_strdup(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_strdup(a) \
|
|
__ast_strdup(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define strndup(a,b) \
|
|
__ast_strndup(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_strndup(a,b) \
|
|
__ast_strndup(a,b,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define asprintf(a, b, c...) \
|
|
__ast_asprintf(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, b, c)
|
|
|
|
#define ast_asprintf(a, b, c...) \
|
|
__ast_asprintf(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, b, c)
|
|
|
|
#define vasprintf(a,b,c) \
|
|
__ast_vasprintf(a,b,c,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#define ast_vasprintf(a,b,c) \
|
|
__ast_vasprintf(a,b,c,__FILE__, __LINE__, __PRETTY_FUNCTION__)
|
|
|
|
#endif /* !STANDALONE */
|
|
|
|
#else
|
|
#error "NEVER INCLUDE astmm.h DIRECTLY!!"
|
|
#endif /* _ASTERISK_ASTMM_H */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|