diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-11-07 22:03:50 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-11-07 22:03:50 +0000 |
| commit | 5434edd7ab7a9eb11254e209a43f72f637937a4b (patch) | |
| tree | 88394384a8e883d3375efe7df8c1a35ea0be66a8 | |
| parent | 2886af9785599bf513a9a6b2aaffa7cae9c67c33 (diff) | |
Two bugs relating to colnames found by Marquis42 on #asterisk-dev
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@155395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | funcs/func_odbc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index 23cc4f843..e0f4eb302 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -376,6 +376,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)) { @@ -531,6 +533,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; } } |