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

src/file_jpg.c: prevent thumb file recovered instead of the whole

Browse source 
picture instead in the first 16k (previously first 4k)
This commit is contained in:
Christophe Grenier 2020-10-11 16:38:03 +02:00
parent 64d83ba69b
commit 34fb96c439
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/file_jpg.c
View file

@ -891,7 +891,7 @@ static int header_check_jpg(const unsigned char *buffer, const unsigned int buff
return 0; return 0;
} }
/* Don't recover the thumb instead of the jpg itself */ /* Don't recover the thumb instead of the jpg itself */
if(file_recovery->file_size <= 4096 && if(file_recovery->file_size <= 16384 &&
buffer[3]==0xe0 && buffer[3]==0xe0 &&
width>0 && width<200 && height>0 && height<200) width>0 && width<200 && height>0 && height<200)
{ {
@ -2247,7 +2247,7 @@ static uint64_t jpg_check_structure(file_recovery_t *file_recovery, const unsign
continue; continue;
} }
#if defined(DEBUG_JPEG) #if defined(DEBUG_JPEG)
log_info("%s marker 0x%02x at 0x%x\n", file_recovery->filename, buffer[i+1], i); log_info("%s marker ff%02x at 0x%x\n", file_recovery->filename, buffer[i+1], i);
#endif #endif
offset+=(uint64_t)2+size; offset+=(uint64_t)2+size;
if(buffer[i+1]==0xe1) if(buffer[i+1]==0xe1)