From 60b5272f9e8a3d1f3374ec1711979648f60ddcc9 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sat, 24 Jul 2021 16:04:06 +0200 Subject: [PATCH] src/file_spe.c: improve Frama-C annotations --- src/file_spe.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/file_spe.c b/src/file_spe.c index f4986898..c875ffe3 100644 --- a/src/file_spe.c +++ b/src/file_spe.c @@ -36,7 +36,7 @@ #include "__fc_builtin.h" #endif -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_spe(file_stat_t *file_stat); const file_hint_t file_hint_spe= { @@ -243,14 +243,9 @@ struct header_spe /*@ @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid_read(file_recovery); - @ requires file_recovery->file_stat==\null || valid_read_string((char*)file_recovery->filename); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; @ requires separation: \separated(&file_hint_spe, 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); + @ 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->extension == file_hint_spe.extension); @ ensures (\result == 1) ==> (file_recovery_new->time == 0); @ ensures (\result == 1) ==> (file_recovery_new->calculated_file_size >= 4100); @@ -259,9 +254,6 @@ struct header_spe @ ensures (\result == 1) ==> (file_recovery_new->data_check == &data_check_size); @ ensures (\result == 1) ==> (file_recovery_new->file_check == &file_check_size); @ ensures (\result == 1) ==> (file_recovery_new->file_rename == \null); - @ ensures (\result == 1) ==> (valid_read_string(file_recovery_new->extension)); - @ ensures (\result == 1) ==> \separated(file_recovery_new, file_recovery_new->extension); - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @ assigns file_recovery_new->filename[0]; @ assigns file_recovery_new->time; @ assigns file_recovery_new->file_stat; @@ -283,6 +275,7 @@ struct header_spe @ assigns file_recovery_new->checkpoint_offset; @ assigns file_recovery_new->flags; @ assigns file_recovery_new->extra; + @ assigns file_recovery_new->data_check_tmp; @*/ static int header_check_spe(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) {