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

revert my pass through the tree to remove checks of the result of ast_strdupa

Browse Source 
(revisions 8378 through 8381)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-01-21 17:50:04 +00:00
parent fbdc8ce317
commit 9fa6eb5e07
51 changed files with 544 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
funcs/func_cdr.c
View File

@@ -64,6 +64,10 @@ 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);
@@ -89,6 +93,10 @@ 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);

9
funcs/func_cut.c
View File

@@ -83,7 +83,10 @@ static int sort_internal(struct ast_channel *chan, char *data, char *buffer, siz
return ERROR_NOARG;
}
strings = ast_strdupa(data);
strings = ast_strdupa((char *)data);
if (!strings) {
return ERROR_NOMEM;
}
for (ptrkey = strings; *ptrkey; ptrkey++) {
if (*ptrkey == '|') {
@@ -140,6 +143,10 @@ 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);

15
funcs/func_logic.c
View File

@@ -55,7 +55,10 @@ static char *builtin_function_iftime(struct ast_channel *chan, char *cmd, char *
char *iftrue;
char *iffalse;
data = ast_strdupa(data);
if (!(data = ast_strdupa(data))) {
ast_log(LOG_WARNING, "Memory Error!\n");
return NULL;
}
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
@@ -92,7 +95,10 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data
char *iftrue;
char *iffalse;
data = ast_strdupa(data);
if (!(data = ast_strdupa(data))) {
ast_log(LOG_WARNING, "Memory Error!\n");
return NULL;
}
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
@@ -123,7 +129,10 @@ static char *builtin_function_set(struct ast_channel *chan, char *cmd, char *dat
char *varname;
char *val;
data = ast_strdupa(data);
if (!(data = ast_strdupa(data))) {
ast_log(LOG_WARNING, "Memory Error!\n");
return NULL;
}
varname = strsep(&data, "=");
val = data;

4
funcs/func_math.c
View File

@@ -89,6 +89,10 @@ 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);

4
funcs/func_md5.c
View File

@@ -68,6 +68,10 @@ 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);

11
funcs/func_odbc.c
View File

@@ -108,6 +108,12 @@ 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
@@ -260,6 +266,11 @@ 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++;

7
funcs/func_rand.c
View File

@@ -55,7 +55,12 @@ static char *acf_rand_exec(struct ast_channel *chan, char *cmd, char *data, char
LOCAL_USER_ACF_ADD(u);
s = ast_strdupa(data);
if (!(s = ast_strdupa(data))) {
ast_log(LOG_WARNING, "Out of memory\n");
*buffer = '\0';
LOCAL_USER_REMOVE(u);
return buffer;
}
ast_app_separate_args(s, '|', args, sizeof(args) / sizeof(args[0]));

21
funcs/func_strings.c
View File

@@ -52,6 +52,11 @@ 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) {
@@ -86,6 +91,10 @@ 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);
@@ -132,6 +141,10 @@ 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, '"');
@@ -172,6 +185,10 @@ 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,
@@ -260,6 +277,10 @@ 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);