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

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon May  2 14:15:46 2011
New Revision: 316095

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316095
Log:
Merged revisions 316094 via svnmerge from 
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
  ........
................

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-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=316095&r1=316094&r2=316095
==============================================================================
--- trunk/funcs/func_curl.c (original)
+++ trunk/funcs/func_curl.c Mon May  2 14:15:46 2011
@@ -582,6 +582,10 @@
 		*buf = '\0';
 	}
 
+	if (!str) {
+		return -1;
+	}
+
 	if (ast_strlen_zero(info)) {
 		ast_log(LOG_WARNING, "CURL requires an argument (URL)\n");
 		ast_free(str);
@@ -651,21 +655,22 @@
 			int rowcount = 0;
 			while (fields && values && (piece = strsep(&remainder, "&"))) {
 				char *name = strsep(&piece, "=");
-				if (!piece) {
-					piece = "";
-				}
 				/* Do this before the decode, because if something has encoded
 				 * a literal plus-sign, we don't want to translate that to a
 				 * space. */
 				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);
 				} 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_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++;
 			}
 			pbx_builtin_setvar_helper(chan, "~ODBCFIELDS~", ast_str_buffer(fields));