diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-11-15 22:32:51 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-11-15 22:32:51 +0000 |
| commit | 176c7ca47c7e2614dffebddfbe26656857db2353 (patch) | |
| tree | d6d379a26325ab6680895fdaf4570d03085813d6 /channels | |
| parent | 3fee20d25dd66f37a3d1ba06612d95e8cc191f34 (diff) | |
Merged revisions 47712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47712 | file | 2006-11-15 17:31:17 -0500 (Wed, 15 Nov 2006) | 10 lines
Merged revisions 47711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47711 | file | 2006-11-15 17:29:30 -0500 (Wed, 15 Nov 2006) | 2 lines
Make sure that the pvt structure exists before trying to do fixup on Local channels. (issue #7937 reported by mada123, fix by alamantia with mods by me)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_local.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index fe821363d..e1028aa1e 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -295,6 +295,10 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f) static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct local_pvt *p = newchan->tech_pvt; + + if (!p) + return -1; + ast_mutex_lock(&p->lock); if ((p->owner != oldchan) && (p->chan != oldchan)) { |