Merged revisions 70612 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 20 Jun 2007 23:33:49 +0000 (23:33 +0000)
committerJason Parker <jparker@digium.com>
Wed, 20 Jun 2007 23:33:49 +0000 (23:33 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r70612 | qwell | 2007-06-20 18:32:39 -0500 (Wed, 20 Jun 2007) | 4 lines

Fix some potential memory leaks in cdr_pgsql.

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

........

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

cdr/cdr_pgsql.c

index 4f3901c..2379d77 100644 (file)
@@ -87,8 +87,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);
                }
        }
 
@@ -144,6 +145,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;
@@ -161,6 +163,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);