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

PhotoRec: fix file descriptor leak when bruteforce mode is enabled

Browse source
This commit is contained in:
Christophe Grenier 2014-10-28 11:22:22 +01:00
parent 3e91667fb2
commit 319e5b55cb
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/phbf.c
View file

@ -28,6 +28,9 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h> /* unlink */
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@ -289,6 +292,12 @@ pstatus_t photorec_bf(struct ph_param *params, const struct ph_options *options,
#endif
}
}
if(file_recovery.handle!=NULL)
{
fclose(file_recovery.handle);
file_recovery.handle=NULL;
unlink(file_recovery.filename);
}
search_walker=p;
if(go_backward==0)
{

8
src/photorec.c
View file

@ -618,6 +618,11 @@ int file_finish_bf(file_recovery_t *file_recovery, struct ph_param *params,
if(file_recovery->offset_error!=0)
return -1;
file_block_truncate_zero(file_recovery, list_search_space);
if(file_recovery->handle!=NULL)
{
fclose(file_recovery->handle);
unlink(file_recovery->filename);
}
reset_file_recovery(file_recovery);
return 0;
}
@ -627,7 +632,6 @@ int file_finish_bf(file_recovery_t *file_recovery, struct ph_param *params,
xml_log_file_recovered(file_recovery);
#endif
file_block_free(&file_recovery->location);
reset_file_recovery(file_recovery);
return 1;
}
@ -647,7 +651,7 @@ int file_finish2(file_recovery_t *file_recovery, struct ph_param *params, const
if(file_recovery->file_stat==NULL)
return 0;
if(file_recovery->handle)
file_finish_aux(file_recovery, params, paranoid);
file_finish_aux(file_recovery, params, (paranoid==0?0:1));
if(file_recovery->file_size==0)
{
file_block_truncate_zero(file_recovery, list_search_space);