dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 169210 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r169210 | mmichelson | 2009-01-19 09:52:15 -0600 (Mon, 19 Jan 2009) | 13 lines

Prevent a crash in chan_local due to a potential NULL pointer dereference

Move the check for if both channels on a local_pvt have generators to below
where p->chan is checked for NULLity (NULLness?). This prevents a crash from
occurring if p->chan is NULL.

(closes issue #14189)
Reported by: sascha
Patches:
      14189.patch uploaded by putnopvut (license 60)
Tested by: sascha


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@169211 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mmichelson 2009-01-19 15:54:06 +00:00
parent a37d586b71
commit 696e944241
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_local.c
View File

@ -203,10 +203,6 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
/* Recalculate outbound channel */
other = isoutbound ? p->owner : p->chan;
/* do not queue frame if generator is on both local channels */
if (us && us->generator && other->generator)
return 0;
/* Set glare detection */
ast_set_flag(p, LOCAL_GLARE_DETECT);
if (ast_test_flag(p, LOCAL_CANCEL_QUEUE)) {
@ -221,6 +217,10 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
return 0;
}
/* do not queue frame if generator is on both local channels */
if (us && us->generator && other->generator)
return 0;
/* Ensure that we have both channels locked */
while (other && ast_channel_trylock(other)) {
ast_mutex_unlock(&p->lock);