src/file_cab.c: improve Frama-C annotations

This commit is contained in:
Christophe Grenier 2021-06-06 15:26:04 +02:00
parent 075a9f762b
commit b8625949c3

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_cab(file_stat_t *file_stat); static void register_header_check_cab(file_stat_t *file_stat);
const file_hint_t file_hint_cab= { const file_hint_t file_hint_cab= {
@ -61,14 +61,10 @@ struct cab_header {
/*@ /*@
@ requires buffer_size >= sizeof(struct cab_header) ; @ requires buffer_size >= sizeof(struct cab_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_cab, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_cab, 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; @ assigns *file_recovery_new;
@ ensures \result == 0 || \result == 1;
@ ensures \result!=0 ==> valid_file_recovery(file_recovery_new);
@*/ @*/
static int header_check_cab(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_cab(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)
{ {