summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-25 15:35:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-25 15:35:08 +0200
commitc030585a630902ddd56b303ede1bfd8612036579 (patch)
tree794d459843bb7b2b535217ff9d5cccabff37eae6 /action.c
parent9edcc0b6b286b2e0223d32fd7fd6bd66a405f2eb (diff)
downloadrsyslog-c030585a630902ddd56b303ede1bfd8612036579.tar.gz
rsyslog-c030585a630902ddd56b303ede1bfd8612036579.tar.xz
rsyslog-c030585a630902ddd56b303ede1bfd8612036579.zip
fix invalid state handling during action execution
could lead to execution of not-to-be-executed action. very recent regression.
Diffstat (limited to 'action.c')
-rw-r--r--action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/action.c b/action.c
index 8a3d8920..9c06f61e 100644
--- a/action.c
+++ b/action.c
@@ -1658,7 +1658,7 @@ doSubmitToActionQNotAllMarkBatch(action_t *pAction, batch_t *pBatch)
copyActive(pBatch);
for(i = 0 ; i < batchNumMsgs(pBatch) ; ++i) {
- if(!pBatch->active[i])
+ if((pBatch->pElem[i].state == BATCH_STATE_DISC) || !pBatch->active[i])
continue;
if(now == 0) {
now = datetime.GetTime(NULL); /* good time call - the only one done */