Skip to content

Commit

Permalink
Fix build error when int32_t is not int
Browse files Browse the repository at this point in the history
Fix a pointer mismatch when int32_t is not int, for example on Cortex-M where
in32_t is long int. Fix Mbed-TLS#4530

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
  • Loading branch information
gilles-peskine-arm committed May 18, 2021
1 parent fdcde47 commit a7a4306
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ChangeLog.d/host_test-int32.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Bugfix
* Fix test suite code on platforms where int32_t is not int, such as
Arm Cortex-M. Fixes #4530.
6 changes: 3 additions & 3 deletions tests/suites/host_test.function
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int verify_string( char **str )
*
* \return 0 if success else 1
*/
int verify_int( char *str, int *value )
int verify_int( char *str, int32_t *value )
{
size_t i;
int minus = 0;
Expand Down Expand Up @@ -238,7 +238,7 @@ static int parse_arguments( char *buf, size_t len, char **params,
*
* \return 0 for success else 1
*/
static int convert_params( size_t cnt , char ** params , int * int_params_store )
static int convert_params( size_t cnt , char ** params , int32_t * int_params_store )
{
char ** cur = params;
char ** out = params;
Expand Down Expand Up @@ -520,7 +520,7 @@ int execute_tests( int argc , const char ** argv )
char buf[5000];
char *params[50];
/* Store for proccessed integer params. */
int int_params[50];
int32_t int_params[50];
void *pointer;
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
int stdout_fd = -1;
Expand Down

0 comments on commit a7a4306

Please sign in to comment.