src/file_rpm.c: improve Frama-C annotations

This commit is contained in:
Christophe Grenier 2021-07-24 15:01:16 +02:00
parent 2db801e7cf
commit 66c800fa0c

View file

@ -32,7 +32,7 @@
#include "common.h" #include "common.h"
#include "filegen.h" #include "filegen.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_rpm(file_stat_t *file_stat); static void register_header_check_rpm(file_stat_t *file_stat);
const file_hint_t file_hint_rpm= { const file_hint_t file_hint_rpm= {
@ -56,9 +56,9 @@ struct rpmlead {
} __attribute__ ((gcc_struct, __packed__)); } __attribute__ ((gcc_struct, __packed__));
/*@ /*@
@ requires \valid(file_recovery);
@ requires valid_file_recovery(file_recovery);
@ requires file_recovery->file_rename==&file_rename_rpm; @ requires file_recovery->file_rename==&file_rename_rpm;
@ requires valid_file_rename_param(file_recovery);
@ ensures valid_file_rename_result(file_recovery);
@*/ @*/
static void file_rename_rpm(file_recovery_t *file_recovery) static void file_rename_rpm(file_recovery_t *file_recovery)
{ {
@ -77,12 +77,9 @@ static void file_rename_rpm(file_recovery_t *file_recovery)
/*@ /*@
@ requires buffer_size >= sizeof(struct rpmlead); @ requires buffer_size >= sizeof(struct rpmlead);
@ 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_rpm, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_rpm, 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; @ assigns *file_recovery_new;
@*/ @*/
static int header_check_rpm(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) static int header_check_rpm(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)