[asterisk-commits] seanbright: branch 1.6.1 r137935 - in /branches/1.6.1: ./ cdr/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Aug 14 13:50:09 2008
New Revision: 137935

URL: http://svn.digium.com/view/asterisk?view=rev&rev=137935
Log:
Merged revisions 137933 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r137933 | seanbright | 2008-08-14 14:47:28 -0400 (Thu, 14 Aug 2008) | 8 lines

Fix memory leak in cdr_sqlite3_custom.

(closes issue #13304)
Reported by: eliel
Patches:
      sqlite.patch uploaded by eliel (license 64)
      (Slightly modified by me)

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/cdr/cdr_sqlite3_custom.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Thu Aug 14 13:50:09 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848
+/trunk:1-137647,137680,137732,137780,137812,137848,137933

Modified: branches/1.6.1/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/cdr/cdr_sqlite3_custom.c?view=diff&rev=137935&r1=137934&r2=137935
==============================================================================
--- branches/1.6.1/cdr/cdr_sqlite3_custom.c (original)
+++ branches/1.6.1/cdr/cdr_sqlite3_custom.c Thu Aug 14 13:50:09 2008
@@ -75,7 +75,7 @@
 static int load_column_config(const char *tmp)
 {
 	char *col = NULL;
-	char *cols = NULL;
+	char *cols = NULL, *save = NULL;
 	char *escaped = NULL;
 	struct ast_str *column_string = NULL;
 
@@ -87,7 +87,7 @@
 		ast_log(LOG_ERROR, "Out of memory creating temporary buffer for column list for table '%s.'\n", table);
 		return -1;
 	}
-	if (!(cols = ast_strdup(tmp))) {
+	if (!(save = cols = ast_strdup(tmp))) {
 		ast_log(LOG_ERROR, "Out of memory creating temporary buffer for column list for table '%s.'\n", table);
 		ast_free(column_string);
 		return -1;
@@ -98,7 +98,7 @@
 		if (!escaped) {
 			ast_log(LOG_ERROR, "Out of memory creating entry for column '%s' in table '%s.'\n", col, table);
 			ast_free(column_string);
-			ast_free(cols);
+			ast_free(save);
 			return -1;
 		}
 		if (!column_string->used)
@@ -110,11 +110,11 @@
 	if (!(columns = ast_strdup(column_string->str))) {
 		ast_log(LOG_ERROR, "Out of memory copying columns string for table '%s.'\n", table);
 		ast_free(column_string);
-		ast_free(cols);
+		ast_free(save);
 		return -1;
 	}
 	ast_free(column_string);
-	ast_free(cols);
+	ast_free(save);
 
 	return 0;
 }
@@ -122,14 +122,14 @@
 static int load_values_config(const char *tmp)
 {
 	char *val = NULL;
-	char *vals = NULL;
+	char *vals = NULL, *save = NULL;
 	struct values *value = NULL;
 
 	if (ast_strlen_zero(tmp)) {
 		ast_log(LOG_WARNING, "Values not specified. Module not loaded.\n");
 		return -1;
 	}
-	if (!(vals = ast_strdup(tmp))) {
+	if (!(save = vals = ast_strdup(tmp))) {
 		ast_log(LOG_ERROR, "Out of memory creating temporary buffer for value '%s'\n", tmp);
 		return -1;
 	}
@@ -139,14 +139,14 @@
 		value = ast_calloc(sizeof(char), sizeof(*value) + strlen(val) + 1);
 		if (!value) {
 			ast_log(LOG_ERROR, "Out of memory creating entry for value '%s'\n", val);
-			ast_free(vals);
+			ast_free(save);
 			return -1;
 		}
 		value->expression = (char *) value + sizeof(*value);
 		ast_copy_string(value->expression, val, strlen(val) + 1);
 		AST_LIST_INSERT_TAIL(&sql_values, value, list);
 	}
-	ast_free(vals);
+	ast_free(save);
 
 	return 0;
 }