Merged revisions 125793 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125793 | tilghman | 2008-06-27 08:45:03 -0500 (Fri, 27 Jun 2008) | 2 lines

In this debugging function, copy to a buffer instead of using potentially unsafe pointers.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125794 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 46c7238..56f7b03 100644 (file)
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -250,9 +250,9 @@ void log_show_lock(void *this_lock_addr);
  * be preserved as to what location originally acquired the lock.
  */
 #if !defined(LOW_MEMORY)
-int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, const char **func, const char **mutex_name);
+int ast_find_lock_info(void *lock_addr, char *filename, size_t filename_size, int *lineno, char *func, size_t func_size, char *mutex_name, size_t mutex_name_size);
 #else
-#define ast_find_lock_info(a,b,c,d,e) -1
+#define ast_find_lock_info(a,b,c,d,e,f,g,h) -1
 #endif
 
 /*!
@@ -263,9 +263,9 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
  */
 #define CHANNEL_DEADLOCK_AVOIDANCE(chan) \
        do { \
-               const char *__filename, *__func, *__mutex_name; \
+               char __filename[80], __func[80], __mutex_name[80]; \
                int __lineno; \
-               int __res = ast_find_lock_info(&chan->lock_dont_use, &__filename, &__lineno, &__func, &__mutex_name); \
+               int __res = ast_find_lock_info(&chan->lock_dont_use, __filename, sizeof(__filename), &__lineno, __func, sizeof(__func), __mutex_name, sizeof(__mutex_name)); \
                ast_channel_unlock(chan); \
                usleep(1); \
                if (__res < 0) { /* Shouldn't ever happen, but just in case... */ \
@@ -277,9 +277,9 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
 
 #define DEADLOCK_AVOIDANCE(lock) \
        do { \
-               const char *__filename, *__func, *__mutex_name; \
+               char __filename[80], __func[80], __mutex_name[80]; \
                int __lineno; \
-               int __res = ast_find_lock_info(lock, &__filename, &__lineno, &__func, &__mutex_name); \
+               int __res = ast_find_lock_info(lock, __filename, sizeof(__filename), &__lineno, __func, sizeof(__func), __mutex_name, sizeof(__mutex_name)); \
                ast_mutex_unlock(lock); \
                usleep(1); \
                if (__res < 0) { /* Shouldn't ever happen, but just in case... */ \
@@ -291,9 +291,9 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
 
 #define DLA_UNLOCK(lock) \
        do { \
-               const char *__filename, *__func, *__mutex_name; \
+               char __filename[80], __func[80], __mutex_name[80]; \
                int __lineno; \
-               int __res = ast_find_lock_info(lock, &__filename, &__lineno, &__func, &__mutex_name); \
+               int __res = ast_find_lock_info(lock, __filename, sizeof(__filename), &__lineno, __func, sizeof(__func), __mutex_name, sizeof(__mutex_name)); \
                ast_mutex_unlock(lock);
 
 #define DLA_LOCK(lock) \

diff --git a/main/utils.c b/main/utils.c
index d4adaf9..c164c55 100644 (file)
--- a/main/utils.c
+++ b/main/utils.c
@@ -692,7 +692,7 @@ void ast_mark_lock_failed(void *lock_addr)
        pthread_mutex_unlock(&lock_info->lock);
 }
 
-int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, const char **func, const char **mutex_name)
+int ast_find_lock_info(void *lock_addr, char *filename, size_t filename_size, int *lineno, char *func, size_t func_size, char *mutex_name, size_t mutex_name_size)
 {
        struct thr_lock_info *lock_info;
        int i = 0;
@@ -713,10 +713,10 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
                return -1;
        }
 
-       *filename = lock_info->locks[i].file;
+       ast_copy_string(filename, lock_info->locks[i].file, filename_size);
        *lineno = lock_info->locks[i].line_num;
-       *func = lock_info->locks[i].func;
-       *mutex_name = lock_info->locks[i].lock_name;
+       ast_copy_string(func, lock_info->locks[i].func, func_size);
+       ast_copy_string(mutex_name, lock_info->locks[i].lock_name, mutex_name_size);
 
        pthread_mutex_unlock(&lock_info->lock);