From 4d4743073f32df4c4c0cc94bc463db1c971a9f14 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Wed, 20 Feb 2008 07:59:36 +0100 Subject: [PATCH] PhotoRec: add VectorWorks .mcd support file_doc.c: fix unchecked return value of fread file_mcd.c: fix invalid initialization --- src/Makefile.am | 2 +- src/file_doc.c | 16 ++++++++++--- src/file_fcp.c | 2 +- src/file_mcd.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ src/photorec.c | 2 ++ 5 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 src/file_mcd.c diff --git a/src/Makefile.am b/src/Makefile.am index 3e4c23ee..17180920 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ fs_H = analyse.h bfs.h bsd.h cramfs.h fat.h fatx.h ext2.h jfs_superblock.h jfs testdisk_SOURCES = testdisk.c $(base_C) $(base_H) $(fs_C) $(fs_H) testdisk.h adv.c adv.h dir.c dir.h dirpart.c dirpart.h edit.c edit.h ext2_dir.c ext2_dir.h ext2_inc.h fat_adv.c fat_dir.c fat_dir.h geometry.c godmode.c godmode.h intrface.c intrface.h ntfs_adv.c ntfs_dir.c ntfs_dir.h ntfs_fix.c ntfs_inc.h rfs_dir.c rfs_dir.h $(ICON_TESTDISK) next.c next.h dimage.c dimage.h #ntfs_udl.c ntfs_udl.h -photorec_SOURCES = photorec.c photorec.h phrecn.c phrecn.h dir.c dir.h ext2p.c ext2p.h ext2_dir.c ext2_dir.h ext2_inc.h fat_dir.c fat_dir.h fatp.c fatp.h filegen.c filegen.h file_7z.c file_a.c file_ab.c file_ace.c file_aif.c file_all.c file_asf.c file_au.c file_bkf.c file_bld.c file_bmp.c file_bz2.c file_cab.c file_cam.c file_cm.c file_crw.c file_ctg.c file_cwk.c file_dat.c file_dbf.c file_dim.c file_dir.c file_djv.c file_doc.c file_dpx.c file_dsc.c file_dss.c file_dta.c file_dv.c file_dwg.c file_elf.c file_emf.c file_evt.c file_exe.c pe.h file_ext.c file_fcp.c file_fh10.c file_fh5.c file_flac.c file_flv.c file_fs.c file_gif.c file_gz.c file_imb.c file_indd.c file_dump.c file_itu.c file_jpg.c file_jpg.h file_kdb.c file_lnk.c file_max.c file_mb.c file_mdb.c file_mdf.c file_mid.c file_mkv.c file_mov.c file_mp3.c file_mpg.c file_mrw.c file_mus.c file_mysql.c file_njx.c file_ogg.c file_one.c file_orf.c file_pap.c file_pct.c file_pcx.c file_pdf.c file_png.c file_prc.c file_ps.c file_psd.c file_pst.c file_ptb.c file_qbb.c file_qdf.c file_qxd.c file_ra.c file_raf.c file_rar.c file_raw.c file_rdc.c file_reg.c file_res.c file_riff.c file_rm.c file_rns.c file_rpm.c file_sit.c file_skp.c file_spe.c file_spss.c file_stu.c file_swf.c file_tar.c file_tar.h file_tib.c file_tiff.c file_txt.c file_vmdk.c file_wpd.c file_wmf.c file_x3f.c file_xcf.c file_xm.c file_xsv.c file_zip.c memmem.h geometry.c list.c list.h ole.h ntfs_dir.c ntfs_dir.h ntfsp.c ntfsp.h ntfs_inc.h sessionp.c sessionp.h $(base_C) $(base_H) $(fs_C) $(fs_H) $(ICON_PHOTOREC) +photorec_SOURCES = photorec.c photorec.h phrecn.c phrecn.h dir.c dir.h ext2p.c ext2p.h ext2_dir.c ext2_dir.h ext2_inc.h fat_dir.c fat_dir.h fatp.c fatp.h filegen.c filegen.h file_7z.c file_a.c file_ab.c file_ace.c file_aif.c file_all.c file_asf.c file_au.c file_bkf.c file_bld.c file_bmp.c file_bz2.c file_cab.c file_cam.c file_cm.c file_crw.c file_ctg.c file_cwk.c file_dat.c file_dbf.c file_dim.c file_dir.c file_djv.c file_doc.c file_dpx.c file_dsc.c file_dss.c file_dta.c file_dv.c file_dwg.c file_elf.c file_emf.c file_evt.c file_exe.c pe.h file_ext.c file_fcp.c file_fh10.c file_fh5.c file_flac.c file_flv.c file_fs.c file_gif.c file_gz.c file_imb.c file_indd.c file_dump.c file_itu.c file_jpg.c file_jpg.h file_kdb.c file_lnk.c file_max.c file_mb.c file_mcd.c file_mdb.c file_mdf.c file_mid.c file_mkv.c file_mov.c file_mp3.c file_mpg.c file_mrw.c file_mus.c file_mysql.c file_njx.c file_ogg.c file_one.c file_orf.c file_pap.c file_pct.c file_pcx.c file_pdf.c file_png.c file_prc.c file_ps.c file_psd.c file_pst.c file_ptb.c file_qbb.c file_qdf.c file_qxd.c file_ra.c file_raf.c file_rar.c file_raw.c file_rdc.c file_reg.c file_res.c file_riff.c file_rm.c file_rns.c file_rpm.c file_sit.c file_skp.c file_spe.c file_spss.c file_stu.c file_swf.c file_tar.c file_tar.h file_tib.c file_tiff.c file_txt.c file_vmdk.c file_wpd.c file_wmf.c file_x3f.c file_xcf.c file_xm.c file_xsv.c file_zip.c memmem.h geometry.c list.c list.h ole.h ntfs_dir.c ntfs_dir.h ntfsp.c ntfsp.h ntfs_inc.h sessionp.c sessionp.h $(base_C) $(base_H) $(fs_C) $(fs_H) $(ICON_PHOTOREC) #diskcp_SOURCES = diskcp.c types.h diff --git a/src/file_doc.c b/src/file_doc.c index 194fc051..c2ab0d39 100644 --- a/src/file_doc.c +++ b/src/file_doc.c @@ -179,7 +179,8 @@ static uint64_t test_OLE(FILE *IN) if(!IN) return 0; fseek(IN,0,SEEK_SET); - fread(&buffer_header,sizeof(buffer_header),1,IN); /*reads first sector including OLE header */ + if(fread(&buffer_header,sizeof(buffer_header),1,IN)<0) /*reads first sector including OLE header */ + return 0; /* log_trace("num_FAT_blocks %u\n",le32(header->num_FAT_blocks)); log_trace("num_extra_FAT_blocks %u\n",le32(header->num_extra_FAT_blocks)); @@ -204,7 +205,11 @@ static uint64_t test_OLE(FILE *IN) free(dif); return 0; } - fread(dif_pos, (inum_extra_FAT_blocks)?128:(le32(header->num_FAT_blocks)-109)%127),4,IN); + if(fread(dif_pos, (inum_extra_FAT_blocks)?128:(le32(header->num_FAT_blocks)-109)%127),4,IN)<0) + { + free(dif); + return 0; + } dif_pos+=(((1<uSectorShift))/4)-1); block=le32(dif[109+i*(((1<uSectorShift))/4)-1)+127]); } @@ -220,7 +225,12 @@ static uint64_t test_OLE(FILE *IN) free(fat); return 0; } - fread(fat+((j<uSectorShift))/4),(1<uSectorShift)),1,IN); + if(fread(fat+((j<uSectorShift))/4),(1<uSectorShift)),1,IN)<0) + { + free(dif); + free(fat); + return 0; + } } } { /* Search how many entries are not used at the end of the FAT */ diff --git a/src/file_fcp.c b/src/file_fcp.c index 89d997ce..fac74252 100644 --- a/src/file_fcp.c +++ b/src/file_fcp.c @@ -42,7 +42,7 @@ const file_hint_t file_hint_fcp= { .register_header_check=®ister_header_check_fcp }; -static const unsigned char fcp_header[4]= { 0xA2, 'K','e','y','G'}; +static const unsigned char fcp_header[5]= { 0xA2, 'K','e','y','G'}; /* Final Cut Pro is a professional non-linear editing system developed by Apple Inc. diff --git a/src/file_mcd.c b/src/file_mcd.c new file mode 100644 index 00000000..ed1f17ca --- /dev/null +++ b/src/file_mcd.c @@ -0,0 +1,62 @@ +/* + + File: file_mcd.c + + Copyright (C) 2008 Christophe GRENIER + + This software is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + */ +#ifdef HAVE_CONFIG_H +#include +#endif +#ifdef HAVE_STRING_H +#include +#endif +#include +#include "types.h" +#include "filegen.h" +#include "log.h" + +static void register_header_check_mcd(file_stat_t *file_stat); +static int header_check_mcd(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); + +const file_hint_t file_hint_mcd= { + .extension="mcd", + .description="VectorWorks", + .min_header_distance=0, + .max_filesize=PHOTOREC_MAX_FILE_SIZE, + .recover=1, + .register_header_check=®ister_header_check_mcd +}; + +static const unsigned char mcd_header[11]= { 'V', 'e','c','t','o','r','W','o','r','k','s'}; + +static void register_header_check_mcd(file_stat_t *file_stat) +{ + register_header_check(0x0e, mcd_header,sizeof(mcd_header), &header_check_mcd, file_stat); +} + +static int header_check_mcd(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) +{ + if(buffer[0]==0x00 && buffer[1]==0x00 && + memcmp(buffer+0x0e,mcd_header,sizeof(mcd_header))==0) + { + reset_file_recovery(file_recovery_new); + file_recovery_new->extension=file_hint_mcd.extension; + return 1; + } + return 0; +} diff --git a/src/photorec.c b/src/photorec.c index 50cd6c95..4fd540c0 100644 --- a/src/photorec.c +++ b/src/photorec.c @@ -143,6 +143,7 @@ extern const file_hint_t file_hint_kdb; extern const file_hint_t file_hint_lnk; extern const file_hint_t file_hint_max; extern const file_hint_t file_hint_mb; +extern const file_hint_t file_hint_mcd; extern const file_hint_t file_hint_mdb; extern const file_hint_t file_hint_mdf; extern const file_hint_t file_hint_mid; @@ -821,6 +822,7 @@ int main( int argc, char **argv ) { .enable=1, .file_hint=&file_hint_jpg }, { .enable=1, .file_hint=&file_hint_max }, { .enable=1, .file_hint=&file_hint_mb }, + { .enable=1, .file_hint=&file_hint_mcd }, { .enable=1, .file_hint=&file_hint_mdb }, { .enable=1, .file_hint=&file_hint_mdf }, { .enable=1, .file_hint=&file_hint_mid },