From 76c0b41c7f7844da607d01262c0663177363d635 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Mon, 7 Jun 2021 12:47:30 +0200 Subject: [PATCH] src/file_ds2.c: improve Frama-C annotations --- src/file_ds2.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/file_ds2.c b/src/file_ds2.c index b06c3ad2..a3820b0a 100644 --- a/src/file_ds2.c +++ b/src/file_ds2.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_ds2(file_stat_t *file_stat); const file_hint_t file_hint_ds2= { @@ -59,14 +59,10 @@ const file_hint_t file_hint_ds2= { /*@ @ requires buffer_size >= 0x32; - @ 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_ds2, 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_ds2(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) {