From b616323d15a80368f64f9067b721df81d21b22be Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sat, 24 Jul 2021 15:05:11 +0200 Subject: [PATCH] src/file_rw2.c: improve Frama-C annotations --- src/file_rw2.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/file_rw2.c b/src/file_rw2.c index 2f1ec0db..4309f7ba 100644 --- a/src/file_rw2.c +++ b/src/file_rw2.c @@ -33,7 +33,7 @@ #include "file_tiff.h" #include "common.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_rw2(file_stat_t *file_stat); const file_hint_t file_hint_rw2= { @@ -47,12 +47,9 @@ const file_hint_t file_hint_rw2= { /*@ @ requires buffer_size >= sizeof(TIFFHeader); - @ 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_rw2, 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_rw2(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)