mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +00:00 
			
		
		
		
	Merged revisions 104334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r104334 | russell | 2008-02-26 19:15:02 -0600 (Tue, 26 Feb 2008) | 3 lines Avoid some recursion in the cleanup code for the chanspy datastore (closes issue #12076, reported by junky, patched by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		@@ -446,6 +446,8 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)
 | 
			
		||||
		if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, NULL))) {
 | 
			
		||||
			ast_channel_datastore_remove(chan, datastore);
 | 
			
		||||
			/* chanspy_ds->chan is NULL after this call */
 | 
			
		||||
			chanspy_ds_destroy(datastore->data);
 | 
			
		||||
			datastore->data = NULL;
 | 
			
		||||
			ast_channel_datastore_free(datastore);
 | 
			
		||||
		}
 | 
			
		||||
		ast_channel_unlock(chan);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user