diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-03 11:10:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-03 11:10:43 +0200 |
| commit | 438b274e959dd0e7426a13fabc3655ec7ebe2671 (patch) | |
| tree | 05e6238e4c919189aa57dd8395b6af12b662f4b5 | |
| parent | e861bcaa445d016f4671a7955f58007ae6486133 (diff) | |
| parent | c0e5c49526e011fa16d757f61ca9dd817ff35903 (diff) | |
| download | rsyslog-438b274e959dd0e7426a13fabc3655ec7ebe2671.tar.gz rsyslog-438b274e959dd0e7426a13fabc3655ec7ebe2671.tar.bz2 rsyslog-438b274e959dd0e7426a13fabc3655ec7ebe2671.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | tools/omfile.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -279,6 +279,15 @@ Version 7.3.0 [devel] 2012-10-09 This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new action parameter "VeryReliableZip". ---------------------------------------------------------------------------- +Version 7.2.8 [v7-stable] 2013-0?-?? +- bugfix: segfault due to invalid dynafile cache handling + Accidently, the old-style cache size parameter was used when the + dynafile cache was created in a RainerScript action. If the old-style + size was lower than the one actually set, this lead to misadressing + when the size was overrun, and that could lead to all kinds of + "interesting things", often in segfaults. + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=440 +---------------------------------------------------------------------------- Version 7.2.7 [v7-stable] 2013-04-17 - rsyslogd startup information is now properly conveyed back to init when privileges are beging dropped diff --git a/tools/omfile.c b/tools/omfile.c index 46d882bf..ba9f7f70 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -1200,7 +1200,7 @@ CODESTARTnewActInst // TODO: create unified code for this (legacy+v6 system) /* we now allocate the cache table */ CHKmalloc(pData->dynCache = (dynaFileCacheEntry**) - calloc(cs.iDynaFileCacheSize, sizeof(dynaFileCacheEntry*))); + calloc(pData->iDynaFileCacheSize, sizeof(dynaFileCacheEntry*))); pData->iCurrElt = -1; /* no current element */ } // TODO: add pData->iSizeLimit = 0; /* default value, use outchannels to configure! */ |