From f1880b0b526f9ca4f2158b5cc7d35bb79dac5a21 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Wed, 7 Jul 2021 13:43:05 +0200 Subject: [PATCH] src/file_pnm.c: improve Frama-C annotations --- src/file_pnm.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/file_pnm.c b/src/file_pnm.c index 40645d03..28884ceb 100644 --- a/src/file_pnm.c +++ b/src/file_pnm.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_pnm(file_stat_t *file_stat); const file_hint_t file_hint_pnm = { @@ -46,12 +46,9 @@ const file_hint_t file_hint_pnm = { /*@ @ requires buffer_size >= 8; - @ 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_pnm, 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_pbm(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) @@ -65,12 +62,9 @@ static int header_check_pbm(const unsigned char *buffer, const unsigned int buff /*@ @ requires buffer_size >= 8; - @ 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_pnm, 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_pgm(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) @@ -84,12 +78,9 @@ static int header_check_pgm(const unsigned char *buffer, const unsigned int buff /*@ @ requires buffer_size >= 8; - @ 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_pnm, 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_ppm(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)