src/file_ogg.c: improve Frama-C annotations

This commit is contained in:
Christophe Grenier 2021-07-03 22:04:33 +02:00
parent 52dfc4afc5
commit 9699f273b9

View file

@ -32,7 +32,7 @@
#include "filegen.h" #include "filegen.h"
#include "log.h" #include "log.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_ogg(file_stat_t *file_stat); static void register_header_check_ogg(file_stat_t *file_stat);
const file_hint_t file_hint_ogg= { const file_hint_t file_hint_ogg= {
@ -49,14 +49,9 @@ static const unsigned char ogg_header[5]= {'O','g','g','S', 0x00};
/* http://www.ietf.org/rfc/rfc3533.txt */ /* http://www.ietf.org/rfc/rfc3533.txt */
/*@ /*@
@ requires buffer_size > 0;
@ requires (buffer_size&1)==0;
@ requires \valid_read(buffer+(0..buffer_size-1));
@ requires \valid(file_recovery);
@ requires file_recovery->data_check==&data_check_ogg; @ requires file_recovery->data_check==&data_check_ogg;
@ requires file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; @ requires valid_data_check_param(buffer, buffer_size, file_recovery);
@ requires \separated(buffer, file_recovery); @ ensures valid_data_check_result(\result, file_recovery);
@ ensures \result == DC_CONTINUE || \result == DC_STOP;
@ assigns file_recovery->calculated_file_size; @ assigns file_recovery->calculated_file_size;
@*/ @*/
static data_check_t data_check_ogg(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) static data_check_t data_check_ogg(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
@ -102,13 +97,9 @@ static data_check_t data_check_ogg(const unsigned char *buffer, const unsigned i
/*@ /*@
@ requires buffer_size >= 0x78+7; @ requires buffer_size >= 0x78+7;
@ 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_ogg, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_ogg, buffer+(..), file_recovery, file_recovery_new);
@ ensures \result == 0 || \result == 1; @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new);
@ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @ ensures valid_header_check_result(\result, file_recovery_new);
@*/ @*/
static int header_check_ogg(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_ogg(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)
{ {