[asterisk-commits] dvossel: branch 1.4 r246545 - /branches/1.4/main/channel.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Feb 12 17:30:17 2010
New Revision: 246545

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246545
Log:
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:
    branches/1.4/main/channel.c

Modified: branches/1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/channel.c?view=diff&rev=246545&r1=246544&r2=246545
==============================================================================
--- branches/1.4/main/channel.c (original)
+++ branches/1.4/main/channel.c Fri Feb 12 17:30:17 2010
@@ -1286,9 +1286,11 @@
 	}
 
 	/* 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_channel_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) */