diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-15 17:16:59 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-15 17:16:59 +0000 |
commit | 7be560203c02b332dbd38e2354f82627ff6215cb (patch) | |
tree | c9f9a0c7545acd00e927700f57e568d37728476b /funcs | |
parent | c04f02626dc9ec93c584fba77032a5d09b6aada7 (diff) |
Merged revisions 149640 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r149640 | tilghman | 2008-10-15 12:16:00 -0500 (Wed, 15 Oct 2008) | 2 lines
Only set buf to blank before the goto.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149641 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r-- | funcs/func_odbc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index edbc1dfd5..f79d0f7a2 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -450,6 +450,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) { ast_log(LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql->str); y = -1; + buf[0] = '\0'; goto end_acf_read; } @@ -518,8 +519,6 @@ end_acf_read: } odbc_store->data = resultset; ast_channel_datastore_add(chan, odbc_store); - } else { - buf[0] = '\0'; } SQLCloseCursor(stmt); SQLFreeHandle(SQL_HANDLE_STMT, stmt); |