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

src/file_njx.c: improve Frama-C annotations

Browse source
This commit is contained in:
Christophe Grenier 2021-07-03 20:54:31 +02:00
parent b7312d4892
commit 08b4170057
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/file_njx.c
View file

@ -31,7 +31,7 @@
#include "types.h" #include "types.h"
#include "filegen.h" #include "filegen.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_njx(file_stat_t *file_stat); static void register_header_check_njx(file_stat_t *file_stat);
const file_hint_t file_hint_njx= { const file_hint_t file_hint_njx= {
@ -44,12 +44,9 @@ const file_hint_t file_hint_njx= {
}; };
/*@ /*@
@ requires \valid(file_recovery);
@ requires valid_file_recovery(file_recovery);
@ requires \valid(file_recovery->handle);
@ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source);
@ requires file_recovery->file_check == &file_check_njx; @ requires file_recovery->file_check == &file_check_njx;
@ ensures \valid(file_recovery->handle); @ requires valid_file_check_param(file_recovery);
@ ensures valid_file_check_result(file_recovery);
@ assigns *file_recovery->handle, errno, file_recovery->file_size; @ assigns *file_recovery->handle, errno, file_recovery->file_size;
@ assigns Frama_C_entropy_source; @ assigns Frama_C_entropy_source;
@*/ @*/
@ -61,13 +58,9 @@ static void file_check_njx(file_recovery_t *file_recovery)
/*@ /*@
@ requires buffer_size >= 12; @ requires buffer_size >= 12;
@ 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_njx, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_njx, 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_njx(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_njx(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)