From 83a670b33357bd1d384e04b3897739de90be6144 Mon Sep 17 00:00:00 2001
From: root
Date: Wed, 10 Aug 2011 11:54:09 +0200
Subject: preparing for version 5.8.4
---
ChangeLog | 2 +-
configure.ac | 2 +-
doc/manual.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6be803e0..74fc007f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.8.4 [V5-stable] (al), 2011-??-??
+Version 5.8.4 [V5-stable] (al), 2011-08-10
- bugfix: potential misadressing in property replacer
- bugfix: memcpy overflow can occur in allowed sender checkig
if a name is resolved to IPv4-mapped-on-IPv6 address
diff --git a/configure.ac b/configure.ac
index 427c0b05..2706ec06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[5.8.3],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.8.4],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 2c13e275..a2c41227 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support available directly from the source!
Please visit the rsyslog sponsor's page
to honor the project sponsors or become one yourself! We are very grateful for any help towards the
project goals.
-This documentation is for version 5.8.3 (v5-stable branch) of rsyslog.
+
This documentation is for version 5.8.4 (v5-stable branch) of rsyslog.
Visit the rsyslog status page
to obtain current version information and project status.
If you like rsyslog, you might
--
cgit v1.2.3
From 5722fde8e93a351c0b72fb60a799c66548a7addb Mon Sep 17 00:00:00 2001
From: Andre Lorbach
Date: Wed, 10 Aug 2011 17:27:21 +0200
Subject: Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the
SyslogTag
The syslogtag of the duplicated message could get contain garbage at the end
as the string terminating NULL Byte was missing.
---
runtime/msg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/msg.c b/runtime/msg.c
index cc7b463d..9fdaded3 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -967,7 +967,7 @@ msg_t* MsgDup(msg_t* pOld)
*/
if(pOld->iLenTAG > 0) {
if(pOld->iLenTAG < CONF_TAG_BUFSIZE) {
- memcpy(pNew->TAG.szBuf, pOld->TAG.szBuf, pOld->iLenTAG);
+ memcpy(pNew->TAG.szBuf, pOld->TAG.szBuf, pOld->iLenTAG + 1);
} else {
if((pNew->TAG.pszTAG = srUtilStrDup(pOld->TAG.pszTAG, pOld->iLenTAG)) == NULL) {
msgDestruct(&pNew);
--
cgit v1.2.3
From d334f016a61b64b3a2eb37eca886bd5a88025469 Mon Sep 17 00:00:00 2001
From: Andre Lorbach
Date: Wed, 10 Aug 2011 17:34:55 +0200
Subject: added changelog entry
---
ChangeLog | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 74fc007f..655bec89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
---------------------------------------------------------------------------
+Version 5.8.5 [V5-stable] (al), 2011-??-??
+- bugfix: The NULL-Byte for the syslogtag was not copied in MsgDup (msg.c)
+---------------------------------------------------------------------------
Version 5.8.4 [V5-stable] (al), 2011-08-10
- bugfix: potential misadressing in property replacer
- bugfix: memcpy overflow can occur in allowed sender checkig
--
cgit v1.2.3
From 00d594348af514fbbbb5f581124ac524d507187f Mon Sep 17 00:00:00 2001
From: Andre Lorbach
Date: Wed, 10 Aug 2011 17:36:28 +0200
Subject: fixed typo in changelog
---
ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 655bec89..71ac7448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
---------------------------------------------------------------------------
Version 5.8.5 [V5-stable] (al), 2011-??-??
-- bugfix: The NULL-Byte for the syslogtag was not copied in MsgDup (msg.c)
+- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c)
---------------------------------------------------------------------------
Version 5.8.4 [V5-stable] (al), 2011-08-10
- bugfix: potential misadressing in property replacer
--
cgit v1.2.3