Allow func_curl to exit gracefully if list allocation fails during write
authorMatthew Jordan <mjordan@digium.com>
Mon, 9 Apr 2012 21:47:54 +0000 (21:47 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 9 Apr 2012 21:47:54 +0000 (21:47 +0000)
If the global_curl_info data structure could not be allocated, the
datastore associated with the operation would be free'd, but the function
would not return.  This would later dereference the datastore, almost
certainly causing Asterisk to crash.  With this patch, if the data
structure is not allocated the method will return an error code, and
not attempt any further operation.
........

Merged revisions 361753 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 361754 from http://svn.asterisk.org/svn/asterisk/branches/10

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

funcs/func_curl.c

index e011461..a4328b9 100644 (file)
@@ -302,6 +302,7 @@ static int acf_curlopt_write(struct ast_channel *chan, const char *cmd, char *na
                        if (!(list = ast_calloc(1, sizeof(*list)))) {
                                ast_log(LOG_ERROR, "Unable to allocate list head.  Cannot set any CURL options\n");
                                ast_datastore_free(store);
+                               return -1;
                        }
 
                        store->data = list;