diff options
| author | Christophe Grenier <[email protected]> | 2023-10-08 14:35:55 +0200 |
|---|---|---|
| committer | Christophe Grenier <[email protected]> | 2023-10-08 14:35:55 +0200 |
| commit | 51f8d1310b805e742584cc74c41b609886b6e012 (patch) | |
| tree | cbd62ae373a4d83d8a8cb7c148066fa1db168e32 | |
| parent | 4730b7aa87f8c375ef55ccc7f71d055b100eb74c (diff) | |
src/file_psb.c: improve Frama-C annotations
| -rw-r--r-- | src/file_psb.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/file_psb.c b/src/file_psb.c index 630613e3..710ac6e9 100644 --- a/src/file_psb.c +++ b/src/file_psb.c @@ -92,6 +92,9 @@ static uint64_t get_be64(const void *buffer, const unsigned int offset) @*/ static data_check_t psb_skip_image_data(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) { + /*@ assert file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert file_recovery->file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert buffer_size <= 2 * PHOTOREC_MAX_BLOCKSIZE; */ file_recovery->calculated_file_size+=2; file_recovery->data_check=NULL; return DC_CONTINUE; @@ -103,10 +106,13 @@ static data_check_t psb_skip_image_data(const unsigned char *buffer, const unsig @ ensures valid_data_check_result(\result, file_recovery); @ ensures file_recovery->data_check==&psb_skip_layer_info || file_recovery->data_check==\null; @ ensures \result == DC_CONTINUE || \result == DC_STOP; - @ assigns file_recovery->data_check, file_recovery->file_check, file_recovery->calculated_file_size; + @ assigns file_recovery->data_check, file_recovery->calculated_file_size; @*/ static data_check_t psb_skip_layer_info(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) { + /*@ assert file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert file_recovery->file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert buffer_size <= 2 * PHOTOREC_MAX_BLOCKSIZE; */ if(file_recovery->calculated_file_size + buffer_size/2 >= file_recovery->file_size && file_recovery->calculated_file_size + 8 < file_recovery->file_size + buffer_size/2) { @@ -137,6 +143,9 @@ static data_check_t psb_skip_layer_info(const unsigned char *buffer, const unsig @*/ static data_check_t psb_skip_image_resources(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) { + /*@ assert file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert file_recovery->file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert buffer_size <= 2 * PHOTOREC_MAX_BLOCKSIZE; */ if(file_recovery->calculated_file_size + buffer_size/2 >= file_recovery->file_size && file_recovery->calculated_file_size + 4 < file_recovery->file_size + buffer_size/2) { @@ -171,6 +180,9 @@ static data_check_t psb_skip_color_mode(const unsigned char *buffer, const unsig const unsigned int depth=be16(hdr->depth); const unsigned int height=be32(hdr->height); const unsigned int width=be32(hdr->width); + /*@ assert file_recovery->calculated_file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert file_recovery->file_size <= PHOTOREC_MAX_FILE_SIZE; */ + /*@ assert buffer_size <= 2 * PHOTOREC_MAX_BLOCKSIZE; */ if(channels==0 || channels>56 || height==0 || height>300000 || width==0 || width>300000 || |