diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-25 12:57:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-25 12:57:19 +0200 |
| commit | d732620f85168512d5bb7a8ecfd281b60da442c4 (patch) | |
| tree | bb2582640d02a986bed3932c42d06b0372670efc | |
| parent | 808bf660cf74a42428567d869c29bab207e87e9f (diff) | |
| parent | fbd9db49031d2e3d0cab98934ced3130611f03cb (diff) | |
| download | rsyslog-d732620f85168512d5bb7a8ecfd281b60da442c4.tar.gz rsyslog-d732620f85168512d5bb7a8ecfd281b60da442c4.tar.bz2 rsyslog-d732620f85168512d5bb7a8ecfd281b60da442c4.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/omhiredis/omhiredis.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -179,6 +179,8 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- Version 7.4.6 [v7.4-stable] 2013-11-?? +- bugfix: memory leak in omhiredis + Thanks to Pavel Levshin for the fix - bugfix: segfault if variable was assigned to non-container subtree Thanks to Pavel Levshin for the fix --------------------------------------------------------------------------- diff --git a/plugins/omhiredis/omhiredis.c b/plugins/omhiredis/omhiredis.c index 051ac0bf..7a35bac2 100644 --- a/plugins/omhiredis/omhiredis.c +++ b/plugins/omhiredis/omhiredis.c @@ -198,7 +198,7 @@ CODESTARTendTransaction /* TODO: add error checking here! */ free ( pData->replies[i] ); } - free ( pData->replies ); + freeReplyObject ( pData->replies ); pData->count = 0; ENDendTransaction |