diff options
author | Christophe Grenier <[email protected]> | 2021-06-12 21:58:51 +0200 |
---|---|---|
committer | Christophe Grenier <[email protected]> | 2021-06-12 21:58:51 +0200 |
commit | 27159d61445982fa7f8ad86b63510d18bd0488b9 (patch) | |
tree | 4e0393c0b7aae9f8e44a25e4e2ed88ec13e8c5ab /src/file_7z.c | |
parent | 06556c056271405b34e88aac6661d895c29ea500 (diff) |
src/file_7z.c: improve Frama-C annotations
Diffstat (limited to 'src/file_7z.c')
-rw-r--r-- | src/file_7z.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/file_7z.c b/src/file_7z.c index 12fefc80..3d87d6fd 100644 --- a/src/file_7z.c +++ b/src/file_7z.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_7z(file_stat_t *file_stat); const file_hint_t file_hint_7z= { @@ -56,14 +56,10 @@ struct header_7z { /*@ @ requires buffer_size >= sizeof(struct header_7z); - @ 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_7z, 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 || \result == 1; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_7z(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) { |