mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 06:48:25 +00:00
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
This commit is contained in:
@@ -376,6 +376,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)) {
|
||||||
@@ -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];
|
colnames->str[colnames->used++] = colname[i];
|
||||||
|
|
||||||
if (colname[i] == '\0') {
|
if (colname[i] == '\0') {
|
||||||
|
colnames->used--;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user