diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-19 15:55:29 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-19 15:55:29 +0000 |
| commit | 8059ff2f4f18adc99747ec2959d7c64eda22de9b (patch) | |
| tree | e68fee553ae4e1c662146483c54f7a4b3daaf971 /channels/chan_local.c | |
| parent | b08eb48e14d1ecc3c16787eb63081d0f90405dc5 (diff) | |
Merged revisions 169211 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r169211 | mmichelson | 2009-01-19 09:54:06 -0600 (Mon, 19 Jan 2009) | 21 lines
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/branches/1.6.1@169213 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index bd89a934c..754f49b8c 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -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); |