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

src/file_par2.c: fix Frama-C warnings

Browse source
This commit is contained in:
Christophe Grenier 2021-07-04 16:40:25 +02:00
parent 90ce992b14
commit 029adb2224
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/file_par2.c
View file

@ -33,7 +33,7 @@
#include "common.h" #include "common.h"
#include "log.h" #include "log.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_par2(file_stat_t *file_stat); static void register_header_check_par2(file_stat_t *file_stat);
const file_hint_t file_hint_par2= { const file_hint_t file_hint_par2= {
@ -50,12 +50,9 @@ static const unsigned char par2_header[8]= {
}; };
/*@ /*@
@ requires buffer_size >= 2 && (buffer_size&1)==0;
@ requires \valid(file_recovery);
@ requires \valid_read(buffer + ( 0 .. buffer_size-1));
@ requires file_recovery->data_check == &data_check_par2; @ requires file_recovery->data_check == &data_check_par2;
@ requires separation: \separated(buffer+(..), file_recovery); @ requires valid_data_check_param(buffer, buffer_size, file_recovery);
@ ensures \result == DC_CONTINUE || \result == DC_STOP; @ ensures valid_data_check_result(\result, file_recovery);
@ assigns file_recovery->calculated_file_size; @ assigns file_recovery->calculated_file_size;
@*/ @*/
static data_check_t data_check_par2(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) static data_check_t data_check_par2(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
@ -77,9 +74,9 @@ static data_check_t data_check_par2(const unsigned char *buffer, const unsigned
} }
/*@ /*@
@ requires \valid(file_recovery);
@ requires valid_file_recovery(file_recovery);
@ requires file_recovery->file_rename==&file_rename_par2; @ requires file_recovery->file_rename==&file_rename_par2;
@ requires valid_file_rename_param(file_recovery);
@ ensures valid_file_rename_result(file_recovery);
@*/ @*/
static void file_rename_par2(file_recovery_t *file_recovery) static void file_rename_par2(file_recovery_t *file_recovery)
{ {
@ -87,7 +84,8 @@ static void file_rename_par2(file_recovery_t *file_recovery)
uint64_t offset=0; uint64_t offset=0;
if((file=fopen(file_recovery->filename, "rb"))==NULL) if((file=fopen(file_recovery->filename, "rb"))==NULL)
return; return;
while(1) /*@ loop invariant valid_file_rename_param(file_recovery); */
while(offset <= PHOTOREC_MAX_FILE_SIZE)
{ {
uint64_t length; uint64_t length;
size_t buffer_size; size_t buffer_size;
@ -105,7 +103,7 @@ static void file_rename_par2(file_recovery_t *file_recovery)
return; return;
} }
length=le64(*lengthp); length=le64(*lengthp);
if(length % 4 !=0 || length < 16 || if(length % 4 !=0 || length < 16 || length >= PHOTOREC_MAX_FILE_SIZE ||
memcmp(&buffer, &par2_header, sizeof(par2_header))!=0) memcmp(&buffer, &par2_header, sizeof(par2_header))!=0)
{ {
fclose(file); fclose(file);
@ -121,17 +119,15 @@ static void file_rename_par2(file_recovery_t *file_recovery)
} }
offset+=length; offset+=length;
} }
fclose(file);
return;
} }
/*@ /*@
@ requires buffer_size >= 16; @ requires buffer_size >= 16;
@ requires \valid_read(buffer+(0..buffer_size-1));
@ requires valid_file_recovery(file_recovery);
@ requires \valid(file_recovery_new);
@ requires file_recovery_new->blocksize > 0;
@ requires separation: \separated(&file_hint_par2, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_par2, buffer+(..), file_recovery, file_recovery_new);
@ ensures \result == 0 || \result == 1; @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new);
@ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @ ensures valid_header_check_result(\result, file_recovery_new);
@*/ @*/
static int header_check_par2(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new) static int header_check_par2(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
{ {