From ce12222637b9c10c2800a85bfb974adaaaa706e7 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Wed, 28 Jul 2021 22:28:08 +0200 Subject: [PATCH] src/file_xz.c: improve Frama-C annotations --- src/file_xz.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/file_xz.c b/src/file_xz.c index c9f62204..fad38b93 100644 --- a/src/file_xz.c +++ b/src/file_xz.c @@ -31,7 +31,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_xz(file_stat_t *file_stat); const file_hint_t file_hint_xz = { @@ -44,11 +44,9 @@ const file_hint_t file_hint_xz = { }; /*@ - @ requires \valid(file_recovery); - @ requires valid_file_recovery(file_recovery); - @ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source); @ requires file_recovery->file_check == &file_check_xz; - @ ensures \valid(file_recovery->handle); + @ requires valid_file_check_param(file_recovery); + @ ensures valid_file_check_result(file_recovery); @ assigns *file_recovery->handle, errno, file_recovery->file_size; @ assigns Frama_C_entropy_source; @*/ @@ -59,13 +57,9 @@ static void file_check_xz(file_recovery_t *file_recovery) } /*@ - @ requires buffer_size > 0; - @ 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_xz, 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_xz(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)