diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:50:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:50:55 +0200 |
| commit | d72fe36f868ea12f246ed23bb81ece0240dd6c12 (patch) | |
| tree | ec1023ab0ad27589a6f425c79855f92f7637b686 /tcps_sess.c | |
| parent | f02d77f4b45d0a5a0ce86a87f056c91de1e4b731 (diff) | |
| parent | ebba229db9d89e69b60e542e3c49f25ed9ebc6fc (diff) | |
| download | rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.gz rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.xz rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.zip | |
Merge branch 'master' into newconf
Conflicts:
doc/manual.html
Diffstat (limited to 'tcps_sess.c')
| -rw-r--r-- | tcps_sess.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tcps_sess.c b/tcps_sess.c index 1ae065fa..99af0cb8 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -239,6 +239,11 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG ISOBJ_TYPE_assert(pThis, tcps_sess); + if(pThis->iMsg == 0) { + DBGPRINTF("discarding zero-sized message\n"); + FINALIZE; + } + if(pThis->DoSubmitMessage != NULL) { pThis->DoSubmitMessage(pThis, pThis->pMsg, pThis->iMsg); FINALIZE; @@ -477,8 +482,10 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen) CHKiRet(processDataRcvd(pThis, *pData++, &stTime, ttGenTime, &multiSub)); } - /* submit anything that was not yet submitted */ - CHKiRet(multiSubmitMsg(&multiSub)); + if(multiSub.nElem > 0) { + /* submit anything that was not yet submitted */ + CHKiRet(multiSubmitMsg(&multiSub)); + } finalize_it: RETiRet; |