diff options
Diffstat (limited to 'funcs/func_odbc.c')
-rw-r--r-- | funcs/func_odbc.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 944fc1da2..55c06f4f6 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -221,7 +221,7 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co struct ast_str *insertbuf = ast_str_thread_get(&sql2_buf, 16); const char *status = "FAILURE"; - if (!buf) { + if (!buf || !insertbuf) { return -1; } @@ -406,7 +406,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha struct ast_str *sql = ast_str_thread_get(&sql_buf, 16); const char *status = "FAILURE"; - if (!sql) { + if (!sql || !colnames) { if (chan) { pbx_builtin_setvar_helper(chan, "ODBCSTATUS", status); } @@ -567,6 +567,21 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha struct ast_str *coldata = ast_str_thread_get(&coldata_buf, 16); char *ptrcoldata; + if (!coldata) { + ast_free(resultset); + SQLCloseCursor(stmt); + SQLFreeHandle(SQL_HANDLE_STMT, stmt); + ast_odbc_release_obj(obj); + obj = NULL; + pbx_builtin_setvar_helper(chan, "ODBCSTATUS", "MEMERROR"); + if (chan) + ast_autoservice_stop(chan); + if (bogus_chan) { + ast_channel_release(chan); + } + return -1; + } + if (y == 0) { char colname[256]; SQLULEN maxcol; @@ -1126,6 +1141,11 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args char colname[256]; SQLULEN maxcol; + if (!coldata) { + AST_RWLIST_UNLOCK(&queries); + return CLI_SUCCESS; + } + for (dsn = 0; dsn < 5; dsn++) { if (ast_strlen_zero(query->readhandle[dsn])) { continue; |