Skip to content

Fix the error handling on wc_PKCS7_DecodeAuthEnvelopedData #10629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
douzzer merged 1 commit into from
Jun 8, 2026
+6 −2
Merged

Fix the error handling on wc_PKCS7_DecodeAuthEnvelopedData #10629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions wolfcrypt/src/pkcs7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15319,8 +15319,12 @@ int wc_PKCS7_DecodeAuthEnvelopedData(wc_PKCS7* pkcs7, byte* in,
encryptedContent, encryptedContentSz, encryptedContent,
pkcs7->devId, pkcs7->heap);
if (ret != 0) {
XFREE(encryptedContent, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
return ret;
/* Fall through to the shared error handler below, which
* ForceZeros and frees encryptedContent, nulls
* stream->bufferPt/key, and resets the stream. Returning
* here would leave a dangling stream->bufferPt and risk a
* use-after-free / double-free on streaming re-entry. */
Comment thread
yosuke-wolfssl marked this conversation as resolved.
break;
}

if (encodedAttribs != NULL) {
Expand Down
Loading