From b0b8f70954cf6a4e7014a02651357b236002444c Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Thu, 3 Jun 2021 13:54:19 +0200 Subject: [PATCH] src/file_abr.c: Update Frama-C annotations --- src/file_abr.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/file_abr.c b/src/file_abr.c index 46c89685..0fce2429 100644 --- a/src/file_abr.c +++ b/src/file_abr.c @@ -33,8 +33,9 @@ #include "filegen.h" #include "common.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_abr(file_stat_t *file_stat); + struct abr_header { char magic[4]; @@ -52,15 +53,10 @@ const file_hint_t file_hint_abr= { }; /*@ - @ 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_abr; - @ requires file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; - @ requires \separated(buffer, file_recovery); - @ ensures \result == DC_CONTINUE || \result == DC_STOP; - @ assigns file_recovery->calculated_file_size; + @ 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_abr(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) { @@ -84,13 +80,10 @@ static data_check_t data_check_abr(const unsigned char *buffer, const unsigned i /*@ @ requires buffer_size >= 4 + sizeof(struct abr_header) ; - @ 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_abr, 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 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_abr(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) {