diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index c5cadc7581113d9811650c503c63e0ccba4dfe65..e930f48806720168c27c1bcc32be713bba28d1e2 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -64,10 +64,6 @@ static char *builtin_function_cdr_read(struct ast_channel *chan, char *cmd, char
return NULL;
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory!\n");
- return NULL;
- }
AST_STANDARD_APP_ARGS(args, parse);
@@ -93,10 +89,6 @@ static void builtin_function_cdr_write(struct ast_channel *chan, char *cmd, char
return;
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory!\n");
- return;
- }
AST_STANDARD_APP_ARGS(args, parse);
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 1df47030e1e519482f5507b0c96487b6e0f114d6..fe53eedafcde9a37976e68a075492e935ba62c53 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -83,10 +83,7 @@ static int sort_internal(struct ast_channel *chan, char *data, char *buffer, siz
return ERROR_NOARG;
}
- strings = ast_strdupa((char *)data);
- if (!strings) {
- return ERROR_NOMEM;
- }
+ strings = ast_strdupa(data);
for (ptrkey = strings; *ptrkey; ptrkey++) {
if (*ptrkey == '|') {
@@ -143,10 +140,6 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size
memset(buffer, 0, buflen);
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory!\n");
- return ERROR_NOMEM;
- }
AST_STANDARD_APP_ARGS(args, parse);
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index d1d96abf3fe336244f19ab7484fc72bf39796670..5f324c6348a280d426fe39c07109468d77a31344 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -55,10 +55,7 @@ static char *builtin_function_iftime(struct ast_channel *chan, char *cmd, char *
char *iftrue;
char *iffalse;
- if (!(data = ast_strdupa(data))) {
- ast_log(LOG_WARNING, "Memory Error!\n");
- return NULL;
- }
+ data = ast_strdupa(data);
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
@@ -95,10 +92,7 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data
char *iftrue;
char *iffalse;
- if (!(data = ast_strdupa(data))) {
- ast_log(LOG_WARNING, "Memory Error!\n");
- return NULL;
- }
+ data = ast_strdupa(data);
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
@@ -129,10 +123,7 @@ static char *builtin_function_set(struct ast_channel *chan, char *cmd, char *dat
char *varname;
char *val;
- if (!(data = ast_strdupa(data))) {
- ast_log(LOG_WARNING, "Memory Error!\n");
- return NULL;
- }
+ data = ast_strdupa(data);
varname = strsep(&data, "=");
val = data;
diff --git a/funcs/func_math.c b/funcs/func_math.c
index d086fe30478ac487493684957d8565426585662c..fca53dd07ddd8af99d2a8918a1a9b74426794f49 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -89,10 +89,6 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
}
parse = ast_strdupa(data);
- if(!parse) {
- ast_log(LOG_ERROR, "Out of memory!\n");
- return NULL;
- }
AST_STANDARD_APP_ARGS(args, parse);
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 552e876ed8564a401dd75e60fe1d28077dbc4428..57c39753f8abb6d405662fc18c6eccb3c7331844 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -68,10 +68,6 @@ static char *builtin_function_checkmd5(struct ast_channel *chan, char *cmd, char
}
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory!\n");
- return NULL;
- }
AST_STANDARD_APP_ARGS(args, parse);
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 3e0f52fea02adc69518be33ab6cd726a45691e77..7c34b5c0fddcf7b19be930a71d349ce5c6cc6648 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -108,12 +108,6 @@ static void acf_odbc_write(struct ast_channel *chan, char *cmd, char *data, cons
t = "";
}
- if (!s || !t) {
- ast_log(LOG_ERROR, "Out of memory\n");
- ast_mutex_unlock(&query_lock);
- return;
- }
-
/* XXX You might be tempted to change this section into using
* pbx_builtin_pushvar_helper(). However, note that if you try
* to set a NULL (like for VALUE), then nothing gets set, and the
@@ -266,11 +260,6 @@ static char *acf_odbc_read(struct ast_channel *chan, char *cmd, char *data, char
/* Parse our arguments */
s = ast_strdupa(data);
- if (!s) {
- ast_log(LOG_ERROR, "Out of memory\n");
- ast_mutex_unlock(&query_lock);
- return "";
- }
while ((arg = strsep(&s, "|"))) {
count++;
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index dbd82c941bd3f48655996df3f6ad82f7cc5cb4bc..196d2bad36dda2f25d8b5c9b1bb68de7c56dd17b 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -55,12 +55,7 @@ static char *acf_rand_exec(struct ast_channel *chan, char *cmd, char *data, char
LOCAL_USER_ACF_ADD(u);
- if (!(s = ast_strdupa(data))) {
- ast_log(LOG_WARNING, "Out of memory\n");
- *buffer = '\0';
- LOCAL_USER_REMOVE(u);
- return buffer;
- }
+ s = ast_strdupa(data);
ast_app_separate_args(s, '|', args, sizeof(args) / sizeof(args[0]));
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 9ea811f62b054b90f6d5ea0d4bdd6e6b582db18b..447ec8fb560fff036c4273bfa521d0cc260f0882 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -52,11 +52,6 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
);
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory\n");
- ast_copy_string(buf, "0", len);
- return buf;
- }
AST_STANDARD_APP_ARGS(args, parse);
if (args.delim) {
@@ -91,10 +86,6 @@ static char *builtin_function_filter(struct ast_channel *chan, char *cmd, char *
char *outbuf=buf;
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory");
- return "";
- }
AST_STANDARD_APP_ARGS(args, parse);
@@ -141,10 +132,6 @@ static char *builtin_function_regex(struct ast_channel *chan, char *cmd, char *d
ast_copy_string(buf, "0", len);
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory in %s(%s)\n", cmd, data);
- return buf;
- }
AST_NONSTANDARD_APP_ARGS(args, parse, '"');
@@ -185,10 +172,6 @@ static void builtin_function_array(struct ast_channel *chan, char *cmd, char *da
var = ast_strdupa(data);
value2 = ast_strdupa(value);
- if (!var || !value2) {
- ast_log(LOG_ERROR, "Out of memory\n");
- return;
- }
/* The functions this will generally be used with are SORT and ODBC_*, which
* both return comma-delimited lists. However, if somebody uses literal lists,
@@ -277,10 +260,6 @@ static char *acf_strftime(struct ast_channel *chan, char *cmd, char *data, char
}
parse = ast_strdupa(data);
- if (!parse) {
- ast_log(LOG_ERROR, "Out of memory\n");
- return buf;
- }
AST_STANDARD_APP_ARGS(args, parse);