From 98b6a589d014ef25fbe8e751efe7c604e049abc0 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Mon, 7 Jun 2021 13:11:47 +0200 Subject: [PATCH] src/file_dss.c: improve Frama-C annotations --- src/file_dss.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/file_dss.c b/src/file_dss.c index 93931f1c..f5c37b35 100644 --- a/src/file_dss.c +++ b/src/file_dss.c @@ -34,7 +34,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_dss(file_stat_t *file_stat); const file_hint_t file_hint_dss = { @@ -61,12 +61,9 @@ const file_hint_t file_hint_dss = { /*@ @ requires buffer_size >= 0x26+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_dss, buffer+(..), file_recovery, file_recovery_new); - @ 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_dss(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)