diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 16:35:13 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 16:35:13 +0200 |
commit | ab40107149038898ef24479a6911d9cd7770a56c (patch) | |
tree | 7a4bd016dd56583263c63e10808859c6ef848ffc /runtime | |
parent | 5221a1e42e16c8c39b48a4a1a18ee6322c38cd17 (diff) | |
parent | 9de685929e4c202d470e07ec28fda41a5efc8eaf (diff) | |
download | rsyslog-ab40107149038898ef24479a6911d9cd7770a56c.tar.gz rsyslog-ab40107149038898ef24479a6911d9cd7770a56c.tar.xz rsyslog-ab40107149038898ef24479a6911d9cd7770a56c.zip |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tests/nettester.c
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 63ed0083..d29da560 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2405,6 +2405,7 @@ char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, --iLen; } *pBuf = '\0'; + bufLen -= iLen; /* subtract remaining length if the string was smaller! */ if(*pbMustBeFreed == 1) free(pRes); pRes = pBufStart; @@ -2858,7 +2859,6 @@ char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, bufLen = strlen(pRes); *pPropLen = bufLen; - /*dbgprintf("MsgGetProp(\"%s\"): \"%s\"\n", pName, pRes); only for verbose debug logging */ ENDfunc return(pRes); } |