mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Merged revisions 109763 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r109763 | russell | 2008-03-18 17:34:42 -0500 (Tue, 18 Mar 2008) | 3 lines Fix one place where the chanspy datastore isn't removed from a channel. (issue #12243, reported by atis, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -714,8 +714,10 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
|
||||
res = ast_streamfile(chan, peer_name, chan->language);
|
||||
if (!res)
|
||||
res = ast_waitstream(chan, "");
|
||||
if (res)
|
||||
if (res) {
|
||||
chanspy_ds_free(peer_chanspy_ds);
|
||||
break;
|
||||
}
|
||||
} else
|
||||
res = ast_say_character_str(chan, peer_name, "", chan->language);
|
||||
if ((num = atoi(ptr)))
|
||||
@@ -731,6 +733,7 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
|
||||
goto exit;
|
||||
} else if (res == -2) {
|
||||
res = 0;
|
||||
chanspy_ds_free(peer_chanspy_ds);
|
||||
goto exit;
|
||||
} else if (res > 1 && spec) {
|
||||
struct ast_channel *next;
|
||||
|
Reference in New Issue
Block a user