diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-05 21:35:51 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-05 21:35:51 +0000 |
| commit | 11ad54a10b05c6d826ba9f300d46b6f2d767b580 (patch) | |
| tree | f7bb8ee7810509ee9ee1c105370ec5e36c9e4fa0 /channels/chan_sip.c | |
| parent | 9ed4fe37f7d801437023bfe509d503b4b223fac4 (diff) | |
Merged revisions 88768 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r88768 | russell | 2007-11-05 15:33:56 -0600 (Mon, 05 Nov 2007) | 8 lines
When traversing the list of channel variables here in transmit_invite(), the
asterisk channel must be locked, as this data may change at any time.
(I have seen numerous reports of crashes related to the handling of channel
variables. There are a couple of issues on the bug tracker related to it,
but it has also been noted on IRC and mailing lists. So, I am finding and
fixing some places where channel variables are handled improperly.)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88769 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 80c8f72e3..1aff65fc8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7752,8 +7752,12 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init) add_header(&req, "Allow", ALLOWED_METHODS); add_header(&req, "Supported", SUPPORTED_EXTENSIONS); if (p->options && p->options->addsipheaders && p->owner) { - struct ast_channel *ast = p->owner; /* The owner channel */ - struct varshead *headp = &ast->varshead; + struct ast_channel *chan = p->owner; /* The owner channel */ + struct varshead *headp; + + ast_channel_lock(chan); + + headp = &chan->varshead; if (!headp) ast_log(LOG_WARNING,"No Headp for the channel...ooops!\n"); @@ -7784,6 +7788,8 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init) } } } + + ast_channel_unlock(chan); } if (sdp) { if (p->udptl && p->t38.state == T38_LOCAL_DIRECT) { |