[svn-commits] tilghman: branch 1.6.1 r257067 - in /branches/1.6.1: ./ cdr/cdr_sqlite3_custom.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Apr 13 11:38:32 2010
New Revision: 257067

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

........
  r257065 | tilghman | 2010-04-13 11:33:21 -0500 (Tue, 13 Apr 2010) | 8 lines
  
  Ensure that we can have commas within cdr values.
  
  (closes issue #17001)
   Reported by: snuffy
   Patches: 
         20100412__issue17001.diff.txt uploaded by tilghman (license 14)
   Tested by: snuffy
........

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/cdr/cdr_sqlite3_custom.c?view=diff&rev=257067&r1=257066&r2=257067
==============================================================================
--- branches/1.6.1/cdr/cdr_sqlite3_custom.c (original)
+++ branches/1.6.1/cdr/cdr_sqlite3_custom.c Tue Apr 13 11:38:32 2010
@@ -51,6 +51,7 @@
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
+#include "asterisk/app.h"
 
 AST_MUTEX_DEFINE_STATIC(lock);
 
@@ -64,8 +65,8 @@
 static char *columns;
 
 struct values {
-	char *expression;
 	AST_LIST_ENTRY(values) list;
+	char expression[1];
 };
 
 static AST_LIST_HEAD_STATIC(sql_values, values);
@@ -121,9 +122,12 @@
 
 static int load_values_config(const char *tmp)
 {
-	char *val = NULL;
 	char *vals = NULL, *save = NULL;
 	struct values *value = NULL;
+	int i;
+	AST_DECLARE_APP_ARGS(val,
+		AST_APP_ARG(ues)[200]; /* More than 200 columns in this CDR?  Yeah, right... */
+	);
 
 	if (ast_strlen_zero(tmp)) {
 		ast_log(LOG_WARNING, "Values not specified. Module not loaded.\n");
@@ -133,17 +137,17 @@
 		ast_log(LOG_ERROR, "Out of memory creating temporary buffer for value '%s'\n", tmp);
 		return -1;
 	}
-	while ((val = strsep(&vals, ","))) {
+	AST_STANDARD_RAW_ARGS(val, vals);
+	for (i = 0; i < val.argc; i++) {
 		/* Strip the single quotes off if they are there */
-		val = ast_strip_quoted(val, "'", "'");
-		value = ast_calloc(sizeof(char), sizeof(*value) + strlen(val) + 1);
+		char *v = ast_strip_quoted(val.ues[i], "'", "'");
+		value = ast_calloc(sizeof(char), sizeof(*value) + strlen(v));
 		if (!value) {
-			ast_log(LOG_ERROR, "Out of memory creating entry for value '%s'\n", val);
+			ast_log(LOG_ERROR, "Out of memory creating entry for value '%s'\n", v);
 			ast_free(save);
 			return -1;
 		}
-		value->expression = (char *) value + sizeof(*value);
-		ast_copy_string(value->expression, val, strlen(val) + 1);
+		strcpy(value->expression, v); /* SAFE */
 		AST_LIST_INSERT_TAIL(&sql_values, value, list);
 	}
 	ast_free(save);