dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@47713 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2006-11-15 22:32:51 +00:00
parent d834b150ad
commit 558f435de4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_local.c
View File

@ -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)) {