diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-12 12:50:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-12 12:50:43 +0100 |
| commit | f88291d561eb785317a39a644c53a0cf86633eaa (patch) | |
| tree | 9fbcb81e0741bf61007dd930d9be1140b3d79f83 | |
| parent | 3cb29f4e2b3053eaa3e2487161fc03fa730f5104 (diff) | |
| parent | 009738a0ac6ba0dccf403f9e396095f44e4f9ac6 (diff) | |
| download | rsyslog-f88291d561eb785317a39a644c53a0cf86633eaa.tar.gz rsyslog-f88291d561eb785317a39a644c53a0cf86633eaa.tar.xz rsyslog-f88291d561eb785317a39a644c53a0cf86633eaa.zip | |
Merge branch 'v4-beta-memleak' into v4-beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | tools/omfwd.c | 6 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,5 @@ +- fixed a memory leak when sending messages in zip-compressed format + Thanks to Naoya Nakazawa for analyzing this issue and providing a patch. --------------------------------------------------------------------------- Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18 - added a so-called "On Demand Debug" mode, in which debug output can diff --git a/tools/omfwd.c b/tools/omfwd.c index fe65f515..02f19eac 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -483,6 +483,12 @@ CODESTARTdoAction } } finalize_it: +# ifdef USE_NETZIP + if(psz != (char*) ppString[0]) { + /* we need to free temporary buffer, alloced above - Naoya Nakazawa, 2010-01-11 */ + free(psz); + } +# endif ENDdoAction |