summaryrefslogtreecommitdiff
authorChristophe Grenier <grenier@cgsecurity.org>2010-05-21 07:03:36 (GMT)
committer Christophe Grenier <grenier@cgsecurity.org>2010-05-21 07:03:36 (GMT)
commit1734dbdcd9db596cd87347794672420fbf97609e (patch)
tree45dc4219261a526d04db305119eea0fbec495d0f
parentf6ee3bf11eef1da58e489f6ef1b67e57e5310184 (diff)
PhotoRec: stricter check for .pcx
Diffstat
-rw-r--r--src/file_pcx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/file_pcx.c b/src/file_pcx.c
index 1878f0a..7eff9e6 100644
--- a/src/file_pcx.c
+++ b/src/file_pcx.c
@@ -94,8 +94,9 @@ static int header_check_pcx(const unsigned char *buffer, const unsigned int buff
pcx->Reserved==0 &&
le16(pcx->XMin) <= le16(pcx->XMax) &&
le16(pcx->YMin) <= le16(pcx->YMax) &&
- pcx->BytesPerLine>0 &&
- pcx->Filler[0]==0)
+ pcx->BytesPerLine>0 && pcx->BytesPerLine%2==0 &&
+ pcx->Filler[0]==0 && pcx->Filler[1]==0 &&
+ pcx->Filler[54]==0 && pcx->Filler[55]==0)
{
reset_file_recovery(file_recovery_new);
#ifdef DEBUG_PCX