diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 14:07:13 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 14:07:13 +0000 |
| commit | 2068590dac784041561e7b9bec3872cac4ccf1ed (patch) | |
| tree | 9f4265b9a3eec1eaa2266e74d0d0b4263ed842bf /main | |
| parent | 975c2c2a25023c5977aea221f0d038e0aa4052ef (diff) | |
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.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125795 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/utils.c b/main/utils.c index d3f803b28..1a7043573 100644 --- a/main/utils.c +++ b/main/utils.c @@ -676,7 +676,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; @@ -697,10 +697,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); |