From f78cc39d9337cea887448b434dad7556132721f9 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sat, 3 Jul 2021 13:57:57 +0200 Subject: [PATCH] src/file_msa.c: improve Frama-C annotations --- src/file_msa.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/file_msa.c b/src/file_msa.c index 90d9e460..1f0c9a1c 100644 --- a/src/file_msa.c +++ b/src/file_msa.c @@ -32,7 +32,7 @@ #include "filegen.h" #include "common.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_msa(file_stat_t *file_stat); const file_hint_t file_hint_msa= { @@ -52,14 +52,10 @@ struct msa_header /*@ @ requires buffer_size > 0x13; - @ 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_msa, buffer+(..), 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; - @ ensures \result == 0 || \result == 1; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_msa(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) { @@ -78,7 +74,7 @@ static int header_check_msa(const unsigned char *buffer, const unsigned int buff } /*@ - @ requires \valid(file_stat); + @ requires valid_register_header_check(file_stat); @*/ static void register_header_check_msa(file_stat_t *file_stat) {