[svn-commits] russell: trunk r88769 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Nov  5 15:35:51 2007
New Revision: 88769

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88769
Log:
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.) 

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=88769&r1=88768&r2=88769
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Nov  5 15:35:51 2007
@@ -7752,8 +7752,12 @@
 	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 @@
 				}
 			}
 		}
+
+		ast_channel_unlock(chan);
 	}
 	if (sdp) {
 		if (p->udptl && p->t38.state == T38_LOCAL_DIRECT) {