luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

src/ext2_dir.c: Change shared_ioch type to io_channel instead of "io_channel *" to avoid to refer to a stack allocated variable

Browse source
This commit is contained in:
Christophe Grenier 2016-06-24 21:35:52 +02:00
parent b31247a049
commit fac553ee40
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ext2_dir.c
View file

@ -93,7 +93,7 @@ static struct struct_io_manager my_struct_manager = {
}; };
static int ext2_dir(disk_t *disk_car, const partition_t *partition, dir_data_t *dir_data, const unsigned long int cluster, file_info_t *dir_list); static int ext2_dir(disk_t *disk_car, const partition_t *partition, dir_data_t *dir_data, const unsigned long int cluster, file_info_t *dir_list);
static io_channel *shared_ioch=NULL; static io_channel shared_ioch=NULL;
/* /*
* Macro taken from unix_io.c * Macro taken from unix_io.c
* For checking structure magic numbers... * For checking structure magic numbers...
@ -134,7 +134,7 @@ static io_channel alloc_io_channel(disk_t *disk_car,my_data_t *my_data)
static errcode_t my_open(const char *dev, int flags, io_channel *channel) static errcode_t my_open(const char *dev, int flags, io_channel *channel)
{ {
*channel = *shared_ioch; *channel = shared_ioch;
#ifdef DEBUG_EXT2 #ifdef DEBUG_EXT2
log_info("my_open %s done\n", dev); log_info("my_open %s done\n", dev);
#endif #endif
@ -366,7 +366,7 @@ dir_partition_t dir_partition_ext2_init(disk_t *disk_car, const partition_t *par
my_data->partition=partition; my_data->partition=partition;
my_data->disk_car=disk_car; my_data->disk_car=disk_car;
ioch=alloc_io_channel(disk_car,my_data); ioch=alloc_io_channel(disk_car,my_data);
shared_ioch=&ioch; shared_ioch=ioch;
/* An alternate superblock may be used if the calling function has set an IO redirection */ /* An alternate superblock may be used if the calling function has set an IO redirection */
if(ext2fs_open ("/dev/testdisk", 0, 0, 0, &my_struct_manager, &ls->current_fs)!=0) if(ext2fs_open ("/dev/testdisk", 0, 0, 0, &my_struct_manager, &ls->current_fs)!=0)
{ {