[svn-commits] murf: branch murf/bug8221-1.4 r59291 - in /team/murf/bug8221-1.4: ./ res/

[svn-commits at lists.digium.com]

Author: murf
Date: Wed Mar 28 12:50:24 2007
New Revision: 59291

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59291
Log:
Merged revisions 59289 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59289 | tilghman | 2007-03-27 21:38:09 -0600 (Tue, 27 Mar 2007) | 2 lines

Another crash that I thought we had fixed already - Issue 9396

........

Modified:
    team/murf/bug8221-1.4/   (props changed)
    team/murf/bug8221-1.4/res/res_odbc.c

Propchange: team/murf/bug8221-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 28 12:50:24 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-59286
+/branches/1.4:1-59290

Modified: team/murf/bug8221-1.4/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221-1.4/res/res_odbc.c?view=diff&rev=59291&r1=59290&r2=59291
==============================================================================
--- team/murf/bug8221-1.4/res/res_odbc.c (original)
+++ team/murf/bug8221-1.4/res/res_odbc.c Wed Mar 28 12:50:24 2007
@@ -142,7 +142,7 @@
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO) && (res != SQL_NO_DATA)) {
 		if (res == SQL_ERROR) {
 			SQLGetDiagField(SQL_HANDLE_STMT, stmt, 1, SQL_DIAG_NUMBER, &numfields, SQL_IS_INTEGER, &diagbytes);
-			for (i=0; i< numfields + 1; i++) {
+			for (i = 0; i < numfields; i++) {
 				SQLGetDiagRec(SQL_HANDLE_STMT, stmt, i + 1, state, &nativeerror, diagnostic, sizeof(diagnostic), &diagbytes);
 				ast_log(LOG_WARNING, "SQL Execute returned an error %d: %s: %s (%d)\n", res, state, diagnostic, diagbytes);
 				if (i > 10) {