kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
........

Merged revisions 396287 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Walter Doekes
2013-08-06 08:36:15 +00:00
parent c0f302e1e1
commit ccdfe67bf2
9 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
funcs/func_global.c
View File

@@ -282,11 +282,12 @@ 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);
if ((var = ast_var_assign(args.var, S_OR(value, "")))) {
AST_LIST_INSERT_HEAD(varshead, var, entries);
sprintf(shared_buffer, "SHARED(%s)", args.var);
ast_channel_publish_varset(chan, shared_buffer, value);
sprintf(shared_buffer, "SHARED(%s)", args.var);
ast_channel_publish_varset(chan, shared_buffer, value);
}
ast_channel_unlock(chan);

6
funcs/func_strings.c
View File

@@ -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);