luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

src/file_ico.c: improve Frama-C annotations

Browse source
This commit is contained in:
Christophe Grenier 2021-06-22 13:45:23 +02:00
parent 0107a4d983
commit a9aa8b641d
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/file_ico.c
View file

@ -33,7 +33,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_ico(file_stat_t *file_stat); static void register_header_check_ico(file_stat_t *file_stat);
const file_hint_t file_hint_ico= { const file_hint_t file_hint_ico= {
@ -80,13 +80,9 @@ struct ico_directory
/*@ /*@
@ requires buffer_size >= sizeof(struct ico_header); @ requires buffer_size >= sizeof(struct ico_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_ico, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_ico, 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);
@ assigns *file_recovery_new; @ assigns *file_recovery_new;
@*/ @*/
static int header_check_ico(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_ico(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)