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

Fix memory errors with BJAM_NO_MEM_CACHE.

Browse Source 
[SVN r77725]
This commit is contained in:
Steven Watanabe
2012-04-02 22:00:32 +00:00
parent e6fae9a11b
commit 7fca6a5c1d
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/engine/function.c
View File

@@ -2923,7 +2923,7 @@ static void argument_compiler_add( struct argument_compiler * c, OBJECT * arg, O
if ( is_type_name( object_str( arg ) ) )
{
c->arg.type_name = arg;
c->arg.type_name = object_copy( arg );
c->state = ARGUMENT_COMPILER_FOUND_TYPE;
break;
}
@@ -2937,7 +2937,7 @@ static void argument_compiler_add( struct argument_compiler * c, OBJECT * arg, O
exit( 1 );
}
c->arg.arg_name = arg;
c->arg.arg_name = object_copy( arg );
if ( object_equal( arg, constant_star ) )
{
c->arg.flags = ARG_VARIADIC;
@@ -3066,12 +3066,15 @@ static struct arg_list * arg_list_compile_builtin( const char * * args, int * nu
argument_compiler_init( arg_comp );
for ( ; *args; ++args )
{
OBJECT * token;
if ( strcmp( *args, ":" ) == 0 )
{
++args;
break;
}
argument_compiler_add( arg_comp, object_new( *args ), constant_builtin, -1 );
token = object_new( *args );
argument_compiler_add( arg_comp, token, constant_builtin, -1 );
object_free( token );
}
arg = arg_compile_impl( arg_comp, constant_builtin, -1 );
dynamic_array_push( c->args, arg );
@@ -3129,6 +3132,9 @@ struct arg_list * argument_list_bind_variables( struct arg_list * formal, int fo
for ( j = 0; j < formal[ i ].size; ++j )
{
args[ j ] = formal[ i ].args[ j ];
if ( args[ j ].type_name )
args[ j ].type_name = object_copy( args[ j ].type_name );
args[ j ].arg_name = object_copy( args[ j ].arg_name );
if ( args[ j ].flags != ARG_VARIADIC )
{
args[ j ].index = module_add_fixed_var( module, args[ j ].arg_name, counter );
@@ -3149,9 +3155,15 @@ struct arg_list * argument_list_bind_variables( struct arg_list * formal, int fo
void argument_list_free( struct arg_list * args, int args_count )
{
int i;
int i, j;
for ( i = 0; i < args_count; ++i )
{
for ( j = 0; j < args[ i ].size; ++j )
{
if ( args[ i ].args[ j ].type_name )
object_free( args[ i ].args[ j ].type_name );
object_free( args[ i ].args[ j ].arg_name );
}
BJAM_FREE( args[ i ].args );
}
BJAM_FREE( args );

11
src/engine/modules.c
View File

@@ -93,6 +93,7 @@ static void delete_imported_modules( void * xmodule_name, void * data )
object_free( *(OBJECT * *)xmodule_name );
}
static void free_fixed_variable( void * xvar, void * data );
void delete_module( module_t * m )
{
@@ -126,6 +127,11 @@ void delete_module( module_t * m )
}
BJAM_FREE( m->fixed_variables );
m->fixed_variables = 0;
}
if ( m->variable_indices )
{
hashenumerate( m->variable_indices, &free_fixed_variable, (void *)0 );
hash_free( m->variable_indices );
m->variable_indices = 0;
}
@@ -324,6 +330,11 @@ struct bind_vars_t
int counter;
};
static void free_fixed_variable( void * xvar, void * data )
{
object_free( ( (struct fixed_variable *)xvar )->key );
}
static void bind_variables_for_rule( void * xrule, void * xdata )
{
RULE * rule = (RULE *)xrule;