kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing stupid mistake with putting code before variable declaration

Browse Source 
........

  Merged revisions 313435 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
	
  ........
	  
    r313432 | jrose | 2011-04-12 13:12:29 -0500 (Tue, 12 Apr 2011) | 14 lines
		      
	reload Chan_dahdi memory leak caused by variables
			
	chan_dahdi reloading with variables set via setvar in chan_dahdi.conf would
	stay in the dahdi_pvt structs for individual channels (causing them to just
	continue adding the new ones to the list) and also there was a memory leak
	causes by the conf objects. This patch resolves both of these by using 
	ast_variables_destroy during the loading process.
									
	(closes issue #17450)
	Reported by: nahuelgreco
	Patches:
		patch.diff uploaded by jrose (license 1225)
	Tested by: tilghman, jrose
	Review: https://reviewboard.asterisk.org/r/1170/
																	
  ........

........
																	  
																	  																																	














git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@313436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-04-12 18:47:05 +00:00
parent 833c42ce4b
commit 2600de8c9f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
channels/chan_dahdi.c
View File

@@ -12062,13 +12062,14 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
}
if (tmp) {
int chan_sig = conf->chan.sig;
/* If there are variables in tmp before it is updated to match the new config, clear them */
if (reloading && tmp->vars) {
ast_variables_destroy(tmp->vars);
tmp->vars = NULL;
}
int chan_sig = conf->chan.sig;
if (!here) {
/* Can only get here if this is a new channel interface being created. */