]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
app_jack: fix datastore memory leak in error handling path.
authorRussell Bryant <russell@russellbryant.com>
Sat, 24 Mar 2012 03:02:15 +0000 (03:02 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 24 Mar 2012 03:02:15 +0000 (03:02 +0000)
........

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

apps/app_jack.c

index 893a5dec0a897a0320c48456b60a965ebe487eda..7a20e63a9b89e0ea133d5272ce9655865cea4ff6 100644 (file)
@@ -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;
 }