Merged revisions 283350 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 24 Aug 2010 12:51:46 +0000 (12:51 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 24 Aug 2010 12:51:46 +0000 (12:51 +0000)
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

funcs/func_odbc.c

index 55c06f4..7f2de02 100644 (file)
@@ -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) {