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

Merged revisions 316094 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316094 | tilghman | 2011-05-02 14:09:55 -0500 (Mon, 02 May 2011) | 15 lines
  
  Merged revisions 316093 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r316093 | tilghman | 2011-05-02 14:04:36 -0500 (Mon, 02 May 2011) | 8 lines
    
    More possible crashes based upon invalid inputs.
    
    (closes issue #18161)
     Reported by: wdoekes
     Patches: 
           20110301__issue18161.diff.txt uploaded by tilghman (license 14)
     Tested by: wdoekes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2011-05-02 19:15:46 +00:00
parent 7c3d14957b
commit 1fca95b1d4
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
funcs/func_curl.c
View File

@@ -582,6 +582,10 @@ static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info
*buf = '\0'; *buf = '\0';
} }
if (!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);
@@ -651,21 +655,22 @@ static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info
int rowcount = 0; int rowcount = 0;
while (fields && values && (piece = strsep(&remainder, "&"))) { while (fields && values && (piece = strsep(&remainder, "&"))) {
char *name = strsep(&piece, "="); char *name = strsep(&piece, "=");
if (!piece) {
piece = "";
}
/* Do this before the decode, because if something has encoded /* Do this before the decode, because if something has encoded
* a literal plus-sign, we don't want to translate that to a * a literal plus-sign, we don't want to translate that to a
* space. */ * space. */
if (hashcompat == HASHCOMPAT_LEGACY) { if (hashcompat == HASHCOMPAT_LEGACY) {
ast_uri_decode(piece, ast_uri_http_legacy); if (piece) {
ast_uri_decode(piece, ast_uri_http_legacy);
}
ast_uri_decode(name, ast_uri_http_legacy); ast_uri_decode(name, ast_uri_http_legacy);
} else { } else {
ast_uri_decode(piece, ast_uri_http); if (piece) {
ast_uri_decode(piece, ast_uri_http);
}
ast_uri_decode(name, ast_uri_http); ast_uri_decode(name, ast_uri_http);
} }
ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name); ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name);
ast_str_append(&values, 0, "%s%s", rowcount ? "," : "", piece); ast_str_append(&values, 0, "%s%s", rowcount ? "," : "", S_OR(piece, ""));
rowcount++; rowcount++;
} }
pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", ast_str_buffer(fields)); pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", ast_str_buffer(fields));