From: Russell Bryant Date: Sat, 24 Mar 2012 03:02:15 +0000 (+0000) Subject: app_jack: fix datastore memory leak in error handling path. X-Git-Tag: 10.3.0~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b41c6c6eef42b3cca9cded3b0591db6e51a99911;p=thirdparty%2Fasterisk.git app_jack: fix datastore memory leak in error handling path. ........ Merged revisions 360360 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@360361 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_jack.c b/apps/app_jack.c index 893a5dec0a..7a20e63a9b 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; }