commit 67665509ab5fef6730e0aeeaafbb76f9b0edc2f3
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Mar 31 10:57:53 2020 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 01 09:59:54 2020 +0200
tree f97c66ec22329a9263106e096364b4f2e8c12bb8
parent f3037ec2da362e45875928f49361acfa7c0fb484

Note that unmet_dependencies is only filled in verbose mode

Warn about a gotcha that caused a bug in development.

Ensure that it's at least zeroed out, rather than uninitialized, in
non-verbose mode.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/suites/main_test.function

diff --git a/tests/suites/main_test.function b/tests/suites/main_test.function
index 042085f..8f134ff 100644
--- a/tests/suites/main_test.function
+++ b/tests/suites/main_test.function
@@ -348,7 +348,7 @@
           testfile_index++ )
     {
         int unmet_dep_count = 0;
-        char *unmet_dependencies[20];
+        char *unmet_dependencies[20]; /* only filled when verbose != 0 */
 
         test_filename = test_files[ testfile_index ];
 
@@ -369,6 +369,7 @@
                 mbedtls_exit( MBEDTLS_EXIT_FAILURE );
             }
             unmet_dep_count = 0;
+            memset( unmet_dependencies, 0, sizeof( unmet_dependencies ) );
 
             if( ( ret = get_line( file, buf, sizeof(buf) ) ) != 0 )
                 break;
@@ -391,18 +392,16 @@
                 {
                     if( dep_check( params[i] ) != DEPENDENCY_SUPPORTED )
                     {
-                        if( 0 == option_verbose )
+                        if( 0 != option_verbose )
                         {
-                            /* Only one count is needed if not verbose */
-                            unmet_dep_count++;
-                            break;
-                        }
-
-                        unmet_dependencies[ unmet_dep_count ] = strdup(params[i]);
-                        if(  unmet_dependencies[ unmet_dep_count ] == NULL )
-                        {
-                            mbedtls_fprintf( stderr, "FATAL: Out of memory\n" );
-                            mbedtls_exit( MBEDTLS_EXIT_FAILURE );
+                            unmet_dependencies[unmet_dep_count] =
+                                strdup( params[i] );
+                            if(  unmet_dependencies[unmet_dep_count] == NULL )
+                            {
+                                mbedtls_fprintf( stderr,
+                                                 "FATAL: Out of memory\n" );
+                                mbedtls_exit( MBEDTLS_EXIT_FAILURE );
+                            }
                         }
                         unmet_dep_count++;
                     }