diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h
index feb9c7eda31cea5ebc75121dafbfc108e029b053..efaac4887270ec60251dd7b4a61be13e2dafd4b4 100644
--- a/include/asterisk/logger.h
+++ b/include/asterisk/logger.h
@@ -62,6 +62,17 @@ extern "C" {
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
__attribute__((format(printf, 5, 6)));
+/*!
+ * \brief Used for sending a log message with protection against recursion.
+ *
+ * \note This function should be used by all error messages that might be directly
+ * or indirectly caused by logging.
+ *
+ * \see ast_log for documentation on the parameters.
+ */
+void ast_log_safe(int level, const char *file, int line, const char *function, const char *fmt, ...)
+ __attribute__((format(printf, 5, 6)));
+
/* XXX needs documentation */
typedef unsigned int ast_callid;
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h
index e3ece8b67fad912e2b4f120dbbcba50c51c43410..4d587a5c7b7fca2177d0c83ec40c5cf979b35763 100644
--- a/include/asterisk/threadstorage.h
+++ b/include/asterisk/threadstorage.h
@@ -84,6 +84,8 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len
AST_THREADSTORAGE_CUSTOM_SCOPE(name, NULL, ast_free_ptr,)
#define AST_THREADSTORAGE_EXTERNAL(name) \
extern struct ast_threadstorage name
+#define AST_THREADSTORAGE_RAW(name) \
+ AST_THREADSTORAGE_CUSTOM_SCOPE(name, NULL, NULL,)
/*!
* \brief Define a thread storage variable, with custom initialization and cleanup
@@ -216,4 +218,42 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co
#define ast_threadstorage_get(ts, init_size) __ast_threadstorage_get(ts, init_size, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#endif /* defined(DEBUG_THREADLOCALS) */
+/*!
+ * \brief Retrieve a raw pointer from threadstorage.
+ * \param ts Threadstorage object to operate on.
+ *
+ * \return A pointer associated with the current thread, NULL
+ * if no pointer is associated yet.
+ *
+ * \note This should only be used on threadstorage declared
+ * by AST_THREADSTORAGE_RAW unless you really know what
+ * you are doing.
+ */
+AST_INLINE_API(
+void *ast_threadstorage_get_ptr(struct ast_threadstorage *ts),
+{
+ pthread_once(&ts->once, ts->key_init);
+ return pthread_getspecific(ts->key);
+}
+)
+
+/*!
+ * \brief Set a raw pointer from threadstorage.
+ * \param ts Threadstorage object to operate on.
+ *
+ * \retval 0 Success
+ * \retval non-zero Failure
+ *
+ * \note This should only be used on threadstorage declared
+ * by AST_THREADSTORAGE_RAW unless you really know what
+ * you are doing.
+ */
+AST_INLINE_API(
+int ast_threadstorage_set_ptr(struct ast_threadstorage *ts, void *ptr),
+{
+ pthread_once(&ts->once, ts->key_init);
+ return pthread_setspecific(ts->key, ptr);
+}
+)
+
#endif /* ASTERISK_THREADSTORAGE_H */
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index e4c4c8bea17c8f3f8613f36f5efd80e17236b7ac..e48ca02c0bc502118cfe2410a21ace63a4913f54 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -25,7 +25,6 @@
#include "asterisk/network.h"
-#include <execinfo.h>
#include <time.h> /* we want to override localtime_r */
#include <unistd.h>
#include <string.h>
@@ -526,26 +525,8 @@ long int ast_random(void);
#define ast_free free
#define ast_free_ptr ast_free
-/*
- * This buffer is in static memory. We never intend to read it,
- * nor do we care about multiple threads writing to it at the
- * same time. We only want to know if we're recursing too deep
- * already. 60 entries should be more than enough. Function
- * call depth rarely exceeds 20 or so.
- */
-#define _AST_MEM_BACKTRACE_BUFLEN 60
-extern void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
-
-/*
- * Ok, this sucks. But if we're already out of mem, we don't
- * want the logger to create infinite recursion (and a crash).
- */
#define MALLOC_FAILURE_MSG \
- do { \
- if (backtrace(_ast_mem_backtrace_buffer, _AST_MEM_BACKTRACE_BUFLEN) < _AST_MEM_BACKTRACE_BUFLEN) { \
- ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file); \
- } \
- } while (0)
+ ast_log_safe(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file)
/*!
* \brief A wrapper for malloc()
diff --git a/main/astobj2.c b/main/astobj2.c
index 4ee1734da73c52750c7c85f99623cf823126b017..f1d5001748bd3635811fb22f3ca19d180d6460f6 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -36,6 +36,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cli.h"
#include "asterisk/paths.h"
+/* Use ast_log_safe in place of ast_log. */
+#define ast_log ast_log_safe
+
static FILE *ref_log;
/*!
diff --git a/main/hashtab.c b/main/hashtab.c
index 4f52ec520060b31bd321ec186326e109e1bb0226..a35af6718f746905ce39749d5180401ea3c253ba 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -44,10 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/hashtab.h"
-#ifndef __AST_DEBUG_MALLOC
-void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
-#endif
-
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
static void _ast_hashtab_resize(struct ast_hashtab *tab, const char *file, int lineno, const char *func);
#define ast_hashtab_resize(a) _ast_hashtab_resize(a,__FILE__, __LINE__, __PRETTY_FUNCTION__)
diff --git a/main/logger.c b/main/logger.c
index 90fb7f2c06e643cd3b077882c9975983a1a2b8ed..29122b514c264d0cb443a223942ec7988f011e1b 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -102,6 +102,7 @@ static struct {
} logfiles = { 1 };
static char hostname[MAXHOSTNAMELEN];
+AST_THREADSTORAGE_RAW(in_safe_log);
enum logtypes {
LOGTYPE_SYSLOG,
@@ -1719,6 +1720,32 @@ void ast_log(int level, const char *file, int line, const char *function, const
va_end(ap);
}
+void ast_log_safe(int level, const char *file, int line, const char *function, const char *fmt, ...)
+{
+ va_list ap;
+ void *recursed = ast_threadstorage_get_ptr(&in_safe_log);
+ ast_callid callid;
+
+ if (recursed) {
+ return;
+ }
+
+ if (ast_threadstorage_set_ptr(&in_safe_log, (void*)1)) {
+ /* We've failed to set the flag that protects against
+ * recursion, so bail. */
+ return;
+ }
+
+ callid = ast_read_threadstorage_callid();
+
+ va_start(ap, fmt);
+ ast_log_full(level, file, line, function, callid, fmt, ap);
+ va_end(ap);
+
+ /* Clear flag so the next allocation failure can be logged. */
+ ast_threadstorage_set_ptr(&in_safe_log, NULL);
+}
+
void ast_log_callid(int level, const char *file, int line, const char *function, ast_callid callid, const char *fmt, ...)
{
va_list ap;
diff --git a/main/strings.c b/main/strings.c
index 73892eb0a1557cee7178bc5bac9abc682f96dde0..b6b9fbcd71dffe847f33097bbf4566f6f361745c 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -87,9 +87,6 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
} else if (max_len == 0) { /* if unbounded, give more room for next time */
need += 16 + need / 4;
}
- if (0) { /* debugging */
- ast_verbose("extend from %d to %d\n", len, need);
- }
if (
#if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
_ast_str_make_space(buf, need, file, lineno, function)
@@ -97,7 +94,7 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
ast_str_make_space(buf, need)
#endif
) {
- ast_verbose("failed to extend from %d to %d\n", len, need);
+ ast_log_safe(LOG_VERBOSE, "failed to extend from %d to %d\n", len, need);
va_end(aq);
return AST_DYNSTR_BUILD_FAILED;
}