Skip to content

Commit

Permalink
Merge pull request #8093 from philljj/fix_coverity
Browse files Browse the repository at this point in the history
Fix coverity
  • Loading branch information
JacobBarthelmeh authored Oct 21, 2024
2 parents 104c805 + 5690af8 commit b535d9f
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 14 deletions.
27 changes: 18 additions & 9 deletions src/internal.c
Original file line number Diff line number Diff line change
Expand Up @@ -13587,21 +13587,28 @@ static int ProcessCSR_ex(WOLFSSL* ssl, byte* input, word32* inOutIdx,

#ifdef WOLFSSL_SMALL_STACK
status = (CertStatus*)XMALLOC(sizeof(CertStatus), ssl->heap,
DYNAMIC_TYPE_OCSP_STATUS);
DYNAMIC_TYPE_OCSP_STATUS);
single = (OcspEntry*)XMALLOC(sizeof(OcspEntry), ssl->heap,
DYNAMIC_TYPE_OCSP_ENTRY);
DYNAMIC_TYPE_OCSP_ENTRY);
response = (OcspResponse*)XMALLOC(sizeof(OcspResponse), ssl->heap,
DYNAMIC_TYPE_OCSP_REQUEST);
DYNAMIC_TYPE_OCSP_REQUEST);

if (status == NULL || single == NULL || response == NULL) {
XFREE(status, ssl->heap, DYNAMIC_TYPE_OCSP_STATUS);
XFREE(single, ssl->heap, DYNAMIC_TYPE_OCSP_ENTRY);
XFREE(response, ssl->heap, DYNAMIC_TYPE_OCSP_REQUEST);
if (status != NULL) {
XFREE(status, ssl->heap, DYNAMIC_TYPE_OCSP_STATUS);
}
if (single != NULL) {
XFREE(single, ssl->heap, DYNAMIC_TYPE_OCSP_ENTRY);
}
if (response != NULL) {
XFREE(response, ssl->heap, DYNAMIC_TYPE_OCSP_REQUEST);
}

return MEMORY_ERROR;
}
#endif

/* InitOcspResponse sets single and status to response struct. */
InitOcspResponse(response, single, status, input +*inOutIdx, status_length, ssl->heap);

if (OcspResponseDecode(response, SSL_CM(ssl), ssl->heap, 0) != 0)
Expand All @@ -13622,12 +13629,14 @@ static int ProcessCSR_ex(WOLFSSL* ssl, byte* input, word32* inOutIdx,

*inOutIdx += status_length;

/* FreeOcspResponse frees status and single only if
* single->isDynamic is set. */
FreeOcspResponse(response);

#ifdef WOLFSSL_SMALL_STACK
XFREE(status, ssl->heap, DYNAMIC_TYPE_OCSP_STATUS);
XFREE(single, ssl->heap, DYNAMIC_TYPE_OCSP_ENTRY);
XFREE(response, ssl->heap, DYNAMIC_TYPE_OCSP_REQUEST);
XFREE(status, ssl->heap, DYNAMIC_TYPE_OCSP_STATUS);
XFREE(single, ssl->heap, DYNAMIC_TYPE_OCSP_ENTRY);
XFREE(response, ssl->heap, DYNAMIC_TYPE_OCSP_REQUEST);
#endif

WOLFSSL_LEAVE("ProcessCSR", ret);
Expand Down
4 changes: 3 additions & 1 deletion wolfcrypt/src/sp_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -12429,8 +12429,10 @@ static int _sp_invmod_div(const sp_int* a, const sp_int* m, sp_int* x,

ALLOC_SP_INT(d, m->used + 1, err, NULL);
if (err == MP_OKAY) {
sp_init_size(d, m->used + 1);
err = sp_init_size(d, m->used + 1);
}

if (err == MP_OKAY) {
/* 1. x = m, y = a, b = 1, c = 0 */
if (a != y) {
_sp_copy(a, y);
Expand Down
25 changes: 21 additions & 4 deletions wolfcrypt/test/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -33731,6 +33731,8 @@ static wc_test_ret_t ecc_ctx_kdf_salt_test(WC_RNG* rng, ecc_key* a, ecc_key* b)
word32 plaintextLen;
word32 encryptLen = MAX_ECIES_TEST_SZ;
word32 decryptLen = MAX_ECIES_TEST_SZ;
int aInit = 0;
int bInit = 0;

#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
plaintext = XMALLOC(MAX_ECIES_TEST_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
Expand All @@ -33742,12 +33744,22 @@ static wc_test_ret_t ecc_ctx_kdf_salt_test(WC_RNG* rng, ecc_key* a, ecc_key* b)
wc_ecc_free(b);

ret = wc_ecc_init(a);
if (ret != 0)
if (ret != 0) {
ret = WC_TEST_RET_ENC_EC(ret);
}
else {
aInit = 1;
}


if (ret == 0) {
ret = wc_ecc_init(b);
if (ret != 0)
if (ret != 0) {
ret = WC_TEST_RET_ENC_EC(ret);
}
else {
bInit = 1;
}
}

if (ret == 0)
Expand Down Expand Up @@ -33809,8 +33821,13 @@ static wc_test_ret_t ecc_ctx_kdf_salt_test(WC_RNG* rng, ecc_key* a, ecc_key* b)
if (ret == 0 && XMEMCMP(decrypted, plaintext, plaintextLen) != 0)
ret = WC_TEST_RET_ENC_NC;

wc_ecc_free(a);
wc_ecc_free(b);
if (aInit) {
wc_ecc_free(a);
}

if (bInit) {
wc_ecc_free(b);
}

wc_ecc_ctx_free(aCtx);
wc_ecc_ctx_free(bCtx);
Expand Down

0 comments on commit b535d9f

Please sign in to comment.