Tomas Heinrich
1c14e33c2b
bugfix: check array bounds
2014-07-11 15:19:43 +02:00
Rainer Gerhards
6f30d69e10
Merge branch 'v8-stable'
2014-07-11 12:19:50 +02:00
Rainer Gerhards
ff4213524c
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
action.c
2014-07-11 12:19:41 +02:00
Tomas Heinrich
69bb859fdc
bugfix: relax a too strict condition
2014-07-11 11:50:28 +02:00
Tomas Heinrich
bbe7382ffc
bugfix: prevent division by zero
...
The result is set to 0 in that case. Might be better to do something
else in the future, but at least it'll stop crashing for now.
2014-07-11 11:50:28 +02:00
Tomas Heinrich
a171072f2b
bugfix: prevent passing NULL to strstr, strlen
2014-07-11 11:50:28 +02:00
Tomas Heinrich
dfdb4e20b2
Use uchar instead of char for type size reference
2014-07-11 11:50:28 +02:00
Tomas Heinrich
4332f88bd9
bugfix: allocate correct object type
2014-07-11 11:50:28 +02:00
Rainer Gerhards
09b4492f0a
Merge branch 'master' into master-timezone-def
...
Conflicts:
grammar/lexer.l
grammar/rainerscript.h
2014-07-09 15:01:23 +02:00
Rainer Gerhards
27ba29abfc
implement parse() config object
...
including the necessary plumbing to support multiple parser
instances
2014-07-08 20:44:43 +02:00
Rainer Gerhards
9bb5db3455
timezone() object: prep work
2014-07-08 16:42:09 +02:00
Rainer Gerhards
68307718c1
Merge branch 'v8-stable'
2014-05-28 12:13:40 +02:00
Rainer Gerhards
93cf514504
Merge branch 'v7-stable' into v8-stable
2014-05-28 12:13:27 +02:00
Rainer Gerhards
8e81842a4d
fix compiler warnings on 64bit platforms
2014-05-28 12:12:31 +02:00
Rainer Gerhards
517415b892
Merge branch 'v8-stable'
2014-05-23 14:15:47 +02:00
Rainer Gerhards
5783e276b4
Merge branch 'v7-stable' into v8-stable
2014-05-23 14:15:38 +02:00
Rainer Gerhards
ae621d776c
update license to ASL 2.0
...
got OK from contributor Christiano Rolim, so we are now
ready to change
2014-05-23 12:51:00 +02:00
Rainer Gerhards
b8dd2fbb66
Merge branch 'v8-stable'
2014-05-22 15:44:30 +02:00
Rainer Gerhards
618bd2844c
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
grammar/grammar.y
2014-05-22 15:44:22 +02:00
Rainer Gerhards
e06d8242c9
update license to ASL 2.0
2014-05-22 15:33:24 +02:00
Rainer Gerhards
92bd631e4f
bugfix: build problems with lexer.l on some platforms
...
For some reason, the strdup() prototype and others are missing. I admit
that I don't know why, as this happens only in 8.3.0+ and there is no
indication of changes to the affected files. In any case, we need to
fix this, and the current solution works at least as an interim one.
2014-04-15 15:11:23 +02:00
Rainer Gerhards
a6b6bf306d
fix build problems on solaris
2014-04-08 12:11:57 +02:00
Rainer Gerhards
f7ad21626f
silence compiler warnings
...
mostly cosmetic things
2014-03-16 10:52:54 +01:00
Rainer Gerhards
5c6d7552c1
silence compiler warnings
...
mostly cosmetic things
2014-03-12 14:47:33 +01:00
Rainer Gerhards
c535b2de3d
Merge branch 'v7-devel'
...
Conflicts:
tests/Makefile.am
2014-01-17 16:04:55 +01:00
Rainer Gerhards
fffb600ea2
Merge branch 'v7-stable' into v7-devel
2014-01-17 16:03:49 +01:00
Rainer Gerhards
260f4b6b3d
bugfix: RainerScript != did not work correctly with JSON variables
2014-01-17 15:57:58 +01:00
Rainer Gerhards
efc2822082
bugfix: RainerScript > did not work correctly with JSON variables
2014-01-17 15:49:39 +01:00
Rainer Gerhards
5cfd0714a4
bugfix: RainerScript < did not work correctly with JSON variables
2014-01-17 15:42:54 +01:00
Rainer Gerhards
a0cb41ee9c
bugfix: RainerScript >= did not work correctly with JSON variables
2014-01-17 15:37:36 +01:00
Rainer Gerhards
9e0f3b15bd
Merge branch 'v7-stable' into v7-devel
...
Conflicts:
ChangeLog
2014-01-17 15:22:07 +01:00
Rainer Gerhards
afac0d5d86
fix double free (introduced this morning)
2014-01-17 15:09:45 +01:00
Rainer Gerhards
c4000c1dc6
fix double free (introduced this morning)
2014-01-17 15:09:10 +01:00
Rainer Gerhards
72fb283368
bugfix: potential double-free in RainerScript equal comparison
...
happens if the left-hand operand is JSON object and the right-hand
operand is a non-string that does not convert to a number (for
example, it can be another JSON object, probably the only case that
could happen in practice). This is very unlikely to be triggered.
2014-01-17 10:11:24 +01:00
Rainer Gerhards
f5debc5eef
Merge branch 'v7-devel'
...
Conflicts:
grammar/rainerscript.c
2014-01-17 10:04:39 +01:00
Rainer Gerhards
558df372aa
Merge branch 'v7-stable' into v7-devel
2014-01-17 10:00:42 +01:00
Rainer Gerhards
8185c57d6a
bugfix: CMP_LE expression eval worked incorrectly for JSON/String comparisons
2014-01-17 09:59:50 +01:00
Rainer Gerhards
af4639a7cc
Merge branch 'v7-devel' into master-exec-template
2013-12-19 17:19:03 +01:00
Rainer Gerhards
dc8c26d115
fix invalid free introduced by exec_template()
2013-12-19 17:18:23 +01:00
Rainer Gerhards
aa43e15a57
fix merge problems (interfaces have changed)
2013-12-19 17:12:47 +01:00
Rainer Gerhards
907dcb5e75
Merge branch 'v7-devel' into master-exec-template
2013-12-19 16:52:48 +01:00
Rainer Gerhards
3e76bde213
add exec_template() RainerScript function
2013-12-19 15:59:22 +01:00
Rainer Gerhards
89582a643d
applied const, __restrict__ qualifiers to RainerScript experession evaluation
2013-12-03 17:44:55 +01:00
Rainer Gerhards
c0e58be06b
Merge branch 'v7-devel'
...
Conflicts:
tests/Makefile.am
2013-11-20 14:17:39 +01:00
Rainer Gerhards
89030a107e
bugfix: RainerScript optimizer did not optimize PRI filters
...
things like "if $syslogfacility-text == "local3"" were not converted
to PRIFILT. This was a regression introduced in 7.5.6.
2013-11-20 14:10:08 +01:00
Rainer Gerhards
86f233164f
Merge branch 'v7-devel'
...
Conflicts:
ChangeLog
2013-11-19 11:43:51 +01:00
Rainer Gerhards
cc9db052a7
Merge branch 'v7-stable' into v7-devel
...
Conflicts:
ChangeLog
plugins/imuxsock/imuxsock.c
2013-11-19 10:45:53 +01:00
Rainer Gerhards
de652e16a8
bugfix: segfault on startup when certain script constructs are used
...
e.g. "if not $msg ..."
2013-11-19 10:39:21 +01:00
Rainer Gerhards
58477b825f
Merge branch 'master' into master-ruleeng
2013-11-07 17:29:43 +01:00
Rainer Gerhards
3bec3ef53e
emit warning message if output module with msg passing mode runs asynchronously
2013-11-07 15:37:13 +01:00
