Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

it appeared i had to free the result of ped_partition_get_path in order to 

* src/GParted_Core.cc: it appeared i had to free the result of
  ped_partition_get_path in order to prevent a memleak.
This commit is contained in:
Bart Hakvoort 2006-03-28 18:46:08 +00:00
parent 40cbb6d4c4
commit 2e1880ee66
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-03-28 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/GParted_Core.cc: it appeared i had to free the result of
ped_partition_get_path in order to prevent a memleak.
2006-03-28 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-03-28 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/OperationCopy.cc: name a copied partition 'copy of <source>'. * src/OperationCopy.cc: name a copied partition 'copy of <source>'.

19
src/GParted_Core.cc
View File

@ -335,6 +335,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
void GParted_Core::set_device_partitions( Device & device ) void GParted_Core::set_device_partitions( Device & device )
{ {
int EXT_INDEX = -1 ; int EXT_INDEX = -1 ;
char * lp_path ;//we have to free the result of ped_partition_get_path()..
//clear partitions //clear partitions
device .partitions .clear() ; device .partitions .clear() ;
@ -348,8 +349,9 @@ void GParted_Core::set_device_partitions( Device & device )
{ {
case PED_PARTITION_NORMAL: case PED_PARTITION_NORMAL:
case PED_PARTITION_LOGICAL: case PED_PARTITION_LOGICAL:
lp_path = ped_partition_get_path( lp_partition ) ;
partition_temp .Set( device .get_path(), partition_temp .Set( device .get_path(),
ped_partition_get_path( lp_partition ), lp_path,
lp_partition ->num, lp_partition ->num,
lp_partition ->type == 0 ? lp_partition ->type == 0 ?
GParted::TYPE_PRIMARY : GParted::TYPE_LOGICAL, GParted::TYPE_PRIMARY : GParted::TYPE_LOGICAL,
@ -357,7 +359,8 @@ void GParted_Core::set_device_partitions( Device & device )
lp_partition ->geom .start, lp_partition ->geom .start,
lp_partition ->geom .end, lp_partition ->geom .end,
lp_partition ->type, lp_partition ->type,
ped_partition_is_busy( lp_partition ) ); ped_partition_is_busy( lp_partition ) ) ;
free( lp_path ) ;
partition_temp .add_paths( get_alternate_paths( partition_temp .get_path() ) ) ; partition_temp .add_paths( get_alternate_paths( partition_temp .get_path() ) ) ;
set_flags( partition_temp ) ; set_flags( partition_temp ) ;
@ -368,15 +371,17 @@ void GParted_Core::set_device_partitions( Device & device )
break ; break ;
case PED_PARTITION_EXTENDED: case PED_PARTITION_EXTENDED:
lp_path = ped_partition_get_path( lp_partition ) ;
partition_temp .Set( device .get_path(), partition_temp .Set( device .get_path(),
ped_partition_get_path( lp_partition ), lp_path,
lp_partition ->num, lp_partition ->num,
GParted::TYPE_EXTENDED, GParted::TYPE_EXTENDED,
GParted::FS_EXTENDED, GParted::FS_EXTENDED,
lp_partition ->geom .start, lp_partition ->geom .start,
lp_partition ->geom .end, lp_partition ->geom .end,
false, false,
ped_partition_is_busy( lp_partition ) ); ped_partition_is_busy( lp_partition ) ) ;
free( lp_path ) ;
partition_temp .add_paths( get_alternate_paths( partition_temp .get_path() ) ) ; partition_temp .add_paths( get_alternate_paths( partition_temp .get_path() ) ) ;
set_flags( partition_temp ) ; set_flags( partition_temp ) ;
@ -878,7 +883,11 @@ int GParted_Core::create_empty_partition( Partition & new_partition,
if ( ped_disk_add_partition( lp_disk, lp_partition, constraint ) && commit() ) if ( ped_disk_add_partition( lp_disk, lp_partition, constraint ) && commit() )
{ {
new_partition .add_path( ped_partition_get_path( lp_partition ), true ) ; //we have to free the result of ped_partition_get_path()..
char * lp_path = ped_partition_get_path( lp_partition ) ;
new_partition .add_path( lp_path, true ) ;
free( lp_path ) ;
new_partition .partition_number = lp_partition ->num ; new_partition .partition_number = lp_partition ->num ;
Sector start = lp_partition ->geom .start ; Sector start = lp_partition ->geom .start ;