[svn-commits] dvossel: branch 1.6.1 r229095 - in /branches/1.6.1: ./ res/res_config_pgsql.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Nov 10 09:28:57 2009
New Revision: 229095

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

........
  r229093 | dvossel | 2009-11-10 09:27:45 -0600 (Tue, 10 Nov 2009) | 11 lines
  
  fixes pgsql double free of threadstorage
  
  A thread storage variable was being freed incorrectly, which
  resulted in a double free if two queries were made in the same thread.
  
  (closes issue #16011)
  Reported by: cristiandimache
  Patches:
        issue16011.diff uploaded by dvossel (license 671)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_config_pgsql.c

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

Modified: branches/1.6.1/res/res_config_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/res/res_config_pgsql.c?view=diff&rev=229095&r1=229094&r2=229095
==============================================================================
--- branches/1.6.1/res/res_config_pgsql.c (original)
+++ branches/1.6.1/res/res_config_pgsql.c Tue Nov 10 09:28:57 2009
@@ -667,7 +667,6 @@
 		ast_debug(1, "PostgreSQL RealTime: Query: %s\n", sql->str);
 		ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s\n", PQerrorMessage(pgsqlConn));
 		ast_mutex_unlock(&pgsql_lock);
-		ast_free(sql);
 		return -1;
 	} else {
 		ExecStatusType result_status = PQresultStatus(result);
@@ -680,14 +679,12 @@
 			ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n",
 						PQresultErrorMessage(result), PQresStatus(result_status));
 			ast_mutex_unlock(&pgsql_lock);
-			ast_free(sql);
 			return -1;
 		}
 	}
 
 	numrows = atoi(PQcmdTuples(result));
 	ast_mutex_unlock(&pgsql_lock);
-	ast_free(sql);
 
 	ast_debug(1, "PostgreSQL RealTime: Updated %d rows on table: %s\n", numrows, tablename);