Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

1 files changed, 3 insertions, 2 deletions

diff --git a/action.c b/action.c
index b7003a2e..6c5c9653 100644
--- a/action.c
+++ b/action.c
@@ -791,8 +791,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;