[svn-commits] dvossel: trunk r246546 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Feb 12 17:32:33 2010
New Revision: 246546

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246546
Log:
Merged revisions 246545 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r246545 | dvossel | 2010-02-12 17:30:17 -0600 (Fri, 12 Feb 2010) | 16 lines
  
  lock channel during datastore removal
  
  On channel destruction the channel's datastores are removed and
  destroyed.  Since there are public API calls to find and remove
  datastores on a channel, a lock should be held whenever datastores are
  removed and destroyed.  This resolves a crash caused by a race
  condition in app_chanspy.c.
  
  (closes issue #16678)
  Reported by: tim_ringenbach
  Patches:
        datastore_destroy_race.diff uploaded by tim ringenbach (license 540)
  Tested by: dvossel
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=246546&r1=246545&r2=246546
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Feb 12 17:32:33 2010
@@ -1844,9 +1844,11 @@
 	ast_cel_check_retire_linkedid(chan);
 
 	/* Get rid of each of the data stores on the channel */
+	ast_channel_lock(chan);
 	while ((datastore = AST_LIST_REMOVE_HEAD(&chan->datastores, entry)))
 		/* Free the data store */
 		ast_datastore_free(datastore);
+	ast_channel_unlock(chan);
 
 	/* Lock and unlock the channel just to be sure nobody has it locked still
 	   due to a reference that was stored in a datastore. (i.e. app_chanspy) */