kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 85649 via svnmerge from

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

........
r85649 | russell | 2007-10-15 14:22:45 -0500 (Mon, 15 Oct 2007) | 2 lines

Be pedantic about handling memory allocation failure.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-10-15 19:25:56 +00:00
parent ac9a6dce25
commit 4c1b8cb9fa
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/utils.c
View File

@@ -742,13 +742,16 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
"=== <file> <line num> <function> <lock name> <lock addr> (times locked)\n" "=== <file> <line num> <function> <lock name> <lock addr> (times locked)\n"
"===\n"); "===\n");
if (!str)
return CLI_FAILURE;
pthread_mutex_lock(&lock_infos_lock.mutex); pthread_mutex_lock(&lock_infos_lock.mutex);
AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) { AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) {
int i; int i;
ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id, ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id,
lock_info->thread_name); lock_info->thread_name);
pthread_mutex_lock(&lock_info->lock); pthread_mutex_lock(&lock_info->lock);
for (i = 0; i < lock_info->num_locks; i++) { for (i = 0; str && i < lock_info->num_locks; i++) {
ast_str_append(&str, 0, "=== ---> %sLock #%d (%s): %s %d %s %s %p (%d)\n", ast_str_append(&str, 0, "=== ---> %sLock #%d (%s): %s %d %s %s %p (%d)\n",
lock_info->locks[i].pending > 0 ? "Waiting for " : lock_info->locks[i].pending > 0 ? "Waiting for " :
lock_info->locks[i].pending < 0 ? "Tried and failed to get " : "", i, lock_info->locks[i].pending < 0 ? "Tried and failed to get " : "", i,
@@ -760,19 +763,29 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
lock_info->locks[i].times_locked); lock_info->locks[i].times_locked);
} }
pthread_mutex_unlock(&lock_info->lock); pthread_mutex_unlock(&lock_info->lock);
if (!str)
break;
ast_str_append(&str, 0, "=== -------------------------------------------------------------------\n" ast_str_append(&str, 0, "=== -------------------------------------------------------------------\n"
"===\n"); "===\n");
if (!str)
break;
} }
pthread_mutex_unlock(&lock_infos_lock.mutex); pthread_mutex_unlock(&lock_infos_lock.mutex);
if (!str)
return CLI_FAILURE;
ast_str_append(&str, 0, "=======================================================================\n" ast_str_append(&str, 0, "=======================================================================\n"
"\n"); "\n");
if (!str)
return CLI_FAILURE;
ast_cli(a->fd, "%s", str->str); ast_cli(a->fd, "%s", str->str);
free(str); free(str);
return 0; return CLI_SUCCESS;
} }
static struct ast_cli_entry utils_cli[] = { static struct ast_cli_entry utils_cli[] = {