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

src/file_psp.c: improve Frama-C annotations

Browse source
This commit is contained in:
Christophe Grenier 2021-07-07 17:29:55 +02:00
parent 86defc9ed4
commit 72e4d60d1b
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/file_psp.c
View file

@ -32,7 +32,7 @@
#include "common.h" #include "common.h"
#include "filegen.h" #include "filegen.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_psp(file_stat_t *file_stat); static void register_header_check_psp(file_stat_t *file_stat);
const file_hint_t file_hint_psp= { const file_hint_t file_hint_psp= {
@ -51,13 +51,9 @@ struct psp_chunk {
} __attribute__ ((gcc_struct, __packed__)); } __attribute__ ((gcc_struct, __packed__));
/*@ /*@
@ requires buffer_size > 0;
@ requires (buffer_size&1)==0;
@ requires \valid_read(buffer+(0..buffer_size-1));
@ requires \valid(file_recovery);
@ requires file_recovery->data_check==&data_check_psp; @ requires file_recovery->data_check==&data_check_psp;
@ requires \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_psp(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) static data_check_t data_check_psp(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
@ -82,13 +78,9 @@ static data_check_t data_check_psp(const unsigned char *buffer, const unsigned i
/*@ /*@
@ requires buffer_size >= 0x28; @ requires buffer_size >= 0x28;
@ 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_psp, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_psp, 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);
@ assigns *file_recovery_new; @ assigns *file_recovery_new;
@*/ @*/
static int header_check_psp(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_psp(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)