From 8dd9959735014aab70a65a9e8832cd1818ba210d Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Thu, 13 Oct 2011 10:43:59 +0200 Subject: bugfix: $ActionExecOnlyOnce interval did not work properly Signed-off-by: Rainer Gerhards --- action.c | 1 - 1 file changed, 1 deletion(-) (limited to 'action.c') diff --git a/action.c b/action.c index 5451ef13..119bb3ba 100644 --- a/action.c +++ b/action.c @@ -716,7 +716,6 @@ actionWriteToAction(action_t *pAction) DBGPRINTF("action not yet ready again to be executed, onceInterval %d, tCurr %d, tNext %d\n", (int) pAction->iSecsExecOnceInterval, (int) getActNow(pAction), (int) (pAction->iSecsExecOnceInterval + pAction->tLastExec)); - pAction->tLastExec = getActNow(pAction); /* re-init time flags */ FINALIZE; } -- cgit From e2836f5f430e63bd96502cca74dbc302938e5a23 Mon Sep 17 00:00:00 2001 From: Vlad Grigorescu Date: Mon, 17 Oct 2011 13:03:52 +0200 Subject: bugfix: ActionQueue could malfunction due to index error Signed-off-by: Rainer Gerhards --- action.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'action.c') diff --git a/action.c b/action.c index 951b4724..633b2664 100644 --- a/action.c +++ b/action.c @@ -767,7 +767,7 @@ finalize_it: */ static rsRetVal releaseBatch(action_t *pAction, batch_t *pBatch) { - int iArr; + int jArr; int i, j; batch_obj_t *pElem; uchar ***ppMsgs; @@ -781,15 +781,15 @@ static rsRetVal releaseBatch(action_t *pAction, batch_t *pBatch) switch(pAction->eParamPassing) { case ACT_ARRAY_PASSING: ppMsgs = (uchar***) pElem->staticActParams; - for(i = 0 ; i < pAction->iNumTpls ; ++i) { - if(((uchar**)ppMsgs)[i] != NULL) { - iArr = 0; - while(ppMsgs[i][iArr] != NULL) { - d_free(ppMsgs[i][iArr++]); - ppMsgs[i][iArr++] = NULL; + for(j = 0 ; j < pAction->iNumTpls ; ++j) { + if(((uchar**)ppMsgs)[j] != NULL) { + jArr = 0; + while(ppMsgs[j][jArr] != NULL) { + d_free(ppMsgs[j][jArr++]); + ppMsgs[j][jArr++] = NULL; } - d_free(((uchar**)ppMsgs)[i]); - ((uchar**)ppMsgs)[i] = NULL; + d_free(((uchar**)ppMsgs)[j]); + ((uchar**)ppMsgs)[j] = NULL; } } break; -- cgit