[asterisk-commits] tilghman: branch 1.6.1 r155396 - in /branches/1.6.1: ./ funcs/func_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Nov  7 16:05:52 2008
New Revision: 155396

URL: http://svn.digium.com/view/asterisk?view=rev&rev=155396
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_odbc.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/funcs/func_odbc.c?view=diff&rev=155396&r1=155395&r2=155396
==============================================================================
--- branches/1.6.1/funcs/func_odbc.c (original)
+++ branches/1.6.1/funcs/func_odbc.c Fri Nov  7 16:05:52 2008
@@ -277,6 +277,8 @@
 		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 @@
 					colnames->str[colnames->used++] = colname[i];
 
 					if (colname[i] == '\0') {
+						colnames->used--;
 						break;
 					}
 				}