[svn-commits] tilghman: branch 1.6.1 r1045 - /branches/1.6.1/cdr/cdr_addon_mysql.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Nov  9 11:31:46 2009
New Revision: 1045

URL: http://svnview.digium.com/svn/asterisk-addons?view=rev&rev=1045
Log:
Merged revision 228798 manually from http://svn.digium.com/svn/asterisk/trunk
...............
  r228798 | tilghman | 2009-11-09 01:37:52 -0500 (Mon, Nov  9 2009) | ?? lines

  Fix various problems detected with Valgrind.
  * cdr_mysql stored a pointer that was freed by realloc()
...............

Modified:
    branches/1.6.1/cdr/cdr_addon_mysql.c

Modified: branches/1.6.1/cdr/cdr_addon_mysql.c
URL: http://svnview.digium.com/svn/asterisk-addons/branches/1.6.1/cdr/cdr_addon_mysql.c?view=diff&rev=1045&r1=1044&r2=1045
==============================================================================
--- branches/1.6.1/cdr/cdr_addon_mysql.c (original)
+++ branches/1.6.1/cdr/cdr_addon_mysql.c Mon Nov  9 11:31:46 2009
@@ -387,16 +387,16 @@
 		return -1;
 	}
 
+	tmp = ast_variable_retrieve(cfg, category, variable);
+
+	ast_str_set(field, 0, "%s", tmp ? tmp : def);
+
 	us->str = *field;
 
 	AST_LIST_LOCK(&unload_strings);
 	AST_LIST_INSERT_HEAD(&unload_strings, us, entry);
 	AST_LIST_UNLOCK(&unload_strings);
 	
-	tmp = ast_variable_retrieve(cfg, category, variable);
-
-	ast_str_set(field, 0, "%s", tmp ? tmp : def);
-
 	return 0;
 }