From 84121e840425682a0c643da67661aea54f2a0345 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 6 Jun 2021 13:29:27 +0200 Subject: [PATCH] src/file_asm.c: Improve Frama-C annotations --- src/file_asm.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/file_asm.c b/src/file_asm.c index 693273ce..d1307c81 100644 --- a/src/file_asm.c +++ b/src/file_asm.c @@ -32,7 +32,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_asm(file_stat_t *file_stat); const file_hint_t file_hint_asm= { @@ -45,14 +45,11 @@ const file_hint_t file_hint_asm= { }; /*@ - @ requires valid_file_recovery(file_recovery); - @ requires \valid(file_recovery->handle); - @ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source); @ requires file_recovery->file_check == &file_check_asm; + @ 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; - @ - @ ensures \valid(file_recovery->handle); @*/ static void file_check_asm(file_recovery_t *file_recovery) { @@ -64,13 +61,10 @@ static void file_check_asm(file_recovery_t *file_recovery) /*@ @ requires buffer_size > 20; - @ 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_asm, 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_asm(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) {