lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-19 05:43:14 +03:00
Code Activity

PK: Fix free(NULL) in library and tests

Browse Source 
free() functions are documented as no-ops on NULL. Implement and test
this correctly.
This commit is contained in:
Gilles Peskine
2018-12-19 14:18:39 +01:00
parent e146e7dbae
commit 1f19fa6f62
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/pk.c
View File

@ -90,8 +90,7 @@ void mbedtls_pk_restart_init( mbedtls_pk_restart_ctx *ctx )
*/
void mbedtls_pk_restart_free( mbedtls_pk_restart_ctx *ctx )
{
PK_VALIDATE( ctx != NULL );
if( ctx->pk_info == NULL ||
if( ctx == NULL || ctx->pk_info == NULL ||
ctx->pk_info->rs_free_func == NULL )
{
return;

8
tests/suites/test_suite_pk.function
View File

@ -77,6 +77,12 @@ void valid_parameters( )
mbedtls_pk_init( &pk );
TEST_VALID_PARAM( mbedtls_pk_free( NULL ) );
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
TEST_VALID_PARAM( mbedtls_pk_restart_free( NULL ) );
#endif
TEST_ASSERT( mbedtls_pk_setup( &pk, NULL ) ==
MBEDTLS_ERR_PK_BAD_INPUT_DATA );
@ -133,8 +139,6 @@ void invalid_parameters( )
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
TEST_INVALID_PARAM( mbedtls_pk_restart_init( NULL ) );
TEST_INVALID_PARAM( mbedtls_pk_restart_free( NULL ) );
#endif
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_PK_BAD_INPUT_DATA,