summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-08 11:57:32 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-08 11:57:32 +0200
commitb808c2524f690a454ed723a32dd929270d2445b5 (patch)
tree7808a5eedd8c1aa2acc307c8d6f984fce96b3536
parentd2523072aaf7a7a98bf92a64daf6287fad9072c3 (diff)
parent215d2a6d345b180b56bd0f37c0de567c7abef40f (diff)
downloadrsyslog-b808c2524f690a454ed723a32dd929270d2445b5.tar.gz
rsyslog-b808c2524f690a454ed723a32dd929270d2445b5.tar.xz
rsyslog-b808c2524f690a454ed723a32dd929270d2445b5.zip
Merge branch 'beta'
-rw-r--r--ChangeLog1
-rw-r--r--plugins/omsnmp/omsnmp.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7861f88d..00abf02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ Version 3.15.0 (rgerhards), 2008-04-01
---------------------------------------------------------------------------
Version 3.14.2 (rgerhards), 2008-04-??
- bugfix: segfault with expression-based filters
+- bugfix: omsnmp did not deref errmsg object on exit (no bad effects caused)
- some cleanup
---------------------------------------------------------------------------
Version 3.14.1 (rgerhards), 2008-04-04
diff --git a/plugins/omsnmp/omsnmp.c b/plugins/omsnmp/omsnmp.c
index 47afe2fd..1deb9d62 100644
--- a/plugins/omsnmp/omsnmp.c
+++ b/plugins/omsnmp/omsnmp.c
@@ -489,6 +489,9 @@ CODESTARTmodExit
free(pszSnmpTrapOID);
if (pszSyslogMessageOID != NULL)
free(pszSyslogMessageOID);
+
+ /* release what we no longer need */
+ objRelease(errmsg, CORE_COMPONENT);
ENDmodExit