diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:33:37 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:33:37 +0200 |
commit | bfc6f6d599a4723b26708da5fddcc6db5c53fc21 (patch) | |
tree | 6a316f837808e735790fced62a46142f4cf6b9e6 /action.c | |
parent | da2039614ffd93b8fb1ebddf2ed3eb6dc873c1a5 (diff) | |
parent | a192300aa26484c88aedd306fdb92d7752eee427 (diff) | |
download | rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.tar.gz rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.tar.xz rsyslog-bfc6f6d599a4723b26708da5fddcc6db5c53fc21.zip |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
Diffstat (limited to 'action.c')
-rw-r--r-- | action.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -826,8 +826,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; |