From 68932b5bd3dd07eaf2a6d83995a63770e884b560 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sat, 24 Jul 2021 14:44:40 +0200 Subject: [PATCH] src/file_reg.c: improve FRama-C annotations --- src/file_reg.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/file_reg.c b/src/file_reg.c index d672f5ce..111cde9c 100644 --- a/src/file_reg.c +++ b/src/file_reg.c @@ -32,7 +32,7 @@ #include "common.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_reg(file_stat_t *file_stat); const file_hint_t file_hint_reg= { @@ -73,13 +73,10 @@ struct rgdb_block /*@ @ requires buffer_size > sizeof(struct creg_file_header); - @ 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_reg, 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_reg_9x(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) { @@ -90,11 +87,11 @@ static int header_check_reg_9x(const unsigned char *buffer, const unsigned int b const struct rgdb_block*block=(const struct rgdb_block*)(buffer+le32(header->rgdb_offset)); if(memcmp(block,"RGDB",4)!=0) return 0; - reset_file_recovery(file_recovery_new); - file_recovery_new->min_filesize=0x1000; - file_recovery_new->extension=file_hint_reg.extension; - return 1; } + reset_file_recovery(file_recovery_new); + file_recovery_new->min_filesize=0x1000; + file_recovery_new->extension=file_hint_reg.extension; + return 1; } struct regf_file_header @@ -117,13 +114,10 @@ struct regf_file_header /*@ @ requires buffer_size > sizeof(struct regf_file_header); - @ 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_reg, 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_reg_nt(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) {