boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix errors reported by ubsan. (memcpy w/ nullptr).

Browse Source
This commit is contained in:
Steven Watanabe
2019-04-24 16:31:31 -06:00
parent cac0ea348a
commit 2d306dbe9c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/engine/function.cpp
View File

@@ -1537,8 +1537,9 @@ static JAM_FUNCTION * compile_to_function( compiler * c )
memcpy( result->code, c->code->data, c->code->size * sizeof( instruction ) );
result->constants = (OBJECT**)BJAM_MALLOC( c->constants->size * sizeof( OBJECT * ) );
memcpy( result->constants, c->constants->data, c->constants->size * sizeof(
OBJECT * ) );
if ( c->constants->size != 0 )
memcpy( result->constants, c->constants->data,
c->constants->size * sizeof( OBJECT * ) );
result->num_constants = c->constants->size;
result->num_subfunctions = c->rules->size;
@@ -1555,8 +1556,9 @@ static JAM_FUNCTION * compile_to_function( compiler * c )
}
result->actions = (SUBACTION*)BJAM_MALLOC( c->actions->size * sizeof( SUBACTION ) );
memcpy( result->actions, c->actions->data, c->actions->size * sizeof(
SUBACTION ) );
if ( c->actions->size != 0 )
memcpy( result->actions, c->actions->data,
c->actions->size * sizeof( SUBACTION ) );
result->num_subactions = c->actions->size;
result->generic = 0;
@@ -3417,8 +3419,9 @@ static struct arg_list arg_compile_impl( struct argument_compiler * c,
}
result.size = c->args->size;
result.args = (struct argument*)BJAM_MALLOC( c->args->size * sizeof( struct argument ) );
memcpy( result.args, c->args->data, c->args->size * sizeof( struct argument
) );
if ( c->args->size != 0 )
memcpy( result.args, c->args->data,
c->args->size * sizeof( struct argument ) );
return result;
}
@@ -3515,8 +3518,9 @@ static struct arg_list * arg_list_compile_builtin( char const * * args,
}
*num_arguments = c->args->size;
result = (struct arg_list *)BJAM_MALLOC( c->args->size * sizeof( struct arg_list ) );
memcpy( result, c->args->data, c->args->size * sizeof( struct arg_list )
);
if ( c->args->size != 0 )
memcpy( result, c->args->data,
c->args->size * sizeof( struct arg_list ) );
argument_list_compiler_free( c );
return result;
}