From b43d23d66a777e330bde9d30d3b5362df971a2f5 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Mon, 7 Jun 2021 13:41:02 +0200 Subject: [PATCH] src/file_dxf.c: improve Frama-C annotations --- src/file_dxf.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/file_dxf.c b/src/file_dxf.c index 280126a3..06afd87c 100644 --- a/src/file_dxf.c +++ b/src/file_dxf.c @@ -32,7 +32,7 @@ #include "common.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_dxf(file_stat_t *file_stat); const file_hint_t file_hint_dxf= { @@ -46,13 +46,9 @@ const file_hint_t file_hint_dxf= { /*@ @ requires buffer_size >= 6; - @ requires (buffer_size&1)==0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid(file_recovery); @ requires file_recovery->data_check==&data_check_dxf; - @ requires file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; - @ 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_dxf(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) @@ -74,10 +70,9 @@ static data_check_t data_check_dxf(const unsigned char *buffer, const unsigned i } /*@ - @ requires \valid(file_recovery); @ requires file_recovery->file_check == &file_check_dxf; - @ requires valid_file_recovery(file_recovery); - @ ensures valid_file_recovery(file_recovery); + @ requires valid_file_check_param(file_recovery); + @ ensures valid_file_check_result(file_recovery); @ assigns *file_recovery->handle, errno, Frama_C_entropy_source, file_recovery->file_size; @*/ static void file_check_dxf(file_recovery_t *file_recovery) @@ -88,13 +83,9 @@ static void file_check_dxf(file_recovery_t *file_recovery) } /*@ - @ requires buffer_size > 0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid_read(file_recovery); - @ requires valid_file_recovery(file_recovery); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; @ requires separation: \separated(&file_hint_dxf, 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; @*/ static int header_check_dxf(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)