kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Review: https://reviewboard.asterisk.org/r/1433


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@337325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2011-09-21 16:05:14 +00:00
parent f13c3b3fd2
commit 6c5fd2bc6b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
funcs/func_curl.c
View File

@@ -444,9 +444,11 @@ static void curl_instance_cleanup(void *data)
} }
AST_THREADSTORAGE_CUSTOM(curl_instance, curl_instance_init, curl_instance_cleanup); 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) 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); struct ast_str *str = ast_str_create(16);
int ret = -1; int ret = -1;
AST_DECLARE_APP_ARGS(args, AST_DECLARE_APP_ARGS(args,
@@ -467,6 +469,11 @@ static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info
return -1; return -1;
} }
if (!escapebuf) {
ast_free(str);
return -1;
}
if (ast_strlen_zero(info)) { if (ast_strlen_zero(info)) {
ast_log(LOG_WARNING, "CURL requires an argument (URL)\n"); ast_log(LOG_WARNING, "CURL requires an argument (URL)\n");
ast_free(str); ast_free(str);
@@ -540,8 +547,8 @@ static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info
ast_uri_decode(piece); ast_uri_decode(piece);
} }
ast_uri_decode(name); ast_uri_decode(name);
ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name); 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 ? "," : "", S_OR(piece, "")); ast_str_append(&values, 0, "%s%s", rowcount ? "," : "", ast_str_set_escapecommas(&escapebuf, 0, S_OR(piece, ""), INT_MAX));
rowcount++; rowcount++;
} }
pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", ast_str_buffer(fields)); pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", ast_str_buffer(fields));