diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 08:26:18 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-25 08:26:18 +0100 |
| commit | 648e84cad86a94d2f21ceed37e020fbed6a27b9d (patch) | |
| tree | 93f9dcff68b5aadd41f9b4ff8e919a0faa37979e /runtime/msg.c | |
| parent | 2f8b5cafd0dcc5f09b7b64f5015a2aebd1c7b31c (diff) | |
| parent | 841f841ce12e49659966db006f3f244e1f23b70e (diff) | |
| download | rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.tar.gz rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.tar.xz rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.zip | |
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 3a2331f4..2ce7843a 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2319,6 +2319,12 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, *pPropLen = sizeof("**INVALID PROPERTY NAME**") - 1; return UCHAR_CONSTANT("**INVALID PROPERTY NAME**"); } + /* the following line fixes the symptom, but not the root cause -- at least MSG sometimes + * returns a size of one too less. To prevent all troubles, we recalculate the sizes based + * on what we actually got. TODO: remove once root cause is found. + * rgerhards, 2010-03-23 + */ + bufLen = ustrlen(pRes); /* If we did not receive a template pointer, we are already done... */ |