summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-07 14:44:12 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-07 14:44:12 +0200
commitd53016962da179c52ad22600bd54ffd58f86a81c (patch)
treef557da4c02f73f13df76347078d7bc2388fdd89d /action.c
parentcacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1 (diff)
parentbd8d972a975ce794dd71c1c8db724991dd4744a0 (diff)
downloadrsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.tar.gz
rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.tar.xz
rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.zip
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts: configure.ac doc/manual.html
Diffstat (limited to 'action.c')
-rw-r--r--action.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/action.c b/action.c
index 18ae622b..c732bcfe 100644
--- a/action.c
+++ b/action.c
@@ -827,8 +827,9 @@ static rsRetVal releaseBatch(action_t *pAction, batch_t *pBatch)
if(((uchar**)ppMsgs)[j] != NULL) {
jArr = 0;
while(ppMsgs[j][jArr] != NULL) {
- d_free(ppMsgs[j][jArr++]);
- ppMsgs[j][jArr++] = NULL;
+ d_free(ppMsgs[j][jArr]);
+ ppMsgs[j][jArr] = NULL;
+ ++jArr;
}
d_free(((uchar**)ppMsgs)[j]);
((uchar**)ppMsgs)[j] = NULL;