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

src/file_reg.c: improve FRama-C annotations

Browse source
This commit is contained in:
Christophe Grenier 2021-07-24 14:44:40 +02:00
parent c8f5ace77b
commit 68932b5bd3
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/file_reg.c
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_reg(file_stat_t *file_stat); static void register_header_check_reg(file_stat_t *file_stat);
const file_hint_t file_hint_reg= { const file_hint_t file_hint_reg= {
@ -73,13 +73,10 @@ struct rgdb_block
/*@ /*@
@ requires buffer_size > sizeof(struct creg_file_header); @ requires buffer_size > sizeof(struct creg_file_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_reg, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_reg, 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 ==> valid_file_recovery(file_recovery_new);
@*/ @*/
static int header_check_reg_9x(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_reg_9x(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)
{ {
@ -90,11 +87,11 @@ static int header_check_reg_9x(const unsigned char *buffer, const unsigned int b
const struct rgdb_block*block=(const struct rgdb_block*)(buffer+le32(header->rgdb_offset)); const struct rgdb_block*block=(const struct rgdb_block*)(buffer+le32(header->rgdb_offset));
if(memcmp(block,"RGDB",4)!=0) if(memcmp(block,"RGDB",4)!=0)
return 0; return 0;
reset_file_recovery(file_recovery_new);
file_recovery_new->min_filesize=0x1000;
file_recovery_new->extension=file_hint_reg.extension;
return 1;
} }
reset_file_recovery(file_recovery_new);
file_recovery_new->min_filesize=0x1000;
file_recovery_new->extension=file_hint_reg.extension;
return 1;
} }
struct regf_file_header struct regf_file_header
@ -117,13 +114,10 @@ struct regf_file_header
/*@ /*@
@ requires buffer_size > sizeof(struct regf_file_header); @ requires buffer_size > sizeof(struct regf_file_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_reg, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_reg, 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 ==> valid_file_recovery(file_recovery_new);
@*/ @*/
static int header_check_reg_nt(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_reg_nt(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)
{ {