kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

various: cleanup issues found during leak hunt

Browse Source 
In this collection of small patches to prevent
Valgrind errors are: fixes for reference leaks
in config hooks, evaluating a parameter beyond
bounds, and accessing a structure after a lock
where it could have been already free'd.

Review: https://reviewboard.asterisk.org/r/4407/
........

Merged revisions 431583 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Scott Griepentrog
2015-02-06 21:26:46 +00:00
parent a79c920aa1
commit 7ca1a0da04
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/config.c
View File

@@ -3821,6 +3821,9 @@ static void config_shutdown(void)
AST_LIST_UNLOCK(&cfmtime_head); AST_LIST_UNLOCK(&cfmtime_head);
ast_cli_unregister_multiple(cli_config, ARRAY_LEN(cli_config)); ast_cli_unregister_multiple(cli_config, ARRAY_LEN(cli_config));
ao2_cleanup(cfg_hooks);
cfg_hooks = NULL;
} }
int register_config_cli(void) int register_config_cli(void)
@@ -3909,5 +3912,6 @@ int ast_config_hook_register(const char *name,
hook->module = ast_strdup(module); hook->module = ast_strdup(module);
ao2_link(cfg_hooks, hook); ao2_link(cfg_hooks, hook);
ao2_ref(hook, -1);
return 0; return 0;
} }

2
main/utils.c
View File

@@ -1856,7 +1856,7 @@ void ast_join_delim(char *s, size_t len, const char * const w[], unsigned int si
/* Join words into a string */ /* Join words into a string */
if (!s) if (!s)
return; return;
for (x = 0; ofs < len && w[x] && x < size; x++) { for (x = 0; ofs < len && x < size && w[x] ; x++) {
if (x > 0) if (x > 0)
s[ofs++] = delim; s[ofs++] = delim;
for (src = w[x]; *src && ofs < len; src++) for (src = w[x]; *src && ofs < len; src++)

5
res/res_pjsip.c
View File

@@ -2971,13 +2971,16 @@ struct sync_task_data {
static int sync_task(void *data) static int sync_task(void *data)
{ {
struct sync_task_data *std = data; struct sync_task_data *std = data;
int ret;
std->fail = std->task(std->task_data); std->fail = std->task(std->task_data);
ast_mutex_lock(&std->lock); ast_mutex_lock(&std->lock);
std->complete = 1; std->complete = 1;
ast_cond_signal(&std->cond); ast_cond_signal(&std->cond);
ret = std->fail;
ast_mutex_unlock(&std->lock); ast_mutex_unlock(&std->lock);
return std->fail; return ret;
} }
int ast_sip_push_task_synchronous(struct ast_taskprocessor *serializer, int (*sip_task)(void *), void *task_data) int ast_sip_push_task_synchronous(struct ast_taskprocessor *serializer, int (*sip_task)(void *), void *task_data)