From 90fd993eb59318cd7d25496aaeea0e609c966095 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Wed, 28 Jul 2021 13:44:57 +0200 Subject: [PATCH] src/file_wv.c: improve Frama-C annotations --- src/file_wv.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/file_wv.c b/src/file_wv.c index 091ed7d2..f2d0844e 100644 --- a/src/file_wv.c +++ b/src/file_wv.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_wv(file_stat_t *file_stat); const file_hint_t file_hint_wv = { @@ -66,13 +66,9 @@ typedef struct } WavpackHeader; /*@ - @ requires buffer_size > 0; - @ requires (buffer_size&1)==0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid(file_recovery); @ requires file_recovery->data_check==&data_check_wv; - @ requires \separated(buffer + (..), file_recovery); - @ ensures \result == DC_CONTINUE || \result == DC_STOP; + @ requires valid_data_check_param(buffer, buffer_size, file_recovery); + @ ensures valid_data_check_result(\result, file_recovery); @ assigns file_recovery->calculated_file_size; @*/ static data_check_t data_check_wv(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) @@ -110,12 +106,9 @@ static data_check_t data_check_wv(const unsigned char *buffer, const unsigned in /*@ @ requires buffer_size >= sizeof(WavpackHeader); - @ 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_wv, 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_wv(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)