diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-02 11:22:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-02 11:22:06 +0200 |
| commit | c7ccf7d322cd3a404f03609d74fb8184a7906707 (patch) | |
| tree | 43e51dab738d8b921b063bb2ff0b03423b9c2714 | |
| parent | 8812ffd58b59724c1bf5c1cae8c37740524274c4 (diff) | |
| parent | f50511a348b5717c93494a1bab93a9d24ef65df3 (diff) | |
| download | rsyslog-c7ccf7d322cd3a404f03609d74fb8184a7906707.tar.gz rsyslog-c7ccf7d322cd3a404f03609d74fb8184a7906707.tar.bz2 rsyslog-c7ccf7d322cd3a404f03609d74fb8184a7906707.zip | |
Merge branch 'v5-stable' into v6-stable
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | tests/complex1.sh | 4 | ||||
| -rw-r--r-- | tests/tcpflood.c | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -582,6 +582,8 @@ Version 5.10.1 [V5-STABLE], 2012-0?-?? Thanks to pilou@gmx.com for the bug report - bugfix: remove invalid socket option call from imuxsock Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom +- bugfix: fixed wrong bufferlength for snprintf in tcpflood.c when using + the -f (dynafiles) option. --------------------------------------------------------------------------- Version 5.10.0 [V5-STABLE], 2012-08-23 diff --git a/tests/complex1.sh b/tests/complex1.sh index e138bff5..56ff15d6 100755 --- a/tests/complex1.sh +++ b/tests/complex1.sh @@ -7,8 +7,8 @@ echo =========================================================================== echo TEST: \[complex1.sh\]: complex test with gzip and multiple action queues source $srcdir/diag.sh init # uncomment for debugging support: -#export RSYSLOG_DEBUG="debug nostdout" -#export RSYSLOG_DEBUGLOG="log" +export RSYSLOG_DEBUG="debug nostdout" +export RSYSLOG_DEBUGLOG="log" source $srcdir/diag.sh startup complex1.conf # send 40,000 messages of 400 bytes plus header max, via three dest ports source $srcdir/diag.sh tcpflood -m40000 -rd400 -P129 -f5 -n3 -c15 -i1 diff --git a/tests/tcpflood.c b/tests/tcpflood.c index f3a89c77..8fd347f1 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -360,7 +360,7 @@ genMsg(char *buf, size_t maxBuf, int *pLenBuf, struct instdata *inst) } while(!done); /* Attention: do..while()! */ } else if(MsgToSend == NULL) { if(dynFileIDs > 0) { - snprintf(dynFileIDBuf, maxBuf, "%d:", rand() % dynFileIDs); + snprintf(dynFileIDBuf, sizeof(dynFileIDBuf), "%d:", rand() % dynFileIDs); } if(extraDataLen == 0) { *pLenBuf = snprintf(buf, maxBuf, "<%s>Mar 1 01:00:00 172.20.245.8 tag msgnum:%s%8.8d:%c", |