[asterisk-commits] tilghman: trunk r337343 - in /trunk: ./ funcs/func_curl.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Sep 21 15:53:13 2011
New Revision: 337343

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337343
Log:

................

........
Escape commas in keys and values, when keys and values are enumerated by commas.

Review: https://reviewboard.asterisk.org/r/1433
........
Merged revisions 337325 from https://origsvn.digium.com/svn/asterisk/branches/1.8
................
Merged revisions 337342 from https://origsvn.digium.com/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/funcs/func_curl.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/funcs/func_curl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_curl.c?view=diff&rev=337343&r1=337342&r2=337343
==============================================================================
--- trunk/funcs/func_curl.c (original)
+++ trunk/funcs/func_curl.c Wed Sep 21 15:53:13 2011
@@ -564,9 +564,11 @@
 }
 
 AST_THREADSTORAGE_CUSTOM(curl_instance, curl_instance_init, curl_instance_cleanup);
+AST_THREADSTORAGE(thread_escapebuf);
 
 static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info, char *buf, struct ast_str **input_str, ssize_t len)
 {
+	struct ast_str *escapebuf = ast_str_thread_get(&thread_escapebuf, 16);
 	struct ast_str *str = ast_str_create(16);
 	int ret = -1;
 	AST_DECLARE_APP_ARGS(args,
@@ -584,6 +586,11 @@
 	}
 
 	if (!str) {
+		return -1;
+	}
+
+	if (!escapebuf) {
+		ast_free(str);
 		return -1;
 	}
 
@@ -670,8 +677,8 @@
 					}
 					ast_uri_decode(name, ast_uri_http);
 				}
-				ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name);
-				ast_str_append(&values, 0, "%s%s", rowcount ? "," : "", S_OR(piece, ""));
+				ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", ast_str_set_escapecommas(&escapebuf, 0, name, INT_MAX));
+				ast_str_append(&values, 0, "%s%s", rowcount ? "," : "", ast_str_set_escapecommas(&escapebuf, 0, S_OR(piece, ""), INT_MAX));
 				rowcount++;
 			}
 			pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", ast_str_buffer(fields));