From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 26 Nov 2007 17:49:47 +0000 (+0000)
Subject: Merged revisions 89594 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~659
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b11f846e7eee168648709a68f8ed7bc0fb35993a;p=thirdparty%2Fasterisk.git

Merged revisions 89594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89594 | russell | 2007-11-26 11:41:04 -0600 (Mon, 26 Nov 2007) | 3 lines

Add channel locking to a function that needed to be doing it.  This is just a
little something I noticed while working on a completely unrelated issue.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index d3121234f6..5ab13babc4 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3155,8 +3155,10 @@ int ast_spawn_extension(struct ast_channel *c, const char *context, const char *
 /*! helper function to set extension and priority */
 static void set_ext_pri(struct ast_channel *c, const char *exten, int pri)
 {
+	ast_channel_lock(c);
 	ast_copy_string(c->exten, exten, sizeof(c->exten));
 	c->priority = pri;
+	ast_channel_unlock(c);
 }
 
 /*!