From ad878c302dba24e844e4e1fccbbf55bf8cc32cea Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 6 Jun 2021 11:26:08 +0200 Subject: [PATCH] src/file_ace.c: Improve Frama-C annotations --- src/file_ace.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/src/file_ace.c b/src/file_ace.c index 3d636858..12be089e 100644 --- a/src/file_ace.c +++ b/src/file_ace.c @@ -40,7 +40,7 @@ /* #define DEBUG_ACE */ /*@ - @ requires \valid(file_stat); + @ requires valid_register_header_check(file_stat); @*/ static void register_header_check_ace(file_stat_t *file_stat); @@ -111,16 +111,11 @@ static int check_ace_crc(FILE *handle, const unsigned int len, const unsigned in } /*@ - @ 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 \initialized(&file_recovery->time); - @ @ requires file_recovery->file_check == &file_check_ace; + @ requires valid_file_check_param(file_recovery); + @ ensures valid_file_check_result(file_recovery); @ assigns *file_recovery->handle, errno, file_recovery->file_size, file_recovery->offset_error, file_recovery->offset_ok; @ assigns Frama_C_entropy_source; - @ - @ ensures \valid(file_recovery->handle); @*/ static void file_check_ace(file_recovery_t *file_recovery) { @@ -202,32 +197,15 @@ static void file_check_ace(file_recovery_t *file_recovery) } /*@ - @ requires buffer_size > 0; - @ 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 buffer_size >= sizeof(ace_header_t); @ requires separation: \separated(&file_hint_ace, buffer+(..), file_recovery, file_recovery_new); - @ - @ ensures \result == 0 || \result == 1; - @ ensures (\result == 1) ==> (file_recovery_new->file_stat == \null); - @ ensures (\result == 1) ==> (file_recovery_new->handle == \null); - @ ensures (\result == 1) ==> \initialized(&file_recovery_new->time); - @ ensures (\result == 1) ==> \initialized(&file_recovery_new->calculated_file_size); + @ 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); @ ensures (\result == 1) ==> file_recovery_new->file_size == 0; - @ ensures (\result == 1) ==> \initialized(&file_recovery_new->min_filesize); - @ ensures (\result == 1) ==> (file_recovery_new->data_check == \null || \valid_function(file_recovery_new->data_check)); - @ ensures (\result == 1) ==> (file_recovery_new->file_check == \null || \valid_function(file_recovery_new->file_check)); - @ ensures (\result == 1) ==> (file_recovery_new->file_rename == \null || \valid_function(file_recovery_new->file_rename)); - @ ensures (\result != 0) ==> file_recovery_new->extension != \null; - @ @ ensures (\result == 1) ==> (file_recovery_new->time == 0); @ ensures (\result == 1) ==> (file_recovery_new->calculated_file_size == 0); @ ensures (\result == 1) ==> (file_recovery_new->extension == file_hint_ace.extension); @ ensures (\result == 1) ==> (file_recovery_new->file_check == &file_check_ace); - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @ assigns *file_recovery_new; @*/ static int header_check_ace(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)