kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 155395 via svnmerge from

Browse Source 
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
This commit is contained in:
Tilghman Lesher
2008-11-07 22:05:52 +00:00
parent 0e9aaff2e0
commit 8e002b0e52
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
funcs/func_odbc.c
View File

@@ -277,6 +277,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
return -1; return -1;
} }
ast_str_reset(colnames);
AST_RWLIST_RDLOCK(&queries); AST_RWLIST_RDLOCK(&queries);
AST_RWLIST_TRAVERSE(&queries, query, list) { AST_RWLIST_TRAVERSE(&queries, query, list) {
if (!strcmp(query->acf->name, cmd)) { 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]; colnames->str[colnames->used++] = colname[i];
if (colname[i] == '\0') { if (colname[i] == '\0') {
colnames->used--;
break; break;
} }
} }