From 62582c86537bcdcd34352e1818c67dca7d9affbf Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 15 Oct 2008 17:16:59 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149641 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_odbc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index edbc1dfd5d..f79d0f7a22 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);