TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-05-05 01:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5982 from gilles-peskine-arm/selftest-calloc-pointer-comparison-fix-2.28

Browse Source 
Backport 2.28: Remove largely useless bit of test log to silence GCC 12
This commit is contained in:
Dave Rodgman
2022-06-29 15:25:00 +01:00
committed by GitHub
parent 06c5e929ba 52396ef622
commit eee5c8ac23
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
programs/test/selftest.c
View File

@@ -89,7 +89,6 @@ static int calloc_self_test( int verbose )
void *empty2 = mbedtls_calloc( 0, 1 );
void *buffer1 = mbedtls_calloc( 1, 1 );
void *buffer2 = mbedtls_calloc( 1, 1 );
uintptr_t old_buffer1;
if( empty1 == NULL && empty2 == NULL )
{
@@ -131,7 +130,6 @@ static int calloc_self_test( int verbose )
mbedtls_printf( " CALLOC(1): passed\n" );
}
old_buffer1 = (uintptr_t) buffer1;
mbedtls_free( buffer1 );
buffer1 = mbedtls_calloc( 1, 1 );
if( buffer1 == NULL )
@@ -143,9 +141,7 @@ static int calloc_self_test( int verbose )
else
{
if( verbose )
mbedtls_printf( " CALLOC(1 again): passed (%s address)\n",
(uintptr_t) old_buffer1 == (uintptr_t) buffer1 ?
"same" : "different" );
mbedtls_printf( " CALLOC(1 again): passed\n" );
}
if( verbose )