mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-07-05 21:20:49 +02:00
Merge pull request #9975 from rlm2002/coverity
20260313 Coverity changes
This commit is contained in:
@@ -177,6 +177,16 @@ static int LoadFile(const char* filename, byte** buf, word32* bufSz, int* isPem)
|
||||
|
||||
/* Check if PEM format by looking for -----BEGIN */
|
||||
if (isPem) {
|
||||
/* Reallocate with space for null terminator for XSTRSTR */
|
||||
byte* tmp = (byte*)XREALLOC(*buf, (word32)sz + 1, NULL,
|
||||
DYNAMIC_TYPE_TMP_BUFFER);
|
||||
if (tmp == NULL) {
|
||||
XFREE(*buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
*buf = NULL;
|
||||
return MEMORY_E;
|
||||
}
|
||||
*buf = tmp;
|
||||
(*buf)[sz] = '\0';
|
||||
*isPem = (XSTRSTR((char*)*buf, "-----BEGIN") != NULL) ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -749,6 +759,9 @@ THREAD_RETURN WOLFSSL_THREAD ocsp_responder_test(void* args)
|
||||
opts.sendCerts = 1;
|
||||
opts.readyFile = NULL;
|
||||
|
||||
/* Initialize caCert */
|
||||
XMEMSET(&caCert, 0, sizeof(caCert));
|
||||
|
||||
/* Parse command line arguments */
|
||||
while ((ch = mygetopt_long(argc, argv, "?p:c:r:k:i:R:n:vx",
|
||||
long_options, 0)) != -1) {
|
||||
@@ -848,7 +861,6 @@ THREAD_RETURN WOLFSSL_THREAD ocsp_responder_test(void* args)
|
||||
}
|
||||
|
||||
/* Parse CA certificate to get subject */
|
||||
XMEMSET(&caCert, 0, sizeof(caCert));
|
||||
wc_InitDecodedCert(&caCert, caCertDer, caCertDerSz, NULL);
|
||||
ret = wc_ParseCert(&caCert, CERT_TYPE, 0, NULL);
|
||||
if (ret != 0) {
|
||||
|
||||
@@ -226,7 +226,6 @@ static int check_cert_key(const DerBuffer* cert, const DerBuffer* key,
|
||||
InitDecodedCert_ex(der, cert->buffer, cert->length, heap, devId);
|
||||
/* Parse certificate. */
|
||||
if (ParseCertRelative(der, CERT_TYPE, NO_VERIFY, NULL, NULL) != 0) {
|
||||
WC_FREE_VAR_EX(der, heap, DYNAMIC_TYPE_DCERT);
|
||||
ret = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18027,10 +18027,13 @@ static word32 SetAlgoIDImpl(int algoOID, byte* output, int type, int curveSz,
|
||||
word32 algoSz = 0;
|
||||
|
||||
CALLOC_ASNSETDATA(dataASN, algoIdASN_Length, ret, NULL);
|
||||
|
||||
#ifdef WOLFSSL_SMALL_STACK
|
||||
if(ret < 0) {
|
||||
/* Catch MEMORY_E */
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
algoName = OidFromId((word32)algoOID, (word32)type, &algoSz);
|
||||
if (algoName == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user