Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash bug in new history code - fish would segfauls in non-interactive mode on exit

Browse source 
darcs-hash:20061021103035-ac50b-a2a8d96416ff217cc5640f8f27db8dbac2c39b82.gz
This commit is contained in:
axel 2006-10-21 20:30:35 +10:00
parent 7b8ebdadd6
commit ed36f30eae
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
history.c
View file

@ -366,7 +366,7 @@ static void item_write( FILE *f, history_mode_t *m, void *v )
/** /**
Release all memory used by the specified history mode. Release all memory used by the specified history mode.
*/ */
static void history_destroy_mode( wchar_t *name, history_mode_t *m ) static void history_destroy_mode( history_mode_t *m )
{ {
halloc_free( m->item_context ); halloc_free( m->item_context );
@ -375,11 +375,16 @@ static void history_destroy_mode( wchar_t *name, history_mode_t *m )
munmap( m->mmap_start, m->mmap_length); munmap( m->mmap_start, m->mmap_length);
} }
}
static void history_destroy_mode_wrapper( void *n, history_mode_t *m )
{
halloc_free( m ); halloc_free( m );
} }
/** /**
Create a new empty mode with the specified name Create a new empty mode with the specified name.
The mode is a halloc context, and the entire mode can be destroyed using halloc_free().
*/ */
static history_mode_t *history_create_mode( const wchar_t *name ) static history_mode_t *history_create_mode( const wchar_t *name )
{ {
@ -395,6 +400,8 @@ static history_mode_t *history_create_mode( const wchar_t *name )
new_mode->save_timestamp=time(0); new_mode->save_timestamp=time(0);
new_mode->item_context = halloc( 0,0 ); new_mode->item_context = halloc( 0,0 );
halloc_register_function( new_mode, (void (*)(void *))&history_destroy_mode, new_mode );
return new_mode; return new_mode;
} }
@ -649,7 +656,7 @@ static void history_save_mode( void *n, history_mode_t *m )
free( tmp_name ); free( tmp_name );
} }
history_destroy_mode( 0, on_disk); halloc_free( on_disk);
/* /*
if( m->mmap_start && (m->mmap_start != MAP_FAILED ) ) if( m->mmap_start && (m->mmap_start != MAP_FAILED ) )
munmap( m->mmap_start, m->mmap_length ); munmap( m->mmap_start, m->mmap_length );
@ -862,17 +869,20 @@ void history_set_mode( const wchar_t *name )
} }
void history_init() void history_init()
{ {
} }
void history_destroy() void history_destroy()
{ {
hash_foreach( mode_table, (void (*)(void *, void *))&history_save_mode ); if( mode_table )
hash_foreach( mode_table, (void (*)(void *, void *))&history_destroy_mode ); {
hash_destroy( mode_table ); hash_foreach( mode_table, (void (*)(void *, void *))&history_save_mode );
free( mode_table ); hash_foreach( mode_table, (void (*)(void *, void *))&history_destroy_mode_wrapper );
mode_table=0; hash_destroy( mode_table );
free( mode_table );
mode_table=0;
}
} }