From 6741c640c9cd0cba1b524149ec5a2992d051a3df Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 8 Jun 2021 13:52:17 +0200 Subject: [PATCH] src/file_evt.c: improve Frama-C annotations --- src/file_evt.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/file_evt.c b/src/file_evt.c index c3bc716a..51fe37f3 100644 --- a/src/file_evt.c +++ b/src/file_evt.c @@ -33,7 +33,7 @@ #include "filegen.h" #include "log.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_evt(file_stat_t *file_stat); const file_hint_t file_hint_evt= { @@ -51,14 +51,9 @@ struct evt_chunk { } __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_evt; - @ 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_evt(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) @@ -98,12 +93,9 @@ static data_check_t data_check_evt(const unsigned char *buffer, const unsigned i /*@ @ requires buffer_size >= 8; - @ 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_evt, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result!=0 ==> valid_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; @*/ static int header_check_evt(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)