yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-08 12:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3144 from gilles-peskine-arm/unmet_dependencies-verbose_only-2.7

Browse source 
[2.7 only] Note that unmet_dependencies is only filled in verbose mode
This commit is contained in:
Gilles Peskine 2020-04-02 15:18:31 +02:00 committed by GitHub
parent 48abf39a83 67665509ab
commit a8359398a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/suites/main_test.function
View file

@ -348,7 +348,7 @@ int main(int argc, const char *argv[])
testfile_index++ ) testfile_index++ )
{ {
int unmet_dep_count = 0; int unmet_dep_count = 0;
char *unmet_dependencies[20]; char *unmet_dependencies[20]; /* only filled when verbose != 0 */
test_filename = test_files[ testfile_index ]; test_filename = test_files[ testfile_index ];
@ -369,6 +369,7 @@ int main(int argc, const char *argv[])
mbedtls_exit( MBEDTLS_EXIT_FAILURE ); mbedtls_exit( MBEDTLS_EXIT_FAILURE );
} }
unmet_dep_count = 0; unmet_dep_count = 0;
memset( unmet_dependencies, 0, sizeof( unmet_dependencies ) );
if( ( ret = get_line( file, buf, sizeof(buf) ) ) != 0 ) if( ( ret = get_line( file, buf, sizeof(buf) ) ) != 0 )
break; break;
@ -391,18 +392,16 @@ int main(int argc, const char *argv[])
{ {
if( dep_check( params[i] ) != DEPENDENCY_SUPPORTED ) if( dep_check( params[i] ) != DEPENDENCY_SUPPORTED )
{ {
if( 0 == option_verbose ) if( 0 != option_verbose )
{ {
/* Only one count is needed if not verbose */ unmet_dependencies[unmet_dep_count] =
unmet_dep_count++; strdup( params[i] );
break; if( unmet_dependencies[unmet_dep_count] == NULL )
} {
mbedtls_fprintf( stderr,
unmet_dependencies[ unmet_dep_count ] = strdup(params[i]); "FATAL: Out of memory\n" );
if( unmet_dependencies[ unmet_dep_count ] == NULL ) mbedtls_exit( MBEDTLS_EXIT_FAILURE );
{ }
mbedtls_fprintf( stderr, "FATAL: Out of memory\n" );
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
} }
unmet_dep_count++; unmet_dep_count++;
} }