diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 09:16:50 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 09:16:50 +0100 |
| commit | dcf3e763194fce727ac3050bf6d2adbeef983530 (patch) | |
| tree | 2266085b5cccc2ecab7399083080d134b4777eda /runtime/msg.c | |
| parent | b83e124aa772347a5b2f7d010dcc6f12b056a0a0 (diff) | |
| parent | 55d6eef1be47df7312e8e59a64ad9b0de6298f2f (diff) | |
| download | rsyslog-dcf3e763194fce727ac3050bf6d2adbeef983530.tar.gz rsyslog-dcf3e763194fce727ac3050bf6d2adbeef983530.tar.bz2 rsyslog-dcf3e763194fce727ac3050bf6d2adbeef983530.zip | |
Merge branch 'v7-stable' into v7-stable-libnet-frag
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 09f6d649..10605ba4 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3027,6 +3027,8 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, */ ; /*DO NOTHING*/ } else { + if(iTo > bufLen) /* iTo is very large, if no to-position is set in the template! */ + iTo = bufLen; iLen = iTo - iFrom + 1; /* the +1 is for an actual char, NOT \0! */ pBufStart = pBuf = MALLOC((iLen + 1) * sizeof(char)); if(pBuf == NULL) { |