From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 24 Aug 2010 12:51:46 +0000 (+0000)
Subject: Merged revisions 283350 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2424
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2de5bbc89fa281f137ddeba1cfe5a3c65b86c31e;p=thirdparty%2Fasterisk.git

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.
........


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

diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 55c06f4f6f..7f2de02fcb 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -502,8 +502,10 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
 		if (stmt) {
 			break;
 		}
-		ast_odbc_release_obj(obj);
-		obj = NULL;
+		if (obj) {
+			ast_odbc_release_obj(obj);
+			obj = NULL;
+		}
 	}
 
 	if (!stmt) {