summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-29 15:51:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-29 15:51:46 +0200
commitba5f628cbb43d6a4add15c6fab50e35b5c54c5b8 (patch)
tree74dbe259b64d8f6e839e5c99a7d99f2edaf32f2b /runtime/msg.c
parent40334847b685e6058be562b4436f72426637f4d8 (diff)
parentb397a80c88be0de6e7450bcbeb3524be98e572b6 (diff)
downloadrsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.gz
rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.bz2
rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.zip
Merge branch 'beta'
Conflicts: ChangeLog runtime/rsyslog.h
Diffstat (limited to 'runtime/msg.c')
-rw-r--r--runtime/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index ec3dbfa1..a7df6928 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2404,7 +2404,7 @@ jsonAddVal(uchar *pSrc, unsigned buflen, es_str_t **dst)
/* we hope we have only few escapes... */
*dst = es_newStr(buflen+10);
} else {
- *dst = es_newStrFromBuf((char*)pSrc, i-1);
+ *dst = es_newStrFromBuf((char*)pSrc, i);
}
if(*dst == NULL) {
ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);