[asterisk-commits] tilghman: branch 1.6.2 r261947 - in /branches/1.6.2: ./ funcs/func_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri May  7 16:25:13 2010
New Revision: 261947

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261947
Log:
Merged revisions 261917 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r261917 | tilghman | 2010-05-07 15:54:35 -0500 (Fri, 07 May 2010) | 8 lines
  
  Double free crash
  
  (closes issue #17245)
   Reported by: thedavidfactor
   Patches: 
         20100426__issue17245.diff.txt uploaded by tilghman (license 14)
   Tested by: murraytm
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/funcs/func_odbc.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/funcs/func_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/funcs/func_odbc.c?view=diff&rev=261947&r1=261946&r2=261947
==============================================================================
--- branches/1.6.2/funcs/func_odbc.c (original)
+++ branches/1.6.2/funcs/func_odbc.c Fri May  7 16:25:13 2010
@@ -321,6 +321,7 @@
 
 		if (obj && !transactional) {
 			ast_odbc_release_obj(obj);
+			obj = NULL;
 		}
 	}
 
@@ -338,6 +339,10 @@
 				status = "FAILOVER";
 				SQLRowCount(stmt, &rows);
 				break;
+			}
+			if (obj) {
+				ast_odbc_release_obj(obj);
+				obj = NULL;
 			}
 		}
 	} else if (stmt) {
@@ -459,6 +464,10 @@
 		}
 		if (stmt) {
 			break;
+		}
+		if (obj) {
+			ast_odbc_release_obj(obj);
+			obj = NULL;
 		}
 	}