From: Jason Parker <jparker@digium.com>
Date: Wed, 20 Jun 2007 23:32:39 +0000 (+0000)
Subject: Fix some potential memory leaks in cdr_pgsql.
X-Git-Tag: 1.4.6~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b035606357ddc2e98afc070373c886722b3b0fd7;p=thirdparty%2Fasterisk.git

Fix some potential memory leaks in cdr_pgsql.

Issue 10020, patch by my, with credit to prashant_jois for pointing out the problem.


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

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 45e3e4af49..1521adaf0c 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -86,8 +86,9 @@ static int pgsql_log(struct ast_cdr *cdr)
 			connected = 1;
 		} else {
 			pgerror = PQerrorMessage(conn);
+			PQfinish(conn);
 			ast_log(LOG_ERROR, "cdr_pgsql: Unable to connect to database server %s.  Calls will not be logged!\n", pghostname);
-                        ast_log(LOG_ERROR, "cdr_pgsql: Reason: %s\n", pgerror);
+			ast_log(LOG_ERROR, "cdr_pgsql: Reason: %s\n", pgerror);
 		}
 	}
 
@@ -145,6 +146,7 @@ static int pgsql_log(struct ast_cdr *cdr)
 				connected = 1;
 			} else {
 				pgerror = PQerrorMessage(conn);
+				PQfinish(conn);
 				ast_log(LOG_ERROR, "cdr_pgsql: Unable to reconnect to database server %s. Calls will not be logged!\n", pghostname);
 				ast_log(LOG_ERROR, "cdr_pgsql: Reason: %s\n", pgerror);
 				connected = 0;
@@ -162,6 +164,7 @@ static int pgsql_log(struct ast_cdr *cdr)
 			if (PQstatus(conn) == CONNECTION_OK) {
 				ast_log(LOG_ERROR, "cdr_pgsql: Connection reestablished.\n");
 				connected = 1;
+				PQclear(result);
 				result = PQexec(conn, sqlcmd);
 				if (PQresultStatus(result) != PGRES_COMMAND_OK) {
 					pgerror = PQresultErrorMessage(result);