diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 11:10:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 11:10:51 +0200 |
| commit | 3d914eb90cd7aed1342a01c5993f8c2de4cd1283 (patch) | |
| tree | 46046d3136b5ca4fd864813b36b62d330a9c9559 /runtime/msg.c | |
| parent | 39b35a32b4a45ccb6506e15b02780c30ca8c3973 (diff) | |
| parent | 9d59080b4a43ca6d19bece357cb1132374a2116a (diff) | |
| download | rsyslog-3d914eb90cd7aed1342a01c5993f8c2de4cd1283.tar.gz rsyslog-3d914eb90cd7aed1342a01c5993f8c2de4cd1283.tar.bz2 rsyslog-3d914eb90cd7aed1342a01c5993f8c2de4cd1283.zip | |
Merge branch 'master' into master-imjournal
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index c302a050..a5c52810 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3230,13 +3230,18 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, uchar *pSb; iFrom = pTpe->data.field.iFromPos; iTo = pTpe->data.field.iToPos; - /* need to zero-base to and from (they are 1-based!) */ - if(iFrom > 0) - --iFrom; - if(iTo > 0) - --iTo; if(bufLen == -1) bufLen = ustrlen(pRes); + if(pTpe->data.field.options.bFromPosEndRelative) { + iFrom = (bufLen < iFrom) ? 0 : bufLen - iFrom; + iTo = (bufLen < iTo)? 0 : bufLen - iTo; + } else { + /* need to zero-base to and from (they are 1-based!) */ + if(iFrom > 0) + --iFrom; + if(iTo > 0) + --iTo; + } if(iFrom == 0 && iTo >= bufLen) { /* in this case, the requested string is a superset of what we already have, * so there is no need to do any processing. This is a frequent case for size-limited |