diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2015-02-06 21:26:46 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2015-02-06 21:26:46 +0000 |
| commit | 7ca1a0da04f6363324274aa7065a12f613f6cee0 (patch) | |
| tree | 0483377d4b20e19c873b72f1b0161fad03beac08 /res/res_pjsip.c | |
| parent | a79c920aa1a1880b462253b51068adf0a8db99e2 (diff) | |
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/
........
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
Diffstat (limited to 'res/res_pjsip.c')
| -rw-r--r-- | res/res_pjsip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 58d9826b8..6db84b417 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -2971,13 +2971,16 @@ struct sync_task_data { static int sync_task(void *data) { struct sync_task_data *std = data; + int ret; + std->fail = std->task(std->task_data); 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) |