From 8fa16f4a5046de8db3d952f1064f61efd4771188 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 13 Jun 2021 18:49:19 +0200 Subject: [PATCH] src/file_fp7.c: improve Frama-C annotations --- src/file_fp7.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/file_fp7.c b/src/file_fp7.c index bf7a6183..d009d822 100644 --- a/src/file_fp7.c +++ b/src/file_fp7.c @@ -30,9 +30,8 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_fp7(file_stat_t *file_stat); -static int header_check_fp7(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); const file_hint_t file_hint_fp7= { .extension="fp7", @@ -43,20 +42,20 @@ const file_hint_t file_hint_fp7= { .register_header_check=®ister_header_check_fp7 }; +/*@ + @ requires valid_file_check_param(file_recovery); + @ ensures valid_file_check_result(file_recovery); + @ assigns file_recovery->file_size; + @*/ static void file_check_fp7(file_recovery_t *file_recovery) { file_recovery->file_size=file_recovery->file_size/4096*4096; } /*@ - @ 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_fp7, 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_fp7(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)