From 8e002b0e523576afbae14bccd872c010de56d623 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 7 Nov 2008 22:05:52 +0000
Subject: [PATCH] Merged revisions 155395 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r155395 | tilghman | 2008-11-07 16:03:50 -0600 (Fri, 07 Nov 2008) | 2 lines

  Two bugs relating to colnames found by Marquis42 on #asterisk-dev
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@155396 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 funcs/func_odbc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index d25a7e93cb..cc344be41e 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -277,6 +277,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
 		return -1;
 	}
 
+	ast_str_reset(colnames);
+
 	AST_RWLIST_RDLOCK(&queries);
 	AST_RWLIST_TRAVERSE(&queries, query, list) {
 		if (!strcmp(query->acf->name, cmd)) {
@@ -420,6 +422,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
 					colnames->str[colnames->used++] = colname[i];
 
 					if (colname[i] == '\0') {
+						colnames->used--;
 						break;
 					}
 				}