backporting bugfixes from 5.2.2

- bugfix: queues in direct mode could case a segfault, especially if an
  action failed for action queues. The issue was an invalid increment of
  a stack-based pointer which lead to destruction of the stack frame and
  thus a segfault on function return.
  Thanks to Michael Biebl for alerting us on this problem.
  [backport from 5.5.2]
- bugfix: wrong memory assignment for a config variable (probably
  without causing any harm) [backport from 5.2.2]

1 files changed, 2 insertions, 2 deletions

diff --git a/action.c b/action.c
index 67858742..aaf45593 100644
--- a/action.c
+++ b/action.c
@@ -924,12 +924,12 @@ submitBatch(action_t *pAction, batch_t *pBatch, int nElem, int *pbShutdownImmedi
 		} else if(localRet == RS_RET_ACTION_FAILED) {
 			/* in this case, the whole batch can not be processed */
 			for(i = 0 ; i < nElem ; ++i) {
-				pBatch->pElem[++pBatch->iDoneUpTo].state = BATCH_STATE_BAD;
+				pBatch->pElem[pBatch->iDoneUpTo++].state = BATCH_STATE_BAD;
 			}
 			bDone = 1;
 		} else {
 			if(nElem == 1) {
-				pBatch->pElem[++pBatch->iDoneUpTo].state = BATCH_STATE_BAD;
+				pBatch->pElem[pBatch->iDoneUpTo++].state = BATCH_STATE_BAD;
 				bDone = 1;
 			} else {
 				/* retry with half as much. Depth is log_2 batchsize, so recursion is not too deep */