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

header_ignored_adv(): Always restore location in openned file

Browse source
This commit is contained in:
Christophe Grenier 2019-04-26 18:44:05 +02:00
parent a71b112d58
commit fd1fe33008
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/filegen.c
View file

@ -613,7 +613,9 @@ int header_ignored_adv(const file_recovery_t *file_recovery, const file_recovery
if(file_recovery->handle==NULL) if(file_recovery->handle==NULL)
{ {
if(file_recovery_new->location.start==0 || offset_skipped_header==0) if(file_recovery_new->location.start==0 || offset_skipped_header==0)
{
offset_skipped_header=file_recovery_new->location.start; offset_skipped_header=file_recovery_new->location.start;
}
return 0; return 0;
} }
@ -626,15 +628,17 @@ int header_ignored_adv(const file_recovery_t *file_recovery, const file_recovery
#endif #endif
assert(offset >= 0); assert(offset >= 0);
file_recovery->file_check(&fr_test); file_recovery->file_check(&fr_test);
if(fr_test.file_size>0)
return 1;
if(my_fseek(file_recovery->handle, offset, SEEK_SET) < 0) if(my_fseek(file_recovery->handle, offset, SEEK_SET) < 0)
{ {
log_error("BUG in header_ignored_adv: my_fseek() failed\n"); log_error("BUG in header_ignored_adv: my_fseek() failed\n");
return 1; return 1;
} }
if(fr_test.file_size>0)
return 1;
if(file_recovery_new->location.start==0 || offset_skipped_header==0) if(file_recovery_new->location.start==0 || offset_skipped_header==0)
{
offset_skipped_header=file_recovery_new->location.start; offset_skipped_header=file_recovery_new->location.start;
}
return 0; return 0;
} }