From 7d816e43ebf7c049351935e116410850f8578f96 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 27 Jul 2021 18:26:25 +0200 Subject: [PATCH] src/file_vmdk.c: improve Frama-C annotations --- src/file_vmdk.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/file_vmdk.c b/src/file_vmdk.c index 03a00bb1..9c4a67cf 100644 --- a/src/file_vmdk.c +++ b/src/file_vmdk.c @@ -32,7 +32,7 @@ #include "filegen.h" #include "common.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_vmdk(file_stat_t *file_stat); #define MAX_FILE_SIZE_VMDK (uint64_t)2048 * 1024 * 1024 * 1024 @@ -80,12 +80,9 @@ typedef struct /*@ @ requires buffer_size >= sizeof(VMDK3Header); - @ 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_vmdk, 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_vmdk3(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) @@ -106,12 +103,9 @@ static int header_check_vmdk3(const unsigned char *buffer, const unsigned int bu /*@ @ requires buffer_size >= sizeof(VMDK4Header); - @ 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_vmdk, 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_vmdk4(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)