Merged revisions 294988 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r294988 | tilghman | 2010-11-15 01:42:39 -0600 (Mon, 15 Nov 2010) | 8 lines

  It is possible to crash Asterisk by feeding the curl engine invalid data.

  (closes issue #18161)
   Reported by: wdoekes
   Patches:
         20101029__issue18161.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@294989 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 92d0b9729e2b0a2753d8fc7b6066d607d0eee988..d6c440257ec02ffe0c8dee4c37507958e1cef1ce 100644 (file)
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -529,8 +529,11 @@ static int acf_curl_helper(struct ast_channel *chan, const char *cmd, char *info
                        struct ast_str *fields = ast_str_create(ast_str_strlen(str) / 2);
                        struct ast_str *values = ast_str_create(ast_str_strlen(str) / 2);
                        int rowcount = 0;
-                       while ((piece = strsep(&remainder, "&"))) {
+                       while (fields && values && (piece = strsep(&remainder, "&"))) {
                                char *name = strsep(&piece, "=");
+                               if (!piece) {
+                                       piece = "";
+                               }
                                ast_uri_decode(piece);
                                ast_uri_decode(name);
                                ast_str_append(&fields, 0, "%s%s", rowcount ? "," : "", name);