[svn-commits] tilghman: trunk r129758 - in /trunk: ./ res/res_config_odbc.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jul 10 16:23:23 2008
New Revision: 129758

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129758
Log:
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:
    trunk/   (props changed)
    trunk/res/res_config_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=129758&r1=129757&r2=129758
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Thu Jul 10 16:23:23 2008
@@ -142,8 +142,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,