eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5976 from gilles-peskine-arm/selftest-calloc-pointer-comparison-fix-development

Browse source 
Remove largely useless bit of test log to silence GCC 12
This commit is contained in:
Dave Rodgman 2022-06-29 15:25:04 +01:00 • committed by GitHub
commit 1dc6848679
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.d/selftest-gcc12.txt Normal file
View file

@ -0,0 +1,2 @@
Bugfix
* Silence a warning from GCC 12 in the selftest program. Fixes #5974.

6
programs/test/selftest.c
View file

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