yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 16:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3207 from mpg/check-bounds-of-test-intex-in-suites-2.16

Browse Source 
[Backport 2.16] Add lower bound check to function index lookup
This commit is contained in:
Gilles Peskine 2020-04-20 15:19:47 +02:00 committed by GitHub
commit ff873432d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/suites/host_test.function
View File

@ -387,7 +387,7 @@ int execute_tests( int argc , const char ** argv )
const char **test_files = NULL; const char **test_files = NULL;
size_t testfile_count = 0; size_t testfile_count = 0;
int option_verbose = 0; int option_verbose = 0;
int function_id = 0; size_t function_id = 0;
/* Other Local variables */ /* Other Local variables */
int arg_index = 1; int arg_index = 1;
@ -563,7 +563,7 @@ int execute_tests( int argc , const char ** argv )
} }
#endif /* __unix__ || __APPLE__ __MACH__ */ #endif /* __unix__ || __APPLE__ __MACH__ */
function_id = strtol( params[0], NULL, 10 ); function_id = strtoul( params[0], NULL, 10 );
if ( (ret = check_test( function_id )) == DISPATCH_TEST_SUCCESS ) if ( (ret = check_test( function_id )) == DISPATCH_TEST_SUCCESS )
{ {
ret = convert_params( cnt - 1, params + 1, int_params ); ret = convert_params( cnt - 1, params + 1, int_params );

4
tests/suites/main_test.function
View File

@ -174,7 +174,7 @@ void execute_function_ptr(TestWrapper_t fp, void **params)
* DISPATCH_TEST_FN_NOT_FOUND if not found * DISPATCH_TEST_FN_NOT_FOUND if not found
* DISPATCH_UNSUPPORTED_SUITE if not compile time enabled. * DISPATCH_UNSUPPORTED_SUITE if not compile time enabled.
*/ */
int dispatch_test( int func_idx, void ** params ) int dispatch_test( size_t func_idx, void ** params )
{ {
int ret = DISPATCH_TEST_SUCCESS; int ret = DISPATCH_TEST_SUCCESS;
TestWrapper_t fp = NULL; TestWrapper_t fp = NULL;
@ -205,7 +205,7 @@ int dispatch_test( int func_idx, void ** params )
* DISPATCH_TEST_FN_NOT_FOUND if not found * DISPATCH_TEST_FN_NOT_FOUND if not found
* DISPATCH_UNSUPPORTED_SUITE if not compile time enabled. * DISPATCH_UNSUPPORTED_SUITE if not compile time enabled.
*/ */
int check_test( int func_idx ) int check_test( size_t func_idx )
{ {
int ret = DISPATCH_TEST_SUCCESS; int ret = DISPATCH_TEST_SUCCESS;
TestWrapper_t fp = NULL; TestWrapper_t fp = NULL;