rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 02:40:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v7-stable' into v8-stable

Browse Source
This commit is contained in:
Rainer Gerhards 2014-10-02 12:27:30 +02:00
commit 04487fceae
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -436,6 +436,8 @@ Version 7.6.7 [v7.6-stable] 2014-10-02
- bugfix: the fix for CVE-2014-3634 did not handle all cases - bugfix: the fix for CVE-2014-3634 did not handle all cases
This is corrected now. This is corrected now.
see also: CVE-2014-3683 see also: CVE-2014-3683
- fixed a build problem on some platforms
Thanks to Olaf for the patch
- behaviour change: "msg" of messages with invalid PRI set to "rawmsg" - behaviour change: "msg" of messages with invalid PRI set to "rawmsg"
When the PRI is invalid, the rest of the header cannot be valid. So When the PRI is invalid, the rest of the header cannot be valid. So
we move all of it to MSG and do not try to parse it out. Note that we move all of it to MSG and do not try to parse it out. Note that

2
grammar/lexer.l
View File

@ -31,7 +31,7 @@
%{ %{
#include "config.h" #include "config.h"
#include "parserif.h" #include "parserif.h"
extern char *strdup(char*); /* somehow we do not get this from string.h... */ extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
%} %}
%option noyywrap nodefault case-insensitive yylineno %option noyywrap nodefault case-insensitive yylineno