From 8a0c0a9ed94b57b5b0288e3c4848473427472df1 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Thu, 17 Apr 2014 16:08:20 +0200 Subject: [PATCH] Check additional return values in some test cases --- programs/pkey/key_app.c | 7 ++++++- tests/suites/test_suite_mpi.function | 1 + tests/suites/test_suite_pkwrite.function | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c index e6e9765f6a..b355069f78 100644 --- a/programs/pkey/key_app.c +++ b/programs/pkey/key_app.c @@ -146,7 +146,12 @@ int main( int argc, char *argv[] ) printf( " failed\n ! fopen returned NULL\n" ); goto exit; } - fgets( buf, sizeof(buf), f ); + if( fgets( buf, sizeof(buf), f ) == NULL ) + { + fclose( f ); + printf( "Error: fgets() failed to retrieve password\n" ); + goto exit; + } fclose( f ); i = (int) strlen( buf ); diff --git a/tests/suites/test_suite_mpi.function b/tests/suites/test_suite_mpi.function index 620c36851d..239f8a9370 100644 --- a/tests/suites/test_suite_mpi.function +++ b/tests/suites/test_suite_mpi.function @@ -101,6 +101,7 @@ void mpi_read_file( int radix_X, char *input_file, char *input_A, mpi_init( &X ); file = fopen( input_file, "r" ); + TEST_ASSERT( file != NULL ); TEST_ASSERT( mpi_read_file( &X, radix_X, file ) == result ); fclose(file); diff --git a/tests/suites/test_suite_pkwrite.function b/tests/suites/test_suite_pkwrite.function index 455b9aa0f1..2ea9409976 100644 --- a/tests/suites/test_suite_pkwrite.function +++ b/tests/suites/test_suite_pkwrite.function @@ -17,6 +17,7 @@ void pk_write_pubkey_check( char *key_file ) unsigned char check_buf[5000]; int ret; FILE *f; + size_t ilen; memset( buf, 0, sizeof( buf ) ); memset( check_buf, 0, sizeof( check_buf ) ); @@ -29,9 +30,10 @@ void pk_write_pubkey_check( char *key_file ) f = fopen( key_file, "r" ); TEST_ASSERT( f != NULL ); - fread( check_buf, 1, sizeof( check_buf ) - 1, f ); + ilen = fread( check_buf, 1, sizeof( check_buf ) - 1, f ); fclose( f ); + TEST_ASSERT( ilen == strlen( (char *) buf ) ); TEST_ASSERT( strncmp( (char *) buf, (char *) check_buf, sizeof( buf ) ) == 0 ); pk_free( &key ); @@ -46,6 +48,7 @@ void pk_write_key_check( char *key_file ) unsigned char check_buf[5000]; int ret; FILE *f; + size_t ilen; memset( buf, 0, sizeof( buf ) ); memset( check_buf, 0, sizeof( check_buf ) ); @@ -58,9 +61,10 @@ void pk_write_key_check( char *key_file ) f = fopen( key_file, "r" ); TEST_ASSERT( f != NULL ); - fread( check_buf, 1, sizeof( check_buf ) - 1, f ); + ilen = fread( check_buf, 1, sizeof( check_buf ) - 1, f ); fclose( f ); + TEST_ASSERT( ilen == strlen( (char *) buf ) ); TEST_ASSERT( strncmp( (char *) buf, (char *) check_buf, sizeof( buf ) ) == 0 ); pk_free( &key );