oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Round #2 of scan-build warnings cleanup

Browse Source
This commit is contained in:
Nicolas Williams
2016-11-16 11:39:27 -06:00
parent 953dc07391
commit 1c81ddf4e2
39 changed files with 136 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/hcrypto/evp-pkcs11.c
View File

@@ -121,17 +121,13 @@ p11_module_init_once(void *context)
fprintf(stderr, "p11_module_init(%s): %s\n", PKCS11_MODULE_PATH, dlerror());
}
#endif
if (pkcs11_module_handle == NULL) {
rv = CKR_LIBRARY_LOAD_FAILED;
if (pkcs11_module_handle == NULL)
goto cleanup;
}
C_GetFunctionList_fn = (CK_RV (*)(CK_FUNCTION_LIST_PTR_PTR))
dlsym(pkcs11_module_handle, "C_GetFunctionList");
if (C_GetFunctionList_fn == NULL) {
rv = CKR_LIBRARY_LOAD_FAILED;
if (C_GetFunctionList_fn == NULL)
goto cleanup;
}
rv = C_GetFunctionList_fn(&module);
if (rv != CKR_OK)

3
lib/hcrypto/evp.c
View File

@@ -603,7 +603,8 @@ EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
return ret;
}
if (c->cipher_data) {
memset(c->cipher_data, 0, c->cipher->ctx_size);
if (c->cipher)
memset(c->cipher_data, 0, c->cipher->ctx_size);
free(c->cipher_data);
c->cipher_data = NULL;
}

5
lib/hcrypto/test_rand.c
View File

@@ -103,10 +103,7 @@ main(int argc, char **argv)
exit(0);
}
argc -= idx;
argv += idx;
if (argc != 0)
if (argc != idx)
usage(1);
buffer = emalloc(len);