rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 14:30:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3869 from kortemik/fix-ATRHEFB

Browse Source 
fix transactional on remove HardErrors
This commit is contained in:
Rainer Gerhards 2019-11-27 12:18:30 +01:00 committed by GitHub
commit fc3eae5ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
action.c
View File

@ -1495,7 +1495,7 @@ actionTryRemoveHardErrorsFromBatch(action_t *__restrict__ const pThis, wti_t *__
sizeof(actWrkrIParams_t) * pThis->iNumTpls);
ret = actionTryCommit(pThis, pWti, oneParamSet, 1);
if(ret == RS_RET_SUSPENDED) {
memcpy(new_iparams + *new_nMsgs, &oneParamSet,
memcpy(new_iparams + (*new_nMsgs * pThis->iNumTpls), &oneParamSet,
sizeof(actWrkrIParams_t) * pThis->iNumTpls);
++(*new_nMsgs);
} else if(ret != RS_RET_OK) {
@ -1515,7 +1515,7 @@ actionCommit(action_t *__restrict__ const pThis, wti_t *__restrict__ const pWti)
{
actWrkrInfo_t *const wrkrInfo = &(pWti->actWrkrInfo[pThis->iActionNbr]);
/* Variables that permit us to override the batch of messages */
unsigned nMsgs;
unsigned nMsgs = 0;
actWrkrIParams_t *iparams = NULL;
int needfree_iparams = 0; // work-around for clang static analyzer false positive
DEFiRet;