[svn-commits] tilghman: branch 1.6.0 r129764 - in /branches/1.6.0: ./ res/res_config_odbc.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jul 10 16:24:31 2008
New Revision: 129764

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129764
Log:
Merged revisions 129758 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r129758 | tilghman | 2008-07-10 16:23:23 -0500 (Thu, 10 Jul 2008) | 10 lines

Merged revisions 129741 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r129741 | tilghman | 2008-07-10 16:19:48 -0500 (Thu, 10 Jul 2008) | 2 lines

Oops

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_config_odbc.c

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

Modified: branches/1.6.0/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_odbc.c?view=diff&rev=129764&r1=129763&r2=129764
==============================================================================
--- branches/1.6.0/res/res_config_odbc.c (original)
+++ branches/1.6.0/res/res_config_odbc.c Thu Jul 10 16:24:31 2008
@@ -138,8 +138,10 @@
 	}
 
 	newparam = va_arg(aq, const char *);
-	if (!newparam)
-		return NULL;
+	if (!newparam) {
+		ast_odbc_release_obj(obj);
+		return NULL;
+	}
 	newval = va_arg(aq, const char *);
 	op = !strchr(newparam, ' ') ? " =" : "";
 	snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s ?%s", table, newparam, op,