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

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Nov  3 15:04:25 2008
New Revision: 154024

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154024
Log:
Recorded merge of revisions 154023 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r154023 | tilghman | 2008-11-03 15:01:30 -0600 (Mon, 03 Nov 2008) | 4 lines
  
  Should have passed the string pointer, not the ast_str structure.
  (closes issue #13830)
   Reported by: Marquis
........

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=154024&r1=154023&r2=154024
==============================================================================
--- branches/1.6.1/funcs/func_odbc.c (original)
+++ branches/1.6.1/funcs/func_odbc.c Mon Nov  3 15:04:25 2008
@@ -221,7 +221,7 @@
 		if (!ast_strlen_zero(query->writehandle[dsn])) {
 			obj = ast_odbc_request_obj(query->writehandle[dsn], 0);
 			if (obj)
-				stmt = ast_odbc_direct_execute(obj, generic_execute, buf);
+				stmt = ast_odbc_direct_execute(obj, generic_execute, buf->str);
 		}
 		if (stmt)
 			break;