From 383ff1cb919614e42132409688bca820ad9b8113 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 22 Jun 2021 13:28:49 +0200 Subject: [PATCH] src/file_hr9.c: improve Frama-C annotations --- src/file_hr9.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/file_hr9.c b/src/file_hr9.c index ea08ba54..21517fdd 100644 --- a/src/file_hr9.c +++ b/src/file_hr9.c @@ -30,7 +30,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_hr9(file_stat_t *file_stat); const file_hint_t file_hint_hr9= { @@ -43,12 +43,8 @@ const file_hint_t file_hint_hr9= { }; /*@ - @ requires \valid(file_recovery); - @ requires \valid(file_recovery->handle); - @ requires valid_file_recovery(file_recovery); - @ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source); - @ ensures \valid(file_recovery->handle); - @ ensures valid_file_recovery(file_recovery); + @ 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; @*/ @@ -59,14 +55,9 @@ static void file_check_hr9(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 separation: \separated(&file_hint_hr9, 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_hr9(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)