diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-01-21 17:50:04 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-01-21 17:50:04 +0000 |
| commit | 9fa6eb5e07ad37d5a9043b5f4d23431d58c88325 (patch) | |
| tree | a0057e266407ad019e0b495dd566584d47b50da5 /funcs/func_odbc.c | |
| parent | fbdc8ce317eacca50018748cb850ef317964af21 (diff) | |
revert my pass through the tree to remove checks of the result of ast_strdupa
(revisions 8378 through 8381)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_odbc.c')
| -rw-r--r-- | funcs/func_odbc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 7c34b5c0f..3e0f52fea 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -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++; |