summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/file_save.c2
-rw-r--r--src/file_sdsk.c2
-rw-r--r--src/file_sdw.c2
-rw-r--r--src/file_ses.c2
-rw-r--r--src/file_sgcta.c2
-rw-r--r--src/file_shn.c2
-rw-r--r--src/file_shp.c2
-rw-r--r--src/file_sib.c2
-rw-r--r--src/file_sit.c2
-rw-r--r--src/file_skd.c2
-rw-r--r--src/file_skp.c2
-rw-r--r--src/file_snag.c2
-rw-r--r--src/file_sp3.c2
-rw-r--r--src/file_spe.c6
-rw-r--r--src/file_spf.c3
-rw-r--r--src/file_spss.c2
-rw-r--r--src/file_sql.c2
-rw-r--r--src/file_sqm.c2
-rw-r--r--src/file_steuer2014.c2
-rw-r--r--src/file_stl.c2
-rw-r--r--src/file_stu.c2
-rw-r--r--src/file_studio.c2
-rw-r--r--src/file_swf.c7
23 files changed, 54 insertions, 2 deletions
diff --git a/src/file_save.c b/src/file_save.c
index 3740d892..e91f1f99 100644
--- a/src/file_save.c
+++ b/src/file_save.c
@@ -53,6 +53,8 @@ static int header_check_save(const unsigned char *buffer, const unsigned int buf
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_save.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sdsk.c b/src/file_sdsk.c
index 198df9f5..47c4e5ac 100644
--- a/src/file_sdsk.c
+++ b/src/file_sdsk.c
@@ -54,6 +54,8 @@ static int header_check_sdsk(const unsigned char *buffer, const unsigned int buf
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_sdsk.extension;
file_recovery_new->min_filesize=0x1000;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sdw.c b/src/file_sdw.c
index 88a39e30..c621d253 100644
--- a/src/file_sdw.c
+++ b/src/file_sdw.c
@@ -51,6 +51,8 @@ static int header_check_sdw(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_sdw.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_ses.c b/src/file_ses.c
index e74d9d77..6ec4a1e1 100644
--- a/src/file_ses.c
+++ b/src/file_ses.c
@@ -54,6 +54,8 @@ static int header_check_ses(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_ses.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sgcta.c b/src/file_sgcta.c
index 13f6681f..b12dfd5e 100644
--- a/src/file_sgcta.c
+++ b/src/file_sgcta.c
@@ -53,6 +53,8 @@ static int header_check_sgcta(const unsigned char *buffer, const unsigned int bu
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_sgcta.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_shn.c b/src/file_shn.c
index bbe7e83b..932fea6e 100644
--- a/src/file_shn.c
+++ b/src/file_shn.c
@@ -53,6 +53,8 @@ static int header_check_shn(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_shn.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_shp.c b/src/file_shp.c
index 334c0d0d..6aac7886 100644
--- a/src/file_shp.c
+++ b/src/file_shp.c
@@ -111,6 +111,8 @@ static int header_check_shp(const unsigned char *buffer, const unsigned int buff
file_recovery_new->calculated_file_size=size;
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sib.c b/src/file_sib.c
index 796bf1e1..55a21ab1 100644
--- a/src/file_sib.c
+++ b/src/file_sib.c
@@ -53,6 +53,8 @@ static int header_check_sib(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_sib.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sit.c b/src/file_sit.c
index b504c63b..ecfcf9f5 100644
--- a/src/file_sit.c
+++ b/src/file_sit.c
@@ -54,6 +54,8 @@ static int header_check_sit(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_sit.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_skd.c b/src/file_skd.c
index 26331a8f..9a1fff18 100644
--- a/src/file_skd.c
+++ b/src/file_skd.c
@@ -52,6 +52,8 @@ static int header_check_skd(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_skd.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_skp.c b/src/file_skp.c
index 48b790f8..128f31f7 100644
--- a/src/file_skp.c
+++ b/src/file_skp.c
@@ -53,6 +53,8 @@ static int header_check_skp(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_skp.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_snag.c b/src/file_snag.c
index c9797b6a..866c5fd5 100644
--- a/src/file_snag.c
+++ b/src/file_snag.c
@@ -66,6 +66,8 @@ static int header_check_snag(const unsigned char *buffer, const unsigned int buf
file_recovery_new->extension=file_hint_snag.extension;
file_recovery_new->file_check=&file_check_snag;
file_recovery_new->min_filesize=24+512;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sp3.c b/src/file_sp3.c
index 458bf0af..76d6381e 100644
--- a/src/file_sp3.c
+++ b/src/file_sp3.c
@@ -142,6 +142,8 @@ static int header_check_sp3(const unsigned char *buffer, const unsigned int buff
file_recovery_new->calculated_file_size=get_size_from_sp3(h);
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_spe.c b/src/file_spe.c
index 3ccacde6..3b0bde17 100644
--- a/src/file_spe.c
+++ b/src/file_spe.c
@@ -295,7 +295,7 @@ static int header_check_spe(const unsigned char *buffer, const unsigned int buff
if((tmp&0x8000000000000000)!=0)
return 0;
tmp+=4100;
- /*@ assert tmp > 4100; */
+ /*@ assert tmp >= 4100; */
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_spe.extension;
file_recovery_new->min_filesize=4100;
@@ -307,7 +307,9 @@ static int header_check_spe(const unsigned char *buffer, const unsigned int buff
#endif
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
- /*@ assert file_recovery_new->calculated_file_size > 4100; */
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
+ /*@ assert file_recovery_new->calculated_file_size >= 4100; */
return 1;
}
diff --git a/src/file_spf.c b/src/file_spf.c
index a2c8219e..cc9b8ca1 100644
--- a/src/file_spf.c
+++ b/src/file_spf.c
@@ -64,6 +64,7 @@ static void file_check_spf(file_recovery_t *file_recovery)
@ loop invariant valid_file_check_param(file_recovery);
@ loop assigns *file_recovery->handle, file_recovery->file_size;
@ loop assigns Frama_C_entropy_source, errno;
+ @ loop variant PHOTOREC_MAX_FILE_SIZE - file_recovery->file_size;
@*/
while(1)
{
@@ -123,6 +124,8 @@ static int header_check_spf(const unsigned char *buffer, const unsigned int buff
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_spf.extension;
file_recovery_new->file_check=&file_check_spf;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_spss.c b/src/file_spss.c
index 470f1ab3..73dbb96e 100644
--- a/src/file_spss.c
+++ b/src/file_spss.c
@@ -53,6 +53,8 @@ static int header_check_spss(const unsigned char *buffer, const unsigned int buf
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_spss.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sql.c b/src/file_sql.c
index 16b426f0..fa717d7b 100644
--- a/src/file_sql.c
+++ b/src/file_sql.c
@@ -102,6 +102,8 @@ static int header_check_sqlite(const unsigned char *buffer, const unsigned int b
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
}
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_sqm.c b/src/file_sqm.c
index 2ad2fcf7..81ba2042 100644
--- a/src/file_sqm.c
+++ b/src/file_sqm.c
@@ -53,6 +53,8 @@ static int header_check_sqm(const unsigned char *buffer, const unsigned int buff
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_sqm.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_steuer2014.c b/src/file_steuer2014.c
index abc7757d..11a81855 100644
--- a/src/file_steuer2014.c
+++ b/src/file_steuer2014.c
@@ -106,6 +106,8 @@ static int header_check_steuer(const unsigned char *buffer, const unsigned int b
strptime(h->date_string, "%b %d %Y %H:%M:%S", &tm_time);
file_recovery_new->time=mktime(&tm_time);
#endif
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_stl.c b/src/file_stl.c
index 6323ec54..9561f7f8 100644
--- a/src/file_stl.c
+++ b/src/file_stl.c
@@ -79,6 +79,8 @@ static int header_check_stl(const unsigned char *buffer, const unsigned int buff
file_recovery_new->calculated_file_size=filesize;
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_stu.c b/src/file_stu.c
index 635dd64c..19b4f353 100644
--- a/src/file_stu.c
+++ b/src/file_stu.c
@@ -54,6 +54,8 @@ static int header_check_stuffit(const unsigned char *buffer, const unsigned int
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_stuffit.extension;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_studio.c b/src/file_studio.c
index 94d8c404..0ebc4884 100644
--- a/src/file_studio.c
+++ b/src/file_studio.c
@@ -67,6 +67,8 @@ static int header_check_studio(const unsigned char *buffer, const unsigned int b
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
file_recovery_new->min_filesize=77;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
diff --git a/src/file_swf.c b/src/file_swf.c
index 4b7ac521..bbba47be 100644
--- a/src/file_swf.c
+++ b/src/file_swf.c
@@ -94,6 +94,7 @@ static int read_SB(const unsigned char **data, unsigned int *offset_bit, unsigne
const unsigned int sign=((**data) >>(7 - (*offset_bit)))&1;
/*@
loop unroll 31;
+ loop invariant 0 <= *offset_bit <= 7;
loop assigns nbit, *offset_bit, *data, res;
loop variant nbit;
*/
@@ -197,6 +198,8 @@ static int header_check_swfc(const unsigned char *buffer, const unsigned int buf
file_recovery_new->calculated_file_size=le32(hdr->size);
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size_max;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
@@ -242,6 +245,8 @@ static int header_check_swf(const unsigned char *buffer, const unsigned int buff
file_recovery_new->calculated_file_size=le32(hdr->size);
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}
@@ -270,6 +275,8 @@ static int header_check_swfz(const unsigned char *buffer, const unsigned int buf
file_recovery_new->calculated_file_size=(uint64_t)4+4+4+5+compressedLen;
file_recovery_new->data_check=&data_check_size;
file_recovery_new->file_check=&file_check_size_max;
+ /*@ assert valid_read_string(file_recovery_new->extension); */
+ /*@ assert valid_file_recovery(file_recovery_new); */
return 1;
}