generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pval must always be set when pk7_cb() does anything (Coverity ID 146).

Browse Source
This commit is contained in:
Ben Laurie 2008-12-26 15:29:02 +00:00
parent 44390fadc0
commit 5ceb595dfa
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/pkcs7/pk7_asn1.c
View File

@ -82,26 +82,23 @@ static int pk7_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
void *exarg) void *exarg)
{ {
ASN1_STREAM_ARG *sarg = exarg; ASN1_STREAM_ARG *sarg = exarg;
PKCS7 *p7; PKCS7 **pp7 = (PKCS7 **)pval;
if (pval)
p7 = (PKCS7 *)*pval;
else
p7 = NULL;
switch(operation) switch(operation)
{ {
case ASN1_OP_STREAM_PRE: case ASN1_OP_STREAM_PRE:
if (PKCS7_stream(&sarg->boundary, p7) <= 0) if (PKCS7_stream(&sarg->boundary, *pp7) <= 0)
return 0; return 0;
case ASN1_OP_DETACHED_PRE: case ASN1_OP_DETACHED_PRE:
sarg->ndef_bio = PKCS7_dataInit(p7, sarg->out); sarg->ndef_bio = PKCS7_dataInit(*pp7, sarg->out);
if (!sarg->ndef_bio) if (!sarg->ndef_bio)
return 0; return 0;
break; break;
case ASN1_OP_STREAM_POST: case ASN1_OP_STREAM_POST:
case ASN1_OP_DETACHED_POST: case ASN1_OP_DETACHED_POST:
if (PKCS7_dataFinal(p7, sarg->ndef_bio) <= 0) if (PKCS7_dataFinal(*pp7, sarg->ndef_bio) <= 0)
return 0; return 0;
break; break;