diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-16 20:48:49 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-16 20:48:49 +0000 |
| commit | 989babae94868b048f68ac14d50c04b05c168814 (patch) | |
| tree | 33567416e7ac520a9d8baec2d22f5338d19774fa /channels/chan_iax2.c | |
| parent | f1b57c45cde90e61f4425e44c3c7a6bebb571f2d (diff) | |
Merged revisions 131422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r131422 | russell | 2008-07-16 15:48:27 -0500 (Wed, 16 Jul 2008) | 15 lines
Merged revisions 131421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r131421 | russell | 2008-07-16 15:47:53 -0500 (Wed, 16 Jul 2008) | 7 lines
Always ensure that the channel's tech_pvt reference is NULL after calling the
destroy callback.
(closes issue #13060)
Reported by: jpgrayson
Patches:
chan_iax2_tech_pvt_crash.patch uploaded by jpgrayson (license 492)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131423 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index de0073ef8..dfab13ef4 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3720,6 +3720,12 @@ static int iax2_hangup(struct ast_channel *c) ast_debug(1, "Really destroying %s now...\n", c->name); iax2_destroy(callno); } + } else if (c->tech_pvt) { + /* If this call no longer exists, but the channel still + * references it we need to set the channel's tech_pvt to null + * to avoid ast_channel_free() trying to free it. + */ + c->tech_pvt = NULL; } ast_mutex_unlock(&iaxsl[callno]); ast_verb(3, "Hungup '%s'\n", c->name); |