diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 04:04:13 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 04:04:13 +0000 |
| commit | cc98490597efa90a8167b5710d44ef735761f5a7 (patch) | |
| tree | 569debefc2ce956622ca02a5574393a93013115f | |
| parent | 9b206863d7eccc2c5e18f88af5cf443c7ff01256 (diff) | |
Merged revisions 109764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r109764 | russell | 2008-03-18 17:36:02 -0500 (Tue, 18 Mar 2008) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@109837 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_chanspy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index ab056e0aa..f37de3889 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -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; |