[asterisk-commits] tilghman: branch 1.6.0 r125795 - in /branches/1.6.0: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun 27 09:07:13 2008
New Revision: 125795

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125795
Log:
Merged revisions 125794 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r125794 | tilghman | 2008-06-27 08:54:13 -0500 (Fri, 27 Jun 2008) | 10 lines

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.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/lock.h
    branches/1.6.0/main/utils.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/lock.h?view=diff&rev=125795&r1=125794&r2=125795
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Fri Jun 27 09:07:13 2008
@@ -193,9 +193,9 @@
  * 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
 
 /*!
@@ -206,9 +206,9 @@
  */
 #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... */ \
@@ -220,9 +220,9 @@
 
 #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... */ \

Modified: branches/1.6.0/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/utils.c?view=diff&rev=125795&r1=125794&r2=125795
==============================================================================
--- branches/1.6.0/main/utils.c (original)
+++ branches/1.6.0/main/utils.c Fri Jun 27 09:07:13 2008
@@ -676,7 +676,7 @@
 	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;
@@ -697,10 +697,10 @@
 		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);