summaryrefslogtreecommitdiffstats
path: root/src/file_pyc.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2011-10-30 12:16:09 +0100
committerChristophe Grenier <grenier@cgsecurity.org>2011-10-30 12:16:09 +0100
commit622c4c001b076896ee959efdace4c8f81eb8937b (patch)
treea85a90311645e248fa35eb3567bf0fe637bc569f /src/file_pyc.c
parenta0a5105a3b16c3662fef193da61181f60eba627f (diff)
PhotoRec: modify .pyc recovery to recover Python byte-compiled 2.6, 2.7, 3.0, 3.1 and 3.2
Diffstat (limited to 'src/file_pyc.c')
-rw-r--r--src/file_pyc.c32
1 files changed, 25 insertions, 7 deletions
diff --git a/src/file_pyc.c b/src/file_pyc.c
index cfe3568..65c5dda 100644
--- a/src/file_pyc.c
+++ b/src/file_pyc.c
@@ -54,6 +54,11 @@ static const unsigned char pyc_22_magic[4]= { 0x2d, 0xed, '\r', '\n'};
static const unsigned char pyc_23_magic[4]= { 0x3b, 0xf2, '\r', '\n'};
static const unsigned char pyc_24_magic[4]= { 0x6d, 0xf2, '\r', '\n'};
static const unsigned char pyc_25_magic[4]= { 0xb3, 0xf2, '\r', '\n'};
+static const unsigned char pyc_26_magic[4]= { 0xd1, 0xf2, '\r', '\n'};
+static const unsigned char pyc_27_magic[4]= { 0x03, 0xf3, '\r', '\n'};
+static const unsigned char pyc_30_magic[4]= { 0x3b, 0x0c, '\r', '\n'};
+static const unsigned char pyc_31_magic[4]= { 0x4f, 0x0c, '\r', '\n'};
+static const unsigned char pyc_32_magic[4]= { 0x6c, 0x0c, '\r', '\n'};
struct pyc_header {
uint32_t magic_number;
@@ -69,20 +74,33 @@ static void register_header_check_pyc(file_stat_t *file_stat)
register_header_check(0, pyc_23_magic, sizeof(pyc_23_magic), &header_check_pyc, file_stat);
register_header_check(0, pyc_24_magic, sizeof(pyc_24_magic), &header_check_pyc, file_stat);
register_header_check(0, pyc_25_magic, sizeof(pyc_25_magic), &header_check_pyc, file_stat);
+ register_header_check(0, pyc_26_magic, sizeof(pyc_26_magic), &header_check_pyc, file_stat);
+ register_header_check(0, pyc_27_magic, sizeof(pyc_27_magic), &header_check_pyc, file_stat);
+ register_header_check(0, pyc_30_magic, sizeof(pyc_30_magic), &header_check_pyc, file_stat);
+ register_header_check(0, pyc_31_magic, sizeof(pyc_31_magic), &header_check_pyc, file_stat);
+ register_header_check(0, pyc_32_magic, sizeof(pyc_32_magic), &header_check_pyc, file_stat);
}
static int header_check_pyc(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 struct pyc_header *pyc=(const struct pyc_header *)buffer;
+ /* marshalled code object must be of of type TYPE_CODE and argcount < 256 */
+ if(buffer[8]!='c' || buffer[9]!=0 || buffer[10]!=0 || buffer[11]!=0)
+ return 0;
switch(be32(pyc->magic_number))
{
- case 0x994e0d0a:
- case 0x87c60d0a:
- case 0x2aeb0d0a:
- case 0x2ded0d0a:
- case 0x3bf20d0a:
- case 0x6df20d0a:
- case 0xb3f20d0a:
+ case 0x994e0d0a: /* 1.5 */
+ case 0x87c60d0a: /* 2.0 */
+ case 0x2aeb0d0a: /* 2.1 */
+ case 0x2ded0d0a: /* 2.2 */
+ case 0x3bf20d0a: /* 2.3 */
+ case 0x6df20d0a: /* 2.4 */
+ case 0xb3f20d0a: /* 2.5 */
+ case 0xd1f20d0a: /* 2.6 */
+ case 0x03f30d0a: /* 2.7 */
+ case 0x3b0c0d0a: /* 3.0 */
+ case 0x4f0c0d0a: /* 3.1 */
+ case 0x6c0c0d0a: /* 3.2 */
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_pyc.extension;
file_recovery_new->time=le32(pyc->modtime);