From df62b4c015b042ad2cca2593892e55fe28315668 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 16 Oct 2013 13:14:21 +0200 Subject: preparing for 7.4.5 --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2653fac..7e7e92b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 7.4.5 [v7.4-stable] 2013-09-?? +Version 7.4.5 [v7.4-stable] 2013-10-22 - mmanon: removed the check for specific "terminator characters" after last octet. As it turned out, this didn't work in practice as there was an enormous set of potential terminator chars -- so removing diff --git a/configure.ac b/configure.ac index 849cf8ca..c57df5f5 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],[7.4.4],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.4.5],[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 dc6453bc..801804e6 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ professional services 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 7.4.4 (v7.4-stable branch) of rsyslog. +

This documentation is for version 7.4.5 (v7.4-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 5bf1afd637326a8a88ca6a511d0fbd922d5e815c Mon Sep 17 00:00:00 2001 From: Pavel Levshin Date: Thu, 24 Oct 2013 16:21:33 +0200 Subject: bugfix: Segmentation fault on incorrect variable assignment --- runtime/msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runtime/msg.c b/runtime/msg.c index 03906070..10ecf48a 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3934,6 +3934,12 @@ msgAddJSON(msg_t *pM, uchar *name, struct json_object *json) } leaf = jsonPathGetLeaf(name, ustrlen(name)); CHKiRet(jsonPathFindParent(pM, name, leaf, &parent, 1)); + if (json_object_get_type(parent) != json_type_object) { + DBGPRINTF("msgAddJSON: not a container in json path," + "name is '%s'\n", name); + json_object_put(json); + ABORT_FINALIZE(RS_RET_INVLD_SETOP); + } leafnode = json_object_object_get(parent, (char*)leaf); if(leafnode == NULL) { json_object_object_add(parent, (char*)leaf, json); -- cgit v1.2.3 From 79148e10312b12f3341aa68a5c9525cbe6e37a4d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 24 Oct 2013 16:23:13 +0200 Subject: doc: update ChangeLog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7e7e92b0..961663db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ --------------------------------------------------------------------------- +Version 7.4.6 [v7.4-stable] 2013-11-?? +- bugfix: segfault if variable was assigned to non-container subtree + Thanks to Pavel Levshin for the fix +--------------------------------------------------------------------------- Version 7.4.5 [v7.4-stable] 2013-10-22 - mmanon: removed the check for specific "terminator characters" after last octet. As it turned out, this didn't work in practice as there -- cgit v1.2.3