From 03b6dbe5631480942743482f8125916f3a89771f Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sat, 12 Jun 2021 22:12:46 +0200 Subject: [PATCH] src/file_fits.c: improve Frama-C annotations. The various integer overflow remain. --- src/file_fits.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/file_fits.c b/src/file_fits.c index ff2ba0c3..e4b27634 100644 --- a/src/file_fits.c +++ b/src/file_fits.c @@ -37,7 +37,7 @@ #include "log.h" #endif -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_fits(file_stat_t *file_stat); const file_hint_t file_hint_fits= { @@ -160,15 +160,9 @@ static uint64_t fits_info(const unsigned char *buffer, const unsigned int buffer } /*@ - @ requires buffer_size > 0; - @ requires (buffer_size&1)==0; - @ requires \valid_read(buffer+(0..buffer_size-1)); - @ requires \valid(file_recovery); - @ requires valid_file_recovery(file_recovery); @ requires file_recovery->data_check==&data_check_fits; - @ 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, file_recovery->time; @*/ static data_check_t data_check_fits(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) @@ -214,13 +208,10 @@ static data_check_t data_check_fits(const unsigned char *buffer, const unsigned /*@ @ requires buffer_size >= 10; - @ 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_fits, 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_fits(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) {