diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 16:54:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 16:54:34 +0200 |
| commit | cb9761627630dc8aeafbbfcfe091f87b66b5a92a (patch) | |
| tree | d3db6668c167d0354bfdd3a1423f2e9da39c1175 /runtime | |
| parent | e13537ce909e8e6ab0b9d404c1e4870980c6dacf (diff) | |
| download | rsyslog-cb9761627630dc8aeafbbfcfe091f87b66b5a92a.tar.gz rsyslog-cb9761627630dc8aeafbbfcfe091f87b66b5a92a.tar.xz rsyslog-cb9761627630dc8aeafbbfcfe091f87b66b5a92a.zip | |
RFC5424 formatted messages with only structured data and no MSG part were improperly handled.
This was a regression of one of the last bugfixes, so no previously released
version contained this bug (thus it does not show up in the ChangeLog).
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/datetime.c | 5 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/runtime/datetime.c b/runtime/datetime.c index fc56b27c..99caaf97 100644 --- a/runtime/datetime.c +++ b/runtime/datetime.c @@ -213,18 +213,21 @@ ParseTIMESTAMP3339(struct syslogTime *pTime, uchar** ppszTS, int *pLenStr) */ if(lenStr == 0 || *pszTS++ != '-') ABORT_FINALIZE(RS_RET_INVLD_TIME); + --lenStr; month = srSLMGParseInt32(&pszTS, &lenStr); if(month < 1 || month > 12) ABORT_FINALIZE(RS_RET_INVLD_TIME); if(lenStr == 0 || *pszTS++ != '-') ABORT_FINALIZE(RS_RET_INVLD_TIME); + --lenStr; day = srSLMGParseInt32(&pszTS, &lenStr); if(day < 1 || day > 31) ABORT_FINALIZE(RS_RET_INVLD_TIME); if(lenStr == 0 || *pszTS++ != 'T') ABORT_FINALIZE(RS_RET_INVLD_TIME); + --lenStr; hour = srSLMGParseInt32(&pszTS, &lenStr); if(hour < 0 || hour > 23) @@ -232,12 +235,14 @@ ParseTIMESTAMP3339(struct syslogTime *pTime, uchar** ppszTS, int *pLenStr) if(lenStr == 0 || *pszTS++ != ':') ABORT_FINALIZE(RS_RET_INVLD_TIME); + --lenStr; minute = srSLMGParseInt32(&pszTS, &lenStr); if(minute < 0 || minute > 59) ABORT_FINALIZE(RS_RET_INVLD_TIME); if(lenStr == 0 || *pszTS++ != ':') ABORT_FINALIZE(RS_RET_INVLD_TIME); + --lenStr; second = srSLMGParseInt32(&pszTS, &lenStr); if(second < 0 || second > 60) ABORT_FINALIZE(RS_RET_INVLD_TIME); diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 13b54731..835fff27 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -280,7 +280,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_ACTION_FAILED = -2123, /**< action failed and is now suspended (consider this permanent for the time being) */ RS_RET_NONFATAL_CONFIG_ERR = -2124, /**< non-fatal error during config processing */ RS_RET_FILENAME_INVALID = -2140, /**< filename invalid, not found, no access, ... */ - RS_RET_EMPTY_MSG = -2141, /**< provided (raw) MSG is empty */ + RS_RET_EMPTY_MSG = -2143, /**< provided (raw) MSG is empty */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |