summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-11-18 12:32:34 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-11-18 12:32:34 +0100
commitc2fef48bd32ac6fcd6c8664976a39424187f4872 (patch)
treed70696a03678fe8356e61bbdf9d586846ff892a5
parent49dcad849e93551d90cd6298a576b67c4ad0c7ef (diff)
parent2f1c53dbfe5f1e4bd79adaf55a1aa48de8d83144 (diff)
downloadrsyslog-c2fef48bd32ac6fcd6c8664976a39424187f4872.tar.gz
rsyslog-c2fef48bd32ac6fcd6c8664976a39424187f4872.tar.xz
rsyslog-c2fef48bd32ac6fcd6c8664976a39424187f4872.zip
Merge branch 'v3-stable' into beta
-rw-r--r--ChangeLog4
-rw-r--r--plugins/ompgsql/ompgsql.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8303d495..f393cea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -976,6 +976,10 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
+Version 2.0.7 V2-STABLE (rgerhards), 2008-??-??
+- bugfix: memory leak in ompgsql
+ Thanks to Ken for providing the patch
+---------------------------------------------------------------------------
Version 2.0.6 V2-STABLE (rgerhards), 2008-??-??
- bugfix: memory leaks in rsyslogd, primarily in singlethread mode
Thanks to Frederico Nunez for providing the fix
diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c
index f8685672..7658f036 100644
--- a/plugins/ompgsql/ompgsql.c
+++ b/plugins/ompgsql/ompgsql.c
@@ -167,12 +167,12 @@ rsRetVal writePgSQL(uchar *psz, instanceData *pData)
dbgprintf("writePgSQL: %s", psz);
/* try insert */
- PQexec(pData->f_hpgsql, (char*)psz);
+ PQclear(PQexec(pData->f_hpgsql, (char*)psz));
if(PQstatus(pData->f_hpgsql) != CONNECTION_OK) {
/* error occured, try to re-init connection and retry */
closePgSQL(pData); /* close the current handle */
CHKiRet(initPgSQL(pData, 0)); /* try to re-open */
- PQexec(pData->f_hpgsql, (char*)psz);
+ PQclear(PQexec(pData->f_hpgsql, (char*)psz));
if(PQstatus(pData->f_hpgsql) != CONNECTION_OK) { /* re-try insert */
/* we failed, giving up for now */
reportDBError(pData, 0);