[asterisk-commits] russell: branch 1.6.0 r114677 - in /branches/1.6.0: ./ pbx/pbx_lua.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Apr 25 17:05:26 2008
New Revision: 114677

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114677
Log:
Merged revisions 114676 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114676 | russell | 2008-04-25 17:04:46 -0500 (Fri, 25 Apr 2008) | 7 lines

Lock the channel around datastore access

(closes issue #12527)
Reported by: mnicholson
Patches:
      pbx_lua4.diff uploaded by mnicholson (license 96)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/pbx/pbx_lua.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/pbx/pbx_lua.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/pbx_lua.c?view=diff&rev=114677&r1=114676&r2=114677
==============================================================================
--- branches/1.6.0/pbx/pbx_lua.c (original)
+++ branches/1.6.0/pbx/pbx_lua.c Fri Apr 25 17:05:26 2008
@@ -982,7 +982,9 @@
 		}
 		return L;
 	} else {
+		ast_channel_lock(chan);
 		datastore = ast_channel_datastore_find(chan, &lua_datastore, NULL);
+		ast_channel_unlock(chan);
 
 		if (!datastore) {
 			/* nothing found, allocate a new lua state */