kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crashes with MALLOC_DEBUG enabled that were a result of my recent thread

Browse Source 
storage changes (fixes issue #7595)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38286 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-07-27 01:49:57 +00:00
parent a43a350c3e
commit 7b8d8c9bb5
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channel.c
View File

@@ -160,6 +160,14 @@ const struct ast_cause {
{ AST_CAUSE_INTERWORKING, "INTERWORKING", "Interworking, unspecified" }, { AST_CAUSE_INTERWORKING, "INTERWORKING", "Interworking, unspecified" },
}; };
#ifdef __AST_DEBUG_MALLOC
static void FREE(void *ptr)
{
free(ptr);
}
#else
#define FREE free
#endif
struct ast_variable *ast_channeltype_list(void) struct ast_variable *ast_channeltype_list(void)
{ {
@@ -487,7 +495,7 @@ int ast_str2cause(const char *name)
static void state2str_buf_key_create(void) static void state2str_buf_key_create(void)
{ {
pthread_key_create(&state2str_buf_key, free); pthread_key_create(&state2str_buf_key, FREE);
} }
/*! \brief Gives the string form of a given channel state */ /*! \brief Gives the string form of a given channel state */

11
cli.c
View File

@@ -57,9 +57,18 @@ static pthread_once_t ast_cli_buf_once = PTHREAD_ONCE_INIT;
/*! \brief Initial buffer size for resulting strings in ast_cli() */ /*! \brief Initial buffer size for resulting strings in ast_cli() */
#define AST_CLI_MAXSTRLEN 256 #define AST_CLI_MAXSTRLEN 256
#ifdef __AST_DEBUG_MALLOC
static void FREE(void *ptr)
{
free(ptr);
}
#else
#define FREE free
#endif
static void ast_cli_buf_key_create(void) static void ast_cli_buf_key_create(void)
{ {
pthread_key_create(&ast_cli_buf_key, free); pthread_key_create(&ast_cli_buf_key, FREE);
} }
void ast_cli(int fd, char *fmt, ...) void ast_cli(int fd, char *fmt, ...)

11
utils.c
View File

@@ -65,6 +65,15 @@ static char b2a[256];
static pthread_key_t inet_ntoa_buf_key; static pthread_key_t inet_ntoa_buf_key;
static pthread_once_t inet_ntoa_buf_once = PTHREAD_ONCE_INIT; static pthread_once_t inet_ntoa_buf_once = PTHREAD_ONCE_INIT;
#ifdef __AST_DEBUG_MALLOC
static void FREE(void *ptr)
{
free(ptr);
}
#else
#define FREE free
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__)
#define ERANGE 34 /*!< duh? ERANGE value copied from web... */ #define ERANGE 34 /*!< duh? ERANGE value copied from web... */
@@ -488,7 +497,7 @@ void ast_uri_decode(char *s)
static void inet_ntoa_buf_key_create(void) static void inet_ntoa_buf_key_create(void)
{ {
pthread_key_create(&inet_ntoa_buf_key, free); pthread_key_create(&inet_ntoa_buf_key, FREE);
} }
/*! \brief ast_inet_ntoa: Recursive thread safe replacement of inet_ntoa */ /*! \brief ast_inet_ntoa: Recursive thread safe replacement of inet_ntoa */