Mercurial > libpst

annotate src/deltasearch.cpp @ 359:a3e674fade6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
From Jeffrey Morlan: pst_parse_block misreads Table Contexts (aka "type 2") with a multi-block Row Matrix ("ind2"). Rows are never split between blocks - every block except the last has padding at the end which should be ignored. I've only seen this affect the recipients table, but presumably it could affect attachments too. This was causing out-of-bounds memory ranges to be returned from pst_getBlockOffset and later access; patch fixes both the table reading issue and adds a missing bounds check to pst_getBlockOffset (so as not to risk a segfault if the PST is corrupted).
author Carl Byington <carl@five-ten-sg.com>
date Wed, 06 Jul 2016 10:20:12 -0700
parents fc11b1d1ad34
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
1 extern "C" {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
2 #include "define.h"
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
3 };
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
4
129
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 128
diff changeset
5 #include <fcntl.h>
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 128
diff changeset
6 #include <iostream>
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 128
diff changeset
7 #include <vector>
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 128
diff changeset
8 using namespace std;
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 128
diff changeset
9
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
10 unsigned char comp_enc [] =
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
11 { 0x47, 0xf1, 0xb4, 0xe6, 0x0b, 0x6a, 0x72, 0x48,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
12 0x85, 0x4e, 0x9e, 0xeb, 0xe2, 0xf8, 0x94, 0x53, /*0x0f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
13 0xe0, 0xbb, 0xa0, 0x02, 0xe8, 0x5a, 0x09, 0xab,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
14 0xdb, 0xe3, 0xba, 0xc6, 0x7c, 0xc3, 0x10, 0xdd, /*0x1f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
15 0x39, 0x05, 0x96, 0x30, 0xf5, 0x37, 0x60, 0x82,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
16 0x8c, 0xc9, 0x13, 0x4a, 0x6b, 0x1d, 0xf3, 0xfb, /*0x2f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
17 0x8f, 0x26, 0x97, 0xca, 0x91, 0x17, 0x01, 0xc4,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
18 0x32, 0x2d, 0x6e, 0x31, 0x95, 0xff, 0xd9, 0x23, /*0x3f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
19 0xd1, 0x00, 0x5e, 0x79, 0xdc, 0x44, 0x3b, 0x1a,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
20 0x28, 0xc5, 0x61, 0x57, 0x20, 0x90, 0x3d, 0x83, /*0x4f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
21 0xb9, 0x43, 0xbe, 0x67, 0xd2, 0x46, 0x42, 0x76,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
22 0xc0, 0x6d, 0x5b, 0x7e, 0xb2, 0x0f, 0x16, 0x29, /*0x5f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
23 0x3c, 0xa9, 0x03, 0x54, 0x0d, 0xda, 0x5d, 0xdf,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
24 0xf6, 0xb7, 0xc7, 0x62, 0xcd, 0x8d, 0x06, 0xd3, /*0x6f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
25 0x69, 0x5c, 0x86, 0xd6, 0x14, 0xf7, 0xa5, 0x66,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
26 0x75, 0xac, 0xb1, 0xe9, 0x45, 0x21, 0x70, 0x0c, /*0x7f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
27 0x87, 0x9f, 0x74, 0xa4, 0x22, 0x4c, 0x6f, 0xbf,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
28 0x1f, 0x56, 0xaa, 0x2e, 0xb3, 0x78, 0x33, 0x50, /*0x8f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
29 0xb0, 0xa3, 0x92, 0xbc, 0xcf, 0x19, 0x1c, 0xa7,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
30 0x63, 0xcb, 0x1e, 0x4d, 0x3e, 0x4b, 0x1b, 0x9b, /*0x9f*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
31 0x4f, 0xe7, 0xf0, 0xee, 0xad, 0x3a, 0xb5, 0x59,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
32 0x04, 0xea, 0x40, 0x55, 0x25, 0x51, 0xe5, 0x7a, /*0xaf*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
33 0x89, 0x38, 0x68, 0x52, 0x7b, 0xfc, 0x27, 0xae,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
34 0xd7, 0xbd, 0xfa, 0x07, 0xf4, 0xcc, 0x8e, 0x5f, /*0xbf*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
35 0xef, 0x35, 0x9c, 0x84, 0x2b, 0x15, 0xd5, 0x77,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
36 0x34, 0x49, 0xb6, 0x12, 0x0a, 0x7f, 0x71, 0x88, /*0xcf*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
37 0xfd, 0x9d, 0x18, 0x41, 0x7d, 0x93, 0xd8, 0x58,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
38 0x2c, 0xce, 0xfe, 0x24, 0xaf, 0xde, 0xb8, 0x36, /*0xdf*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
39 0xc8, 0xa1, 0x80, 0xa6, 0x99, 0x98, 0xa8, 0x2f,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
40 0x0e, 0x81, 0x65, 0x73, 0xe4, 0xc2, 0xa2, 0x8a, /*0xef*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
41 0xd4, 0xe1, 0x11, 0xd0, 0x08, 0x8b, 0x2a, 0xf2,
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
42 0xed, 0x9a, 0x64, 0x3f, 0xc1, 0x6c, 0xf9, 0xec}; /*0xff*/
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
43
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
44 int main(int argc, char* const* argv) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
45 if (argc < 4) {
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
46 printf("usage: %s filename.pst integer-delta search-string\n", argv[0]);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
47 return 0;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
48 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
49 int fd = open(argv[1], O_RDONLY);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
50 int d = atoi(argv[2]);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
51 string search(argv[3]);
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
52 printf("using file %s with delta %d looking for %s\n", argv[1], d, argv[3]);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
53 if (fd) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
54 struct stat st;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
55 fstat(fd, &st);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
56 off_t size = st.st_size;
128
7f747c8c9d02 cleanup installed headers
Carl Byington <carl@five-ten-sg.com>
parents: 118
diff changeset
57 vector <char> buf(size);
7f747c8c9d02 cleanup installed headers
Carl Byington <carl@five-ten-sg.com>
parents: 118
diff changeset
58 size_t s = read(fd, &buf[0], size);
7f747c8c9d02 cleanup installed headers
Carl Byington <carl@five-ten-sg.com>
parents: 118
diff changeset
59 pst_debug_hexdumper(stdout, &buf[0], s, 16, 0);
118
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
60 printf("\n\n dump decrypted data \n");
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
61 for (off_t i=0; i<size; i++) {
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 46
diff changeset
62 buf[i] = comp_enc[(unsigned char)buf[i]];
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
63 }
128
7f747c8c9d02 cleanup installed headers
Carl Byington <carl@five-ten-sg.com>
parents: 118
diff changeset
64 pst_debug_hexdumper(stdout, &buf[0], s, 16, 0);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
65 close(fd);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
66 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
67 return 0;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents:
diff changeset
68 }