From 1b90a5bcf3874d4c87b7288ba2ccf183a26e7a3e Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 25 Jul 2021 11:12:08 +0200 Subject: [PATCH] src/file_tph.c: improve Frama-C annotations --- src/file_tph.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/file_tph.c b/src/file_tph.c index 259f8a9e..de18c9fb 100644 --- a/src/file_tph.c +++ b/src/file_tph.c @@ -32,7 +32,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_tph(file_stat_t *file_stat); const file_hint_t file_hint_tph = { @@ -45,11 +45,9 @@ const file_hint_t file_hint_tph = { }; /*@ - @ requires \valid(file_recovery); - @ requires valid_file_recovery(file_recovery); - @ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source); @ requires file_recovery->file_check == &file_check_tph; - @ 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 Frama_C_entropy_source; @*/ @@ -64,13 +62,9 @@ static void file_check_tph(file_recovery_t *file_recovery) /*@ @ requires buffer_size >= 24; - @ 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_tph, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result == 0 || \result == 1; - @ 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_tph(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)