From 75815a162ea57260270bfebe954093007c24671d Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Mon, 14 Jun 2021 17:22:52 +0200 Subject: [PATCH] src/file_fs.c: improve Frama-C annotations --- src/file_fs.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/file_fs.c b/src/file_fs.c index 23e4ca25..5f5647da 100644 --- a/src/file_fs.c +++ b/src/file_fs.c @@ -34,7 +34,7 @@ #include "common.h" #include "log.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_fs(file_stat_t *file_stat); const file_hint_t file_hint_fs= { @@ -58,14 +58,9 @@ struct transaction_header } __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_fs; - @ requires file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; - @ requires \separated(buffer + (..), file_recovery); - @ ensures \result == DC_CONTINUE || \result == DC_STOP; + @ requires valid_data_check_param(buffer, buffer_size, file_recovery); + @ ensures valid_data_check_result(\result, file_recovery); @ assigns file_recovery->calculated_file_size; @*/ static data_check_t data_check_fs(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) @@ -99,13 +94,10 @@ static data_check_t data_check_fs(const unsigned char *buffer, const unsigned in /*@ @ requires buffer_size >= sizeof(struct transaction_header); - @ 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_fs, buffer+(..), file_recovery, file_recovery_new); + @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new); + @ ensures valid_header_check_result(\result, file_recovery_new); @ assigns *file_recovery_new; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_fs(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) {