aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-24 12:51:46 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-24 12:51:46 +0000
commitaf0e6f9bc4ac59e4844040312c8db2ff00bc7a9c (patch)
tree03e65b1b582dfc4f3760bc6668d54f5c13c853a6
parentae85b852865c7abc4d99fe7d2e81957487d49fc3 (diff)
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: http://svn.digium.com/svn/asterisk/trunk@283351 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--funcs/func_odbc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 55c06f4f6..7f2de02fc 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) {