Check result of ast_var_assign() calls for memory allocation failure.

We try to keep the system running even when all available memory is
spent.

Review: https://reviewboard.asterisk.org/r/2734/
........

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

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

diff --git a/apps/app_playback.c b/apps/app_playback.c
index e5672a557e47c868806cd59fd25497ccdcdc3a8c..0ba44562a4c26fb851ba9e4d24af331114971856 100644 (file)
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -212,6 +212,10 @@ static int do_say(say_args_t *a, const char *s, const char *options, int depth)
                s = x + 1;
        ast_debug(2, "value is <%s>\n", s);
        n = ast_var_assign("SAY", s);
+       if (!n) {
+               ast_log(LOG_ERROR, "Memory allocation error in do_say\n");
+               return -1;
+       }
        AST_LIST_INSERT_HEAD(&head, n, entries);
 
        /* scan the body, one piece at a time */

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 73731be6b511547d3b2bd5c40688c105a0e31ed1..2e982b956c30a043a6feb4262bd964d444d3be32 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -245,8 +245,9 @@ static int frame_set_var(struct ast_channel *chan, struct gosub_stack_frame *fra
        }
 
        if (!found) {
-               variables = ast_var_assign(var, "");
-               AST_LIST_INSERT_HEAD(&frame->varshead, variables, entries);
+               if ((variables = ast_var_assign(var, ""))) {
+                       AST_LIST_INSERT_HEAD(&frame->varshead, variables, entries);
+               }
                pbx_builtin_pushvar_helper(chan, var, value);
        } else {
                pbx_builtin_setvar_helper(chan, var, value);

diff --git a/funcs/func_global.c b/funcs/func_global.c
index 0a4b89dae31c6bc8ffb0087c025d5347b4eb3c06..405ac0b92f99a07fe4e7ad606f148758c03ae5ef 100644 (file)
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -253,15 +253,16 @@ static int shared_write(struct ast_channel *chan, const char *cmd, char *data, c
        }
        AST_LIST_TRAVERSE_SAFE_END;
 
-       var = ast_var_assign(args.var, S_OR(value, ""));
-       AST_LIST_INSERT_HEAD(varshead, var, entries);
-       manager_event(EVENT_FLAG_DIALPLAN, "VarSet", 
-               "Channel: %s\r\n"
-               "Variable: SHARED(%s)\r\n"
-               "Value: %s\r\n"
-               "Uniqueid: %s\r\n", 
-               chan ? ast_channel_name(chan) : "none", args.var, value, 
-               chan ? ast_channel_uniqueid(chan) : "none");
+       if ((var = ast_var_assign(args.var, S_OR(value, "")))) {
+               AST_LIST_INSERT_HEAD(varshead, var, entries);
+               manager_event(EVENT_FLAG_DIALPLAN, "VarSet", 
+                       "Channel: %s\r\n"
+                       "Variable: SHARED(%s)\r\n"
+                       "Value: %s\r\n"
+                       "Uniqueid: %s\r\n", 
+                       chan ? ast_channel_name(chan) : "none", args.var, value, 
+                       chan ? ast_channel_uniqueid(chan) : "none");
+       }
 
        ast_channel_unlock(chan);
 

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index a642823992eb8a51e9ed081d59a4b7451fcf918d..2294b8a4202fd473758c3d7702fc2bcf42b50296 100644 (file)
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -1698,6 +1698,12 @@ AST_TEST_DEFINE(test_FIELDNUM)
 
        for (i = 0; i < ARRAY_LEN(test_args); i++) {
                struct ast_var_t *var = ast_var_assign("FIELDS", test_args[i].fields);
+               if (!var) {
+                       ast_test_status_update(test, "Out of memory\n");
+                       res = AST_TEST_FAIL;
+                       break;
+               }
+
                AST_LIST_INSERT_HEAD(ast_channel_varshead(chan), var, entries);
 
                snprintf(expression, sizeof(expression), "${FIELDNUM(%s,%s,%s)}", var->name, test_args[i].delim, test_args[i].field);

diff --git a/main/cdr.c b/main/cdr.c
index 186aabf74b0a33de1becaf453b4ea999c5245dd1..e6088076a60566365a9331847e00bd3474c80767 100644 (file)
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -383,8 +383,7 @@ int ast_cdr_setvar(struct ast_cdr *cdr, const char *name, const char *value, int
                }
                AST_LIST_TRAVERSE_SAFE_END;
 
-               if (value) {
-                       newvariable = ast_var_assign(name, value);
+               if (value && (newvariable = ast_var_assign(name, value))) {
                        AST_LIST_INSERT_HEAD(headp, newvariable, entries);
                }
        }
@@ -408,8 +407,8 @@ int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr)
        AST_LIST_TRAVERSE(headpa,variables,entries) {
                if (variables &&
                    (var = ast_var_name(variables)) && (val = ast_var_value(variables)) &&
-                   !ast_strlen_zero(var) && !ast_strlen_zero(val)) {
-                       newvariable = ast_var_assign(var, val);
+                   !ast_strlen_zero(var) && !ast_strlen_zero(val) &&
+                   (newvariable = ast_var_assign(var, val))) {
                        AST_LIST_INSERT_HEAD(headpb, newvariable, entries);
                        x++;
                }

diff --git a/main/pbx.c b/main/pbx.c
index 607cffbc6a6fdf2cc2b23c39ca96c42c960bb7d0..40d9aa5e43b7be7dca7adb797348eb6ef30e13f6 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -11332,10 +11332,9 @@ void pbx_builtin_pushvar_helper(struct ast_channel *chan, const char *name, cons
                headp = &globals;
        }
 
-       if (value) {
+       if (value && (newvariable = ast_var_assign(name, value))) {
                if (headp == &globals)
                        ast_verb(2, "Setting global variable '%s' to '%s'\n", name, value);
-               newvariable = ast_var_assign(name, value);
                AST_LIST_INSERT_HEAD(headp, newvariable, entries);
        }
 
@@ -11382,10 +11381,9 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const
        }
        AST_LIST_TRAVERSE_SAFE_END;
 
-       if (value) {
+       if (value && (newvariable = ast_var_assign(name, value))) {
                if (headp == &globals)
                        ast_verb(2, "Setting global variable '%s' to '%s'\n", name, value);
-               newvariable = ast_var_assign(name, value);
                AST_LIST_INSERT_HEAD(headp, newvariable, entries);
                /*** DOCUMENTATION
                        <managerEventInstance>

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index e7abf0c8359aa76eb7463cd427aaa8b95c1908ac..9946a7d36291c1fe2e0a80555655c896ecf29fc7 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -598,14 +598,18 @@ static int dundi_lookup_local(struct dundi_result *dr, struct dundi_mapping *map
                        ast_eid_to_str(dr[anscnt].eid_str, sizeof(dr[anscnt].eid_str), &dr[anscnt].eid);
                        if (ast_test_flag(&flags, DUNDI_FLAG_EXISTS)) {
                                AST_LIST_HEAD_INIT_NOLOCK(&headp);
-                               newvariable = ast_var_assign("NUMBER", called_number);
-                               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
-                               newvariable = ast_var_assign("EID", dr[anscnt].eid_str);
-                               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
-                               newvariable = ast_var_assign("SECRET", cursecret);
-                               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
-                               newvariable = ast_var_assign("IPADDR", ipaddr);
-                               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+                               if ((newvariable = ast_var_assign("NUMBER", called_number))) {
+                                       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+                               }
+                               if ((newvariable = ast_var_assign("EID", dr[anscnt].eid_str))) {
+                                       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+                               }
+                               if ((newvariable = ast_var_assign("SECRET", cursecret))) {
+                                       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+                               }
+                               if ((newvariable = ast_var_assign("IPADDR", ipaddr))) {
+                                       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+                               }
                                pbx_substitute_variables_varshead(&headp, map->dest, dr[anscnt].dest, sizeof(dr[anscnt].dest));
                                dr[anscnt].weight = get_mapping_weight(map, &headp);
                                while ((newvariable = AST_LIST_REMOVE_HEAD(&headp, entries)))

diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index 5f3561343496b93320f00d89d9faec1bded2613e..dc9e7c7acc12af24f2b2986a4c7074e43b6c23eb 100644 (file)
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -91,12 +91,15 @@ static char *loopback_subst(char *buf, int buflen, const char *exten, const char
 
        snprintf(tmp, sizeof(tmp), "%d", priority);
        AST_LIST_HEAD_INIT_NOLOCK(&headp);
-       newvariable = ast_var_assign("EXTEN", exten);
-       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
-       newvariable = ast_var_assign("CONTEXT", context);
-       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
-       newvariable = ast_var_assign("PRIORITY", tmp);
-       AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+       if ((newvariable = ast_var_assign("EXTEN", exten))) {
+               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+       }
+       if ((newvariable = ast_var_assign("CONTEXT", context))) {
+               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+       }
+       if ((newvariable = ast_var_assign("PRIORITY", tmp))) {
+               AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
+       }
        /* Substitute variables */
        pbx_substitute_variables_varshead(&headp, data, buf, buflen);
        /* free the list */

diff --git a/utils/extconf.c b/utils/extconf.c
index 3c2d695247b0abb1583ea96c663979d55008e645..99df9e9ec1e59caf4f3ff3378b4d1f841f26225b 100644 (file)
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -3149,10 +3149,9 @@ static void pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name
                }
        }
 
-       if (value) {
+       if (value && (newvariable = ast_var_assign(name, value))) {
                if ((option_verbose > 1) && (headp == &globals))
                        ast_verbose(VERBOSE_PREFIX_2 "Setting global variable '%s' to '%s'\n", name, value);
-               newvariable = ast_var_assign(name, value);
                AST_LIST_INSERT_HEAD(headp, newvariable, entries);
        }