Author: rmudgett Date: Tue Mar 17 11:25:23 2015 New Revision: 433025 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433025 Log: Multiple revisions 431583,433005
........ r431583 | sgriepentrog | 2015-02-06 15:26:12 -0600 (Fri, 06 Feb 2015) | 10 lines various: cleanup issues found during leak hunt 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/ ........ r433005 | rmudgett | 2015-03-17 11:10:39 -0500 (Tue, 17 Mar 2015) | 1 line res_pjsip: Add reason comment. ........ Merged revisions 431583,433005 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: certified/branches/13.1/ (props changed) certified/branches/13.1/main/config.c certified/branches/13.1/main/utils.c certified/branches/13.1/res/res_pjsip.c Propchange: certified/branches/13.1/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: certified/branches/13.1/main/config.c URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/main/config.c?view=diff&rev=433025&r1=433024&r2=433025 ============================================================================== --- certified/branches/13.1/main/config.c (original) +++ certified/branches/13.1/main/config.c Tue Mar 17 11:25:23 2015 @@ -3799,6 +3799,9 @@ AST_LIST_UNLOCK(&cfmtime_head); ast_cli_unregister_multiple(cli_config, ARRAY_LEN(cli_config)); + + ao2_cleanup(cfg_hooks); + cfg_hooks = NULL; } int register_config_cli(void) @@ -3887,5 +3890,6 @@ hook->module = ast_strdup(module); ao2_link(cfg_hooks, hook); + ao2_ref(hook, -1); return 0; } Modified: certified/branches/13.1/main/utils.c URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/main/utils.c?view=diff&rev=433025&r1=433024&r2=433025 ============================================================================== --- certified/branches/13.1/main/utils.c (original) +++ certified/branches/13.1/main/utils.c Tue Mar 17 11:25:23 2015 @@ -1856,7 +1856,7 @@ /* Join words into a string */ if (!s) return; - for (x = 0; ofs < len && w[x] && x < size; x++) { + for (x = 0; ofs < len && x < size && w[x] ; x++) { if (x > 0) s[ofs++] = delim; for (src = w[x]; *src && ofs < len; src++) Modified: certified/branches/13.1/res/res_pjsip.c URL: http://svnview.digium.com/svn/asterisk/certified/branches/13.1/res/res_pjsip.c?view=diff&rev=433025&r1=433024&r2=433025 ============================================================================== --- certified/branches/13.1/res/res_pjsip.c (original) +++ certified/branches/13.1/res/res_pjsip.c Tue Mar 17 11:25:23 2015 @@ -2858,13 +2858,22 @@ static int sync_task(void *data) { struct sync_task_data *std = data; + int ret; + std->fail = std->task(std->task_data); + /* + * Once we unlock std->lock after signaling, we cannot access + * std again. The thread waiting within + * ast_sip_push_task_synchronous() is free to continue and + * release its local variable (std). + */ ast_mutex_lock(&std->lock); std->complete = 1; ast_cond_signal(&std->cond); + ret = std->fail; 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) -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
