fixing stupid mistake with putting code before variable declaration

........

  Merged revisions 313433 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.6.2@313435 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 63a99fab6a9a67f50c95c1ab2cff3bd2dd43ba1f..d80ac69f76b1517d4a2d70e76cb98bf74c511226 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -10540,13 +10540,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) {
                        if ((channel != CHAN_PSEUDO) && !pri) {
                                int count = 0;