diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 11:30:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-19 11:30:05 +0200 |
| commit | d486a25f18e0d74ca315aec341cddf0df4060f05 (patch) | |
| tree | 28967c4145182a4279c8d5f0c15e0df827e8da57 | |
| parent | c67e6cb79e3e5b1eaa61662abc7c830fa084b533 (diff) | |
| parent | e53c387e765011b71ea7de61addab4d5b1bb36d2 (diff) | |
| download | rsyslog-d486a25f18e0d74ca315aec341cddf0df4060f05.tar.gz rsyslog-d486a25f18e0d74ca315aec341cddf0df4060f05.tar.bz2 rsyslog-d486a25f18e0d74ca315aec341cddf0df4060f05.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/msg.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -69,6 +69,11 @@ Version 7.5.0 [devel] 2013-06-11 Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- Version 7.4.3 [v7.4-stable] 2013-07-18 +- bugfix: $QHOUR/$HHOUR were always "00" or "01" + regression some time between v5 and here + Thanks to forum user rjmcinty for reporting this bug +--------------------------------------------------------------------------- +Version 7.4.3 [v7.4-stable] 2013-07-18 - bugfix: memory leak if disk queues were used and json data present - bugfix: CEE/json data was lost during disk queue operation - bugfix: potential segfault during startup on invalid config diff --git a/runtime/msg.c b/runtime/msg.c index a227567e..67d957d1 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2495,10 +2495,10 @@ static uchar *getNOW(eNOWType eNow, struct syslogTime *t) memcpy(pBuf, two_digits[(int)t->hour], 3); break; case NOW_HHOUR: - memcpy(pBuf, two_digits[t->hour/30], 3); + memcpy(pBuf, two_digits[t->minute/30], 3); break; case NOW_QHOUR: - memcpy(pBuf, two_digits[t->hour/15], 3); + memcpy(pBuf, two_digits[t->minute/15], 3); break; case NOW_MINUTE: memcpy(pBuf, two_digits[(int)t->minute], 3); |