diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 11:07:47 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 11:07:47 +0100 |
| commit | e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be (patch) | |
| tree | fd166a50fb1f6e3e59c4b16b80f29850fb13b6c1 | |
| parent | 7bccae395b83416be6bea2de69fdfcce46995acf (diff) | |
| parent | dfa88369d4ca4290db56b843f9eabdae1bfe0fd5 (diff) | |
| download | rsyslog-e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be.tar.gz rsyslog-e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be.tar.xz rsyslog-e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | runtime/queue.c | 5 |
2 files changed, 14 insertions, 1 deletions
@@ -1,4 +1,8 @@ --------------------------------------------------------------------------- +Version 5.7.6 [V5-BETA] (rgerhards), 2011-02-?? +- bugfix: memory leak when $RepeatedMsgReduction on was used + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 +--------------------------------------------------------------------------- Version 5.7.5 [V5-BETA] (rgerhards), 2011-02-23 - enhance: imfile did not yet support multiple rulesets, now added we do this directly in the beta because a) it does not affect existing @@ -93,8 +97,12 @@ Version 5.7.0 [V5-DEVEL] (rgerhards), 2010-09-16 thanks to Lennart Poettering for this patch * sd-systemd API added as part of rsyslog runtime library --------------------------------------------------------------------------- +Version 5.6.4 [V5-STABLE] (rgerhards), 2011-02-25 +- bugfix: memory leak when $RepeatedMsgReduction on was used + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 +--------------------------------------------------------------------------- Version 5.6.3 [V5-STABLE] (rgerhards), 2011-01-26 -- bugfix: action processor released mememory too early, resulting in +- bugfix: action processor released memory too early, resulting in potential issue in retry cases (but very unlikely due to another bug, which I also fixed -- only after the fix this problem here became actually visible). diff --git a/runtime/queue.c b/runtime/queue.c index 76327f6a..ef6e843b 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -842,6 +842,7 @@ static rsRetVal qAddDirect(qqueue_t *pThis, void* pUsr) { batch_t singleBatch; batch_obj_t batchObj; + int i; DEFiRet; //TODO: init batchObj (states _OK and new fields -- CHECK) @@ -863,6 +864,10 @@ static rsRetVal qAddDirect(qqueue_t *pThis, void* pUsr) singleBatch.nElem = 1; /* there always is only one in direct mode */ singleBatch.pElem = &batchObj; iRet = pThis->pConsumer(pThis->pUsr, &singleBatch, &pThis->bShutdownImmediate); + /* delete the batch string params: TODO: create its own "class" for this */ + for(i = 0 ; i < CONF_OMOD_NUMSTRINGS_MAXSIZE ; ++i) { + free(batchObj.staticActStrings[i]); + } objDestruct(pUsr); RETiRet; |