From 7149aeaff8de50603aabb1e6e5577efc5195294a Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sat, 24 Jul 2021 14:36:21 +0200 Subject: [PATCH] src/file_rar.c: improve Frama-C annotations --- src/file_rar.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/file_rar.c b/src/file_rar.c index 4291eff9..a00bc704 100644 --- a/src/file_rar.c +++ b/src/file_rar.c @@ -32,7 +32,7 @@ #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_rar(file_stat_t *file_stat); const file_hint_t file_hint_rar= { @@ -47,10 +47,9 @@ const file_hint_t file_hint_rar= { #define MHD_PASSWORD 0x0080U /*@ - @ 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_rar15fmt; - @ 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; @*/ @@ -62,13 +61,9 @@ static void file_check_rar15fmt(file_recovery_t *file_recovery) /*@ @ requires buffer_size >= 0xb; - @ 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_rar, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result == 0 || \result == 1; - @ 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_rar15fmt(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) @@ -82,10 +77,9 @@ static int header_check_rar15fmt(const unsigned char *buffer, const unsigned int } /*@ - @ 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_rar50fmt; - @ 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; @*/ @@ -97,13 +91,9 @@ static void file_check_rar50fmt(file_recovery_t *file_recovery) /*@ @ requires buffer_size >= 0xb; - @ 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_rar, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result == 0 || \result == 1; - @ 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_rar50fmt(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)