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

Fix: silencing code analizer

Browse Source
This commit is contained in:
Allan Park 2016-11-08 15:02:38 +00:00
parent fe0d0f99ac
commit 960ad88fdd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/librsksi_read.c
View File

@ -2080,7 +2080,8 @@ skip_extention:
newrec.hdr[2] = (newrec.tlvlen >> 8) & 0xff;
newrec.hdr[3] = newrec.tlvlen & 0xff;
newrec.lenHdr = 4;
memcpy(newrec.data+iWr, der, lenDer);
if(der!=NULL && lenDer!=0)
memcpy(newrec.data+iWr, der, lenDer);
/* and finally copy back new record to existing one */
memcpy(rec, &newrec, sizeof(newrec)-sizeof(newrec.data)+newrec.tlvlen+4);
r = 0;
@ -2141,8 +2142,12 @@ verifyBLOCK_SIGKSI(block_sig_t *bs, ksifile ksi, FILE *sigfp, FILE *nsigfp,
/* Process the KSI signature if it is present */
if(file_bs->sig.der.data==NULL || file_bs->sig.der.len==0) {
if(rsksi_read_debug) printf("debug: verifyBLOCK_SIGKSI:\t\t KSI signature missing\n");
r = RSGTE_MISS_KSISIG;
goto done;
if(bExtend)
goto skip_ksi;
else {
r = RSGTE_MISS_KSISIG;
goto done;
}
}
/* Parse KSI Signature */
@ -2161,7 +2166,7 @@ verifyBLOCK_SIGKSI(block_sig_t *bs, ksifile ksi, FILE *sigfp, FILE *nsigfp,
if(rsksi_read_debug) printf("debug: verifyBLOCK_SIGKSI:\t\t KSI_Signature_verify failed with error: %s (%d)\n", KSI_getErrorString(ksistate), ksistate);
r = RSGTE_INVLD_SIGNATURE;
ectx->ksistate = ksistate;
goto skip_ksi;
goto done;
} else {
if(rsksi_read_debug) printf("debug: verifyBLOCK_SIGKSI:\t\t KSI_Signature_verify was successfull\n");
}