From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 15 Feb 2011 07:02:45 +0000 (+0000)
Subject: Merged revisions 307836 via svnmerge from
X-Git-Tag: 1.8.4-rc1~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bff7dd69e01f4a4ba5c091e384d7274373a6de7b;p=thirdparty%2Fasterisk.git

Merged revisions 307836 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r307836 | tilghman | 2011-02-15 01:01:37 -0600 (Tue, 15 Feb 2011) | 8 lines

  Need to retrieve the rows affected before using the associated variable.

  (closes issue #18795)
   Reported by: irroot
   Patches:
         20110211__issue18795.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@307837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 7f2de02fcb..a5f02316f5 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -336,6 +336,10 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
 		}
 	}
 
+	if (stmt) {
+		SQLRowCount(stmt, &rows);
+	}
+
 	if (stmt && rows == 0 && ast_str_strlen(insertbuf) != 0) {
 		SQLCloseCursor(stmt);
 		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
@@ -356,7 +360,6 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
 		}
 	} else if (stmt) {
 		status = "SUCCESS";
-		SQLRowCount(stmt, &rows);
 	}
 
 	AST_RWLIST_UNLOCK(&queries);