diff options
| author | Russell Bryant <russell@russellbryant.com> | 2012-03-24 03:03:20 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2012-03-24 03:03:20 +0000 |
| commit | 71a1541b0c637b270274bf9045643cf1df47f08b (patch) | |
| tree | fe8aed0ea09b4dce41017cc8d04f73ffaab3bfe0 | |
| parent | cad07b3800b7212c363e2753d6d7540b585c3449 (diff) | |
app_jack: fix datastore memory leak in error handling path.
........
Merged revisions 360360 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 360361 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_jack.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/app_jack.c b/apps/app_jack.c index 46024ff39..10964f462 100644 --- a/apps/app_jack.c +++ b/apps/app_jack.c @@ -904,8 +904,14 @@ static int enable_jack_hook(struct ast_channel *chan, char *data) return_error: ast_channel_unlock(chan); - if (jack_data) + if (jack_data) { destroy_jack_data(jack_data); + } + + if (datastore) { + datastore->data = NULL; + ast_datastore_free(datastore); + } return -1; } |