feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

static analysis check of null dereference and memory management

Browse Source
This commit is contained in:
Jacob Barthelmeh
2016-12-21 16:20:18 -07:00
parent 1a5c5d0011
commit 1c17b8eed6
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -9504,7 +9504,9 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX* ctx, pem_password_cb cb) void wolfSSL_CTX_set_default_passwd_cb(WOLFSSL_CTX* ctx, pem_password_cb cb)
{ {
WOLFSSL_ENTER("SSL_CTX_set_default_passwd_cb"); WOLFSSL_ENTER("SSL_CTX_set_default_passwd_cb");
ctx->passwd_cb = cb; if (ctx != NULL) {
ctx->passwd_cb = cb;
}
} }
int wolfSSL_num_locks(void) int wolfSSL_num_locks(void)

3
sslSniffer/sslSnifferTest/snifftest.c
View File

@@ -166,8 +166,9 @@ int main(int argc, char** argv)
printf("Enter the interface number (1-%d): ", i); printf("Enter the interface number (1-%d): ", i);
ret = scanf("%d", &inum); ret = scanf("%d", &inum);
if (ret != 1) if (ret != 1) {
printf("scanf port failed\n"); printf("scanf port failed\n");
}
if (inum < 1 || inum > i) if (inum < 1 || inum > i)
err_sys("Interface number out of range"); err_sys("Interface number out of range");

5
wolfcrypt/src/pkcs7.c
View File

@@ -1457,6 +1457,7 @@ static int wc_PKCS7_KariGenerateKEK(WC_PKCS7_KARI* kari,
} else { } else {
/* bad direction */ /* bad direction */
XFREE(secret, kari->heap, DYNAMIC_TYPE_PKCS7);
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
@@ -2127,8 +2128,10 @@ static int wc_PKCS7_GenerateIV(WC_RNG* rng, byte* iv, word32 ivSz)
return MEMORY_E; return MEMORY_E;
ret = wc_InitRng(random); ret = wc_InitRng(random);
if (ret != 0) if (ret != 0) {
XFREE(random, NULL, DYNAMIC_TYPE_RNG);
return ret; return ret;
}
} else { } else {
random = rng; random = rng;

3
wolfcrypt/test/test.c
View File

@@ -6675,6 +6675,9 @@ int openssl_test(void)
{ {
byte* p; byte* p;
p = (byte*)CRYPTO_malloc(10, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); p = (byte*)CRYPTO_malloc(10, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (p == NULL) {
return -70;
}
XMEMSET(p, 0, 10); XMEMSET(p, 0, 10);
CRYPTO_free(p, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); CRYPTO_free(p, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
} }