From effc05c7cced649f2eee6f46b79beebb9a7d74c8 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Wed, 28 Jul 2021 13:39:31 +0200 Subject: [PATCH] src/file_wtv.c: improve Frama-C annotations --- src/file_wtv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/file_wtv.c b/src/file_wtv.c index a3bb19e3..cca730fa 100644 --- a/src/file_wtv.c +++ b/src/file_wtv.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_wtv(file_stat_t *file_stat); const file_hint_t file_hint_wtv = { @@ -46,12 +46,9 @@ const file_hint_t file_hint_wtv = { /*@ @ requires buffer_size >= 0x60; - @ 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_wtv, 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); @*/ static int header_check_wtv(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) {