[svn-commits] russell: trunk r283351 - in /trunk: ./ funcs/func_odbc.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Aug 24 07:51:46 2010
New Revision: 283351

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283351
Log:
Merged revisions 283350 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283350 | russell | 2010-08-24 07:49:41 -0500 (Tue, 24 Aug 2010) | 2 lines
  
  Don't attempt to release a NULL ODBC handle.
........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_odbc.c

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

Modified: trunk/funcs/func_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_odbc.c?view=diff&rev=283351&r1=283350&r2=283351
==============================================================================
--- trunk/funcs/func_odbc.c (original)
+++ trunk/funcs/func_odbc.c Tue Aug 24 07:51:46 2010
@@ -502,8 +502,10 @@
 		if (stmt) {
 			break;
 		}
-		ast_odbc_release_obj(obj);
-		obj = NULL;
+		if (obj) {
+			ast_odbc_release_obj(obj);
+			obj = NULL;
+		}
 	}
 
 	if (!stmt) {