/[public]/psiconv/trunk/lib/psiconv/parse_common.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_common.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 56 Revision 162
1/* 1/*
2 parse_common.c - Part of psiconv, a PSION 5 file formats converter 2 parse_common.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
20#include "config.h" 20#include "config.h"
21#include "compat.h" 21#include "compat.h"
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24 24
25#include "data.h"
26#include "parse_routines.h" 25#include "parse_routines.h"
26#include "error.h"
27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
27 32
28static int psiconv_parse_layout_section(const psiconv_buffer buf, 33static int psiconv_parse_layout_section(const psiconv_buffer buf,
29 int lev,psiconv_u32 off, 34 int lev,psiconv_u32 off,
30 int *length, 35 int *length,
31 psiconv_text_and_layout result, 36 psiconv_text_and_layout result,
32 psiconv_word_styles_section styles, 37 psiconv_word_styles_section styles,
33 int with_styles); 38 int with_styles);
39static psiconv_file_type_t psiconv_determine_embedded_object_type
40 (const psiconv_buffer buf,int lev,
41 int *status);
34 42
35int psiconv_parse_header_section(const psiconv_buffer buf,int lev, 43int psiconv_parse_header_section(const psiconv_buffer buf,int lev,
36 psiconv_u32 off, int *length, 44 psiconv_u32 off, int *length,
37 psiconv_header_section *result) 45 psiconv_header_section *result)
38{ 46{
39 int res=0; 47 int res=0;
40 int len=0; 48 int len=0;
41 psiconv_u32 temp; 49 psiconv_u32 temp;
42 50
43 psiconv_progress(lev+1,off+len,"Going to read the header section"); 51 psiconv_progress(lev+1,off+len,"Going to read the header section");
44 (*result) = malloc(sizeof(**result)); 52 if (!((*result) = malloc(sizeof(**result))))
53 goto ERROR1;
45 54
46 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3"); 55 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3");
47 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len); 56 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res);
57 if (res)
58 goto ERROR2;
48 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); 59 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1);
49 if ((*result)->uid1 == PSICONV_ID_CLIPART) { 60 if ((*result)->uid1 == PSICONV_ID_CLIPART) {
50 /* That's all folks... */ 61 /* That's all folks... */
51 (*result)->file = psiconv_clipart_file; 62 (*result)->file = psiconv_clipart_file;
52 (*result)->uid2 = 0; 63 (*result)->uid2 = 0;
… …
57 goto DONE; 68 goto DONE;
58 } 69 }
59 if ((*result)->uid1 != PSICONV_ID_PSION5) { 70 if ((*result)->uid1 != PSICONV_ID_PSION5) {
60 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably " 71 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably "
61 "not a (parsable) Psion 5 file"); 72 "not a (parsable) Psion 5 file");
62 res = -1; 73 res = -PSICONV_E_PARSE;
74 goto ERROR2;
63 } 75 }
64 len += 4; 76 len += 4;
65 (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len); 77 (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res);
78 if (res)
79 goto ERROR2;
66 psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2); 80 psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2);
67 len += 4; 81 len += 4;
68 (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len); 82 (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res);
83 if (res)
84 goto ERROR2;
69 psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3); 85 psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3);
70 len += 4; 86 len += 4;
71 87
72 (*result)->file = psiconv_unknown_file; 88 (*result)->file = psiconv_unknown_file;
73 if ((*result)->uid1 == PSICONV_ID_PSION5) { 89 if ((*result)->uid1 == PSICONV_ID_PSION5) {
… …
79 (*result)->file = psiconv_texted_file; 95 (*result)->file = psiconv_texted_file;
80 psiconv_debug(lev+2,off+len,"File is a TextEd file"); 96 psiconv_debug(lev+2,off+len,"File is a TextEd file");
81 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { 97 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) {
82 (*result)->file = psiconv_sketch_file; 98 (*result)->file = psiconv_sketch_file;
83 psiconv_debug(lev+2,off+len,"File is a Sketch file"); 99 psiconv_debug(lev+2,off+len,"File is a Sketch file");
100 } else if ((*result)->uid3 == PSICONV_ID_SHEET) {
101 (*result)->file = psiconv_sheet_file;
102 psiconv_debug(lev+2,off+len,"File is a Sheet file");
84 } 103 }
85 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { 104 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {
86 (*result)->file = psiconv_mbm_file; 105 (*result)->file = psiconv_mbm_file;
87 if ((*result)->uid3 != 0x00) 106 if ((*result)->uid3 != 0x00)
88 psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); 107 psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?");
89 psiconv_debug(lev+2,off+len,"File is a MBM file"); 108 psiconv_debug(lev+2,off+len,"File is a MBM file");
… …
93 psiconv_warn(lev+2,off+len,"Unknown file type"); 112 psiconv_warn(lev+2,off+len,"Unknown file type");
94 (*result)->file = psiconv_unknown_file; 113 (*result)->file = psiconv_unknown_file;
95 } 114 }
96 115
97 psiconv_progress(lev+2,off+len,"Checking UID4"); 116 psiconv_progress(lev+2,off+len,"Checking UID4");
98 temp = psiconv_read_u32(buf,lev+2,off+len); 117 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
118 if (res)
119 goto ERROR2;
99 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, 120 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2,
100 (*result)->uid3)) 121 (*result)->uid3))
101 psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp); 122 psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp);
102 else { 123 else {
103 psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!"); 124 psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!");
104 psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x", 125 psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x",
105 psiconv_checkuid((*result)->uid1,(*result)->uid2, 126 psiconv_checkuid((*result)->uid1,(*result)->uid2,
106 (*result)->uid3),temp); 127 (*result)->uid3),temp);
107 res = -1; 128 res = -PSICONV_E_PARSE;
129 goto ERROR2;
108 } 130 }
109 len += 4; 131 len += 4;
110 132
111DONE: 133DONE:
112 if (length) 134 if (length)
… …
114 136
115 psiconv_progress(lev+1,off+len-1, 137 psiconv_progress(lev+1,off+len-1,
116 "End of Header Section (total length: %08x)",len); 138 "End of Header Section (total length: %08x)",len);
117 139
118 return res; 140 return res;
141
142ERROR2:
143 free(*result);
144ERROR1:
145 psiconv_warn(lev+1,off,"Reading of Header Section failed");
146 if (length)
147 *length = 0;
148 if (res == 0)
149 return -PSICONV_E_NOMEM;
150 else
151 return res;
119} 152}
120 153
121int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev, 154int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev,
122 psiconv_u32 off, int *length, 155 psiconv_u32 off, int *length,
123 psiconv_section_table_section *result) 156 psiconv_section_table_section *result)
… …
128 161
129 int i; 162 int i;
130 psiconv_u8 nr; 163 psiconv_u8 nr;
131 164
132 psiconv_progress(lev+1,off+len,"Going to read the section table section"); 165 psiconv_progress(lev+1,off+len,"Going to read the section table section");
133 *result = psiconv_list_new(sizeof(*entry)); 166 if (!(*result = psiconv_list_new(sizeof(*entry))))
167 goto ERROR1;
134 168
135 psiconv_progress(lev+2,off+len,"Going to read the section table length"); 169 psiconv_progress(lev+2,off+len,"Going to read the section table length");
136 nr = psiconv_read_u8(buf,lev+2,off+len); 170 nr = psiconv_read_u8(buf,lev+2,off+len,&res);
171 if (res)
172 goto ERROR2;
137 psiconv_debug(lev+2,off+len,"Length: %08x",nr); 173 psiconv_debug(lev+2,off+len,"Length: %08x",nr);
138 if (nr & 0x01) { 174 if (nr & 0x01) {
139 psiconv_warn(lev+2,off+len, 175 psiconv_warn(lev+2,off+len,
140 "Section table length odd - ignoring last entry"); 176 "Section table length odd - ignoring last entry");
141 res = -1;
142 } 177 }
143 len ++; 178 len ++;
144 179
145 psiconv_progress(lev+2,off+len,"Going to read the section table entries"); 180 psiconv_progress(lev+2,off+len,"Going to read the section table entries");
146 entry = malloc(sizeof(*entry)); 181 entry = malloc(sizeof(*entry));
147 for (i = 0; i < nr / 2; i++) { 182 for (i = 0; i < nr / 2; i++) {
148 entry->id = psiconv_read_u32(buf,lev+2,off + len); 183 entry->id = psiconv_read_u32(buf,lev+2,off + len,&res);
184 if (res)
185 goto ERROR3;
149 psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); 186 psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id);
150 len += 0x04; 187 len += 0x04;
151 entry->offset = psiconv_read_u32(buf,lev+2,off + len); 188 entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res);
189 if (res)
190 goto ERROR3;
152 psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); 191 psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset);
153 len += 0x04; 192 len += 0x04;
154 psiconv_list_add(*result,entry); 193 if ((res=psiconv_list_add(*result,entry)))
194 goto ERROR3;
155 } 195 }
156 196
157 free(entry); 197 free(entry);
158 198
159 if (length) 199 if (length)
160 *length = len; 200 *length = len;
161 201
162 psiconv_progress(lev+1,off+len-1,"End of section table section " 202 psiconv_progress(lev+1,off+len-1,"End of section table section "
163 "(total length: %08x)", len); 203 "(total length: %08x)", len);
164 204
205 return 0;
206ERROR3:
207 free(entry);
208ERROR2:
209 psiconv_list_free(*result);
210ERROR1:
211 psiconv_warn(lev+1,off,"Reading of Section Table Section failed");
212 if (length)
213 *length = 0;
214 if (res == 0)
215 return -PSICONV_E_NOMEM;
216 else
165 return res; 217 return res;
166} 218}
167 219
168int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev, 220int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev,
169 psiconv_u32 off, int *length, 221 psiconv_u32 off, int *length,
170 psiconv_application_id_section *result) 222 psiconv_application_id_section *result)
… …
172 int res=0; 224 int res=0;
173 int len=0; 225 int len=0;
174 int leng; 226 int leng;
175 227
176 psiconv_progress(lev+1,off,"Going to read the application id section"); 228 psiconv_progress(lev+1,off,"Going to read the application id section");
177 (*result) = malloc(sizeof(**result)); 229 if (!(*result = malloc(sizeof(**result))))
230 goto ERROR1;
178 231
179 psiconv_progress(lev+2,off+len,"Going to read the type identifier"); 232 psiconv_progress(lev+2,off+len,"Going to read the type identifier");
180 (*result)->id = psiconv_read_u32(buf,lev+2,off+len); 233 (*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res);
234 if (res)
235 goto ERROR2;
181 psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id); 236 psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id);
182 len += 4; 237 len += 4;
183 238
184 psiconv_progress(lev+2,off+len,"Going to read the application id string"); 239 psiconv_progress(lev+2,off+len,"Going to read the application id string");
185 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng); 240 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res);
241 if (res)
242 goto ERROR2;
186 len += leng; 243 len += leng;
187 244
188 if (length) 245 if (length)
189 *length = len; 246 *length = len;
190 247
191 psiconv_progress(lev+1,off+len-1,"End of application id section " 248 psiconv_progress(lev+1,off+len-1,"End of application id section "
192 "(total length: %08x", len); 249 "(total length: %08x", len);
193 250
194 return res; 251 return res;
252ERROR2:
253 free(*result);
254ERROR1:
255 psiconv_warn(lev+1,off,"Reading of Application ID Section failed");
256 if (length)
257 *length = 0;
258 if (res == 0)
259 return -PSICONV_E_NOMEM;
260 else
261 return res;
195} 262}
196 263
197int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off, 264int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off,
198 int *length,psiconv_text_and_layout *result) 265 int *length,psiconv_text_and_layout *result)
199{ 266{
… …
203 270
204 psiconv_u32 text_len; 271 psiconv_u32 text_len;
205 psiconv_paragraph para; 272 psiconv_paragraph para;
206 273
207 int nr; 274 int nr;
208 int i,j,start,leng; 275 int i,j,start,leng,temp;
209 char *str_copy; 276 char *str_copy;
210 277
211 psiconv_progress(lev+1,off,"Going to parse the text section"); 278 psiconv_progress(lev+1,off,"Going to parse the text section");
212 psiconv_progress(lev+2,off,"Reading the text length"); 279 psiconv_progress(lev+2,off,"Reading the text length");
280
281 if(!(*result = psiconv_list_new(sizeof(*para))))
282 goto ERROR1;
283 if (!(para = malloc(sizeof(*para))))
284 goto ERROR2;
285
213 text_len = psiconv_read_X(buf,lev+2,off,&leng); 286 text_len = psiconv_read_X(buf,lev+2,off,&leng,&res);
287 if (res)
288 goto ERROR3;
214 psiconv_debug(lev+2,off,"Length: %08x",text_len); 289 psiconv_debug(lev+2,off,"Length: %08x",text_len);
215 len += leng; 290 len += leng;
216
217 *result = psiconv_list_new(sizeof(*para));
218 para = malloc(sizeof(*para));
219 291
220 psiconv_progress(lev+2,off+len,"Going to read all paragraph text"); 292 psiconv_progress(lev+2,off+len,"Going to read all paragraph text");
221 nr = 0; 293 nr = 0;
222 start = 0; 294 start = 0;
223 for (i = 0; i < text_len; i++) 295 for (i = 0; i < text_len; i++) {
224 if (psiconv_read_u8(buf,lev+2,off+len+i) == 0x06) { 296 temp = psiconv_read_u8(buf,lev+2,off+len+i,&res);
297 if (res)
298 goto ERROR3;
299 if (temp == 0x06) {
225 para->text = malloc(i - start + 1); 300 if (!(para->text = malloc(i - start + 1)))
301 goto ERROR3;
226 for (j = 0; j < i - start; j++) 302 for (j = 0; j < i - start; j++) {
227 para->text[j] = psiconv_read_u8(buf,lev+1,off + len + start + j); 303 temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res);
304 if (res)
305 goto ERROR4;
306 para->text[j] = temp;
307 }
228 para->text[j] = 0; 308 para->text[j] = 0;
229 309
230 psiconv_list_add(*result,para); 310 if ((res = psiconv_list_add(*result,para)))
311 goto ERROR4;
231 312
232 str_copy = psiconv_make_printable(para->text); 313 if (!(str_copy = psiconv_make_printable(para->text)))
314 goto ERROR3;
233 psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr, 315 psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr,
234 strlen(str_copy) +1); 316 strlen(str_copy) +1);
235 psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); 317 psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);
236 free(str_copy); 318 free(str_copy);
237 319
238 start = i + 1; 320 start = i + 1;
239 nr ++; 321 nr ++;
240 } 322 }
323 }
241 324
242 if (start != text_len) { 325 if (start != text_len) {
243 res = -1;
244 psiconv_warn(lev+2,off+start+len, 326 psiconv_warn(lev+2,off+start+len,
245 "Last line does not end on EOL (%d characters left)", len - start); 327 "Last line does not end on EOL (%d characters left)", len - start);
246 para->text = malloc(text_len - start + 1); 328 if (!(para->text = malloc(text_len - start + 1)))
329 goto ERROR3;
247 for (j = 0; j < text_len - start; j++) 330 for (j = 0; j < text_len - start; j++) {
248 para->text[j] = psiconv_read_u8(buf,lev+2,off + start + j + len); 331 temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res);
332 if (res)
333 goto ERROR4;
334 para->text[j] = temp;
335 }
249 para->text[text_len - start] = 0; 336 para->text[text_len - start] = 0;
250 psiconv_list_add(*result,para); 337 if ((res = psiconv_list_add(*result,para)))
338 goto ERROR4;
251 str_copy = psiconv_make_printable(para->text); 339 if (!(str_copy = psiconv_make_printable(para->text)))
340 goto ERROR3;
252 psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr, 341 psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr,
253 strlen(str_copy)+1); 342 strlen(str_copy)+1);
254 psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy); 343 psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy);
255 free(str_copy); 344 free(str_copy);
256 } 345 }
257 346
258 free(para); 347 free(para);
259 348
260 /* Initialize the remaining parts of each paragraph */ 349 /* Initialize the remaining parts of each paragraph */
261 for (i = 0; i < psiconv_list_length(*result); i ++) { 350 for (i = 0; i < psiconv_list_length(*result); i ++) {
262 para = psiconv_list_get(*result,i); 351 if (!(para = psiconv_list_get(*result,i))) {
263 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout_s)); 352 psiconv_warn(lev+2,off+len,"Massive memory corruption");
264 para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement_s)); 353 goto ERROR2_0;
354 }
355 if (!(para->in_lines = psiconv_list_new(sizeof(
356 struct psiconv_in_line_layout_s))))
357 goto ERROR2_0;
358 if (!(para->replacements = psiconv_list_new(sizeof(
359 struct psiconv_replacement_s))))
360 goto ERROR2_1;
361 if (!(para->base_character = psiconv_basic_character_layout()))
362 goto ERROR2_2;
363 if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
364 goto ERROR2_3;
265 para->base_style = 0; 365 para->base_style = 0;
266 para->base_character = psiconv_basic_character_layout();
267 para->base_paragraph = psiconv_basic_paragraph_layout();
268 } 366 }
269 367
270 368
271 len += text_len; 369 len += text_len;
272 370
… …
275 373
276 psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x", 374 psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x",
277 len); 375 len);
278 376
279 return res; 377 return res;
378
379ERROR2_3:
380 psiconv_free_character_layout(para->base_character);
381ERROR2_2:
382 psiconv_list_free(para->replacements);
383ERROR2_1:
384 psiconv_list_free(para->in_lines);
385ERROR2_0:
386 for (j = 0; j < i; j++) {
387 if (!(para = psiconv_list_get(*result,j))) {
388 psiconv_warn(lev+1,off,"Massive memory corruption...");
389 break;
390 }
391 psiconv_list_free(para->in_lines);
392 psiconv_list_free(para->replacements);
393 psiconv_free_character_layout(para->base_character);
394 psiconv_free_paragraph_layout(para->base_paragraph);
395 }
396 goto ERROR2;
397
398ERROR4:
399 free(para->text);
400ERROR3:
401 free(para);
402ERROR2:
403 for (i = 0; i < psiconv_list_length(*result);i++) {
404 if (!(para = psiconv_list_get(*result,i))) {
405 psiconv_warn(lev+1,off,"Massive memory corruption...");
406 break;
407 }
408 free(para->text);
409 }
410 psiconv_list_free(*result);
411ERROR1:
412 psiconv_warn(lev+1,off,"Reading of Text Section failed");
413 if (length)
414 *length = 0;
415 if (!res)
416 return -PSICONV_E_NOMEM;
417 else
418 return res;
280} 419}
281 420
282/* First do a parse_text_section, or you will get into trouble here */ 421/* First do a parse_text_section, or you will get into trouble here */
283int psiconv_parse_layout_section(const psiconv_buffer buf, 422int psiconv_parse_layout_section(const psiconv_buffer buf,
284 int lev,psiconv_u32 off, 423 int lev,psiconv_u32 off,
… …
304 443
305 anon_style_list anon_styles; 444 anon_style_list anon_styles;
306 struct anon_style_s anon; 445 struct anon_style_s anon;
307 anon_style anon_ptr=NULL; 446 anon_style anon_ptr=NULL;
308 447
448 psiconv_character_layout temp_char;
449 psiconv_paragraph_layout temp_para;
450 psiconv_word_style temp_style;
309 psiconv_paragraph para; 451 psiconv_paragraph para;
310 struct psiconv_in_line_layout_s in_line; 452 struct psiconv_in_line_layout_s in_line;
311 453
312 int *inline_count; 454 int *inline_count;
313 455
314 456
315 psiconv_progress(lev+1,off,"Going to read the layout section"); 457 psiconv_progress(lev+1,off,"Going to read the layout section");
316 458
317 psiconv_progress(lev+2,off,"Going to read the section type"); 459 psiconv_progress(lev+2,off,"Going to read the section type");
318 temp = psiconv_read_u16(buf,lev+2,off+len); 460 temp = psiconv_read_u16(buf,lev+2,off+len,&res);
461 if (res)
462 goto ERROR1;
319 psiconv_debug(lev+2,off+len,"Type: %02x",temp); 463 psiconv_debug(lev+2,off+len,"Type: %02x",temp);
320 parse_styles = with_styles; 464 parse_styles = with_styles;
321 if ((temp == 0x0001) && !with_styles) { 465 if ((temp == 0x0001) && !with_styles) {
322 psiconv_warn(lev+2,off+len,"Styleless layout section expected, " 466 psiconv_warn(lev+2,off+len,"Styleless layout section expected, "
323 "but styled section found!"); 467 "but styled section found!");
324 parse_styles = 1; 468 parse_styles = 1;
325 res = -1;
326 } else if ((temp == 0x0000) && (with_styles)) { 469 } else if ((temp == 0x0000) && (with_styles)) {
327 psiconv_warn(lev+2,off+len,"Styled layout section expected, " 470 psiconv_warn(lev+2,off+len,"Styled layout section expected, "
328 "but styleless section found!"); 471 "but styleless section found!");
329 parse_styles = 0; 472 parse_styles = 0;
330 res = -1;
331 } else if ((temp != 0x0000) && (temp != 0x0001)) { 473 } else if ((temp != 0x0000) && (temp != 0x0001)) {
332 psiconv_warn(lev+2,off+len, 474 psiconv_warn(lev+2,off+len,
333 "Layout section type indicator has unknown value!"); 475 "Layout section type indicator has unknown value!");
334 res = -1;
335 } 476 }
336 len += 0x02; 477 len += 0x02;
337 478
338 psiconv_progress(lev+2,off+len,"Going to read paragraph type list"); 479 psiconv_progress(lev+2,off+len,"Going to read paragraph type list");
339 anon_styles = psiconv_list_new(sizeof(anon)); 480 if (!(anon_styles = psiconv_list_new(sizeof(anon))))
481 goto ERROR1;
340 psiconv_progress(lev+3,off+len,"Going to read paragraph type list length"); 482 psiconv_progress(lev+3,off+len,"Going to read paragraph type list length");
341 nr = psiconv_read_u8(buf,lev+3,off+len); 483 nr = psiconv_read_u8(buf,lev+3,off+len,&res);
484 if (res)
485 goto ERROR2;
342 psiconv_debug(lev+3,off+len,"Length: %02x",nr); 486 psiconv_debug(lev+3,off+len,"Length: %02x",nr);
343 len ++; 487 len ++;
344 488
345 psiconv_progress(lev+3,off+len, 489 psiconv_progress(lev+3,off+len,
346 "Going to read the paragraph type list elements"); 490 "Going to read the paragraph type list elements");
347 for (i = 0; i < nr; i ++) { 491 for (i = 0; i < nr; i ++) {
348 psiconv_progress(lev+3,off+len,"Element %d",i); 492 psiconv_progress(lev+3,off+len,"Element %d",i);
349 anon.nr = psiconv_read_u32(buf,lev+4,off+len); 493 anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res);
494 if (res)
495 goto ERROR3;
350 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); 496 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr);
351 len += 0x04; 497 len += 0x04;
352 498
353 psiconv_progress(lev+4,off,"Going to determine the base style"); 499 psiconv_progress(lev+4,off,"Going to determine the base style");
354 if (parse_styles) { 500 if (parse_styles) {
501 temp = psiconv_read_u32(buf,lev+4, off+len,&res);
502 if (res)
503 goto ERROR3;
355 anon.base_style = psiconv_read_u8(buf,lev+3, 504 anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res);
356 off+len+4+psiconv_read_u32(buf,lev+4, 505 if (res)
357 off+len)); 506 goto ERROR3;
358 psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len), 507 psiconv_debug(lev+4,off+len+temp,
359 "Style indicator: %02x",anon.base_style); 508 "Style indicator: %02x",anon.base_style);
360 } else 509 } else
361 anon.base_style = 0; 510 anon.base_style = 0;
511 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
512 psiconv_warn(lev+4,off,"Unknown Style referenced");
513 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
514 psiconv_warn(lev+4,off,"Base style unknown");
515 goto ERROR3;
516 }
517 }
362 anon.paragraph = psiconv_clone_paragraph_layout(psiconv_get_style 518 if (!(anon.paragraph = psiconv_clone_paragraph_layout
363 (styles,anon.base_style)->paragraph); 519 (temp_style->paragraph)))
520 goto ERROR3;
364 anon.character = psiconv_clone_character_layout(psiconv_get_style 521 if (!(anon.character = psiconv_clone_character_layout
365 (styles,anon.base_style)->character); 522 (temp_style->character)))
523 goto ERROR3_1;
366 524
367 psiconv_progress(lev+4,off+len,"Going to read the paragraph layout"); 525 psiconv_progress(lev+4,off+len,"Going to read the paragraph layout");
368 res |= psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, 526 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,
369 anon.paragraph); 527 anon.paragraph)))
528 goto ERROR3_2;
370 len += leng; 529 len += leng;
371 if (parse_styles) 530 if (parse_styles)
372 len ++; 531 len ++;
373 532
374 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 533 psiconv_progress(lev+4,off+len,"Going to read the character layout");
375 res |= psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 534 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,
376 anon.character); 535 anon.character)))
536 goto ERROR3_2;
377 len += leng; 537 len += leng;
378 psiconv_list_add(anon_styles,&anon); 538 if ((res = psiconv_list_add(anon_styles,&anon)))
539 goto ERROR3_2;
379 } 540 }
380 541
381 psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list"); 542 psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list");
382 psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs"); 543 psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs");
383 nr = psiconv_read_u32(buf,lev+3,off+len); 544 nr = psiconv_read_u32(buf,lev+3,off+len,&res);
545 if (res)
546 goto ERROR3;
384 if (nr != psiconv_list_length(result)) { 547 if (nr != psiconv_list_length(result)) {
385 psiconv_warn(lev+3,off+len, 548 psiconv_warn(lev+3,off+len,
386 "Number of text paragraphs and paragraph elements does not match"); 549 "Number of text paragraphs and paragraph elements does not match");
387 psiconv_debug(lev+3,off+len, 550 psiconv_debug(lev+3,off+len,
388 "%d text paragraphs, %d paragraph elements", 551 "%d text paragraphs, %d paragraph elements",
389 psiconv_list_length(result),nr); 552 psiconv_list_length(result),nr);
390 } 553 }
391 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); 554 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr);
392 len += 4; 555 len += 4;
393 inline_count = malloc(nr * sizeof(*inline_count)); 556 if (!(inline_count = malloc(nr * sizeof(*inline_count))))
557 goto ERROR3;
394 558
395 psiconv_progress(lev+3,off+len,"Going to read the paragraph elements"); 559 psiconv_progress(lev+3,off+len,"Going to read the paragraph elements");
396 for (i = 0; i < nr; i ++) { 560 for (i = 0; i < nr; i ++) {
397 psiconv_progress(lev+3,off+len,"Element %d",i); 561 psiconv_progress(lev+3,off+len,"Element %d",i);
398 if (i >= psiconv_list_length(result)) { 562 if (i >= psiconv_list_length(result)) {
399 psiconv_debug(lev+4,off+len,"Going to allocate a new element"); 563 psiconv_debug(lev+4,off+len,"Going to allocate a new element");
400 para = malloc(sizeof(*para)); 564 if (!(para = malloc(sizeof(*para))))
401 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout_s)); 565 goto ERROR4;
566 if (!(para->in_lines = psiconv_list_new(sizeof(
567 struct psiconv_in_line_layout_s))))
568 goto ERROR4_1;
402 para->base_style = 0; 569 para->base_style = 0;
403 para->base_character = psiconv_basic_character_layout(); 570 if (!(para->base_character = psiconv_basic_character_layout()))
571 goto ERROR4_2;
404 para->base_paragraph = psiconv_basic_paragraph_layout(); 572 if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
573 goto ERROR4_3;
574 if ((res = psiconv_list_add(result,para)))
575 goto ERROR4_4;
405 free(para); 576 free(para);
406 } 577 }
407 para = psiconv_list_get(result,i); 578 if (!(para = psiconv_list_get(result,i)))
579 goto ERROR4;
408 580
409 psiconv_progress(lev+4,off+len,"Going to read the paragraph length"); 581 psiconv_progress(lev+4,off+len,"Going to read the paragraph length");
410 temp = psiconv_read_u32(buf,lev+4,off+len); 582 temp = psiconv_read_u32(buf,lev+4,off+len,&res);
583 if (res)
584 goto ERROR4;
411 if (temp != strlen(para->text)+1) { 585 if (temp != strlen(para->text)+1) {
412 res = -1;
413 psiconv_warn(lev+4,off+len, 586 psiconv_warn(lev+4,off+len,
414 "Disagreement of the length of paragraph in layout section"); 587 "Disagreement of the length of paragraph in layout section");
415 psiconv_debug(lev+4,off+len, 588 psiconv_debug(lev+4,off+len,
416 "Paragraph length: layout section says %d, counted %d", 589 "Paragraph length: layout section says %d, counted %d",
417 temp,strlen(para->text)+1); 590 temp,strlen(para->text)+1);
418 } else 591 } else
419 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); 592 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp);
420 len += 4; 593 len += 4;
421 594
422 psiconv_progress(lev+4,off+len,"Going to read the paragraph type"); 595 psiconv_progress(lev+4,off+len,"Going to read the paragraph type");
423 temp = psiconv_read_u8(buf,lev+4,off+len); 596 temp = psiconv_read_u8(buf,lev+4,off+len,&res);
597 if (res)
598 goto ERROR4;
424 if (temp != 0x00) { 599 if (temp != 0x00) {
425 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 600 psiconv_debug(lev+4,off+len,"Type: %02x",temp);
426 for (j = 0; j < psiconv_list_length(anon_styles); j++) { 601 for (j = 0; j < psiconv_list_length(anon_styles); j++) {
427 anon_ptr = psiconv_list_get(anon_styles,j); 602 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) {
603 psiconv_warn(lev+4,off+len,"Massive memory curruption");
604 goto ERROR4;
605 }
428 if (temp == anon_ptr->nr) 606 if (temp == anon_ptr->nr)
429 break; 607 break;
430 } 608 }
431 if (j == psiconv_list_length(anon_styles)) { 609 if (j == psiconv_list_length(anon_styles)) {
432 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); 610 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown");
433 psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead"); 611 psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead");
434 para->base_style = 0; 612 para->base_style = 0;
613 if (!(temp_style = psiconv_get_style(styles,0))) {
614 psiconv_warn(lev+4,off,"Base style unknown");
615 goto ERROR4;
616 }
617 if (!(temp_para = psiconv_clone_paragraph_layout
618 (temp_style->paragraph)))
619 goto ERROR4;
435 psiconv_free_paragraph_layout(para->base_paragraph); 620 psiconv_free_paragraph_layout(para->base_paragraph);
621 para->base_paragraph = temp_para;
622
623 if (!(temp_char = psiconv_clone_character_layout
624 (temp_style->character)))
625 goto ERROR4;
436 psiconv_free_character_layout(para->base_character); 626 psiconv_free_character_layout(para->base_character);
437 para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style 627 para->base_character = temp_char;
438 (styles,0)->paragraph);
439 para->base_character = psiconv_clone_character_layout(psiconv_get_style
440 (styles,0)->character);
441 } else { 628 } else {
442 para->base_style = anon_ptr->base_style; 629 para->base_style = anon_ptr->base_style;
630 if (!(temp_para = psiconv_clone_paragraph_layout (anon_ptr->paragraph)))
631 goto ERROR4;
443 psiconv_free_paragraph_layout(para->base_paragraph); 632 psiconv_free_paragraph_layout(para->base_paragraph);
633 para->base_paragraph = temp_para;
634
635 if (!(temp_char = psiconv_clone_character_layout (anon_ptr->character)))
636 goto ERROR4;
444 psiconv_free_character_layout(para->base_character); 637 psiconv_free_character_layout(para->base_character);
445 para->base_paragraph = psiconv_clone_paragraph_layout 638 para->base_character = temp_char;
446 (anon_ptr->paragraph);
447 para->base_character = psiconv_clone_character_layout
448 (anon_ptr->character);
449 } 639 }
450 inline_count[i] = 0; 640 inline_count[i] = 0;
451 len += 0x01; 641 len += 0x01;
452 } else { 642 } else {
453 psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)" 643 psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)"
454 ,temp); 644 ,temp);
455 len += 0x01; 645 len += 0x01;
456 if (parse_styles) { 646 if (parse_styles) {
457 psiconv_progress(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len)+4, 647 temp = psiconv_read_u32(buf,lev+4,off+len,&res);
648 if (res)
649 goto ERROR4;
650 psiconv_progress(lev+4,off+len+temp+4,
458 "Going to read the paragraph element base style"); 651 "Going to read the paragraph element base style");
459 temp = psiconv_read_u8(buf,lev+4, 652 temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res);
460 off+len+psiconv_read_u32(buf,lev+4,off+len)+4); 653 if (res)
461 psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len)+4, 654 goto ERROR4;
462 "Style: %02x",temp); 655 psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp);
463 } else 656 } else
464 temp = 0x00; 657 temp = 0x00;
658
659 if (!(temp_style = psiconv_get_style (styles,temp))) {
660 psiconv_warn(lev+4,off,"Unknown Style referenced");
661 if (!(temp_style = psiconv_get_style(styles,0))) {
662 psiconv_warn(lev+4,off,"Base style unknown");
663 goto ERROR4;
664 }
665 }
666
667 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph)))
668 goto ERROR4;
465 psiconv_free_paragraph_layout(para->base_paragraph); 669 psiconv_free_paragraph_layout(para->base_paragraph);
670 para->base_paragraph = temp_para;
671
672 if (!(temp_char = psiconv_clone_character_layout(temp_style->character)))
673 goto ERROR4;
466 psiconv_free_character_layout(para->base_character); 674 psiconv_free_character_layout(para->base_character);
467 para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style 675 para->base_character = temp_char;
468 (styles,temp)->paragraph); 676
469 para->base_character = psiconv_clone_character_layout(psiconv_get_style
470 (styles,temp)->character);
471 para->base_style = temp; 677 para->base_style = temp;
472 psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); 678 psiconv_progress(lev+4,off+len,"Going to read paragraph layout");
473 psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, 679 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,
474 para->base_paragraph); 680 para->base_paragraph)))
681 goto ERROR4;
475 len += leng; 682 len += leng;
476 if (parse_styles) 683 if (parse_styles)
477 len += 1; 684 len += 1;
478 psiconv_progress(lev+4,off+len,"Going to read number of in-line " 685 psiconv_progress(lev+4,off+len,"Going to read number of in-line "
479 "layout elements"); 686 "layout elements");
480 inline_count[i] = psiconv_read_u32(buf,lev+4,off+len); 687 inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res);
688 if (res)
689 goto ERROR4;
481 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); 690 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]);
482 len += 4; 691 len += 4;
483 } 692 }
484 } 693 }
485 694
486 psiconv_progress(lev+2,off+len,"Going to read the text layout inline list"); 695 psiconv_progress(lev+2,off+len,"Going to read the text layout inline list");
487 696
488 psiconv_progress(lev+3,off+len,"Going to read the number of elements"); 697 psiconv_progress(lev+3,off+len,"Going to read the number of elements");
489 nr = psiconv_read_u32(buf,lev+3,off+len); 698 nr = psiconv_read_u32(buf,lev+3,off+len,&res);
699 if (res)
700 goto ERROR4;
490 psiconv_debug(lev+3,off,"Elements: %08x",nr); 701 psiconv_debug(lev+3,off+len,"Elements: %08x",nr);
491 len += 0x04; 702 len += 0x04;
492 703
493 psiconv_progress(lev+3,off+len, 704 psiconv_progress(lev+3,off+len,
494 "Going to read the text layout inline elements"); 705 "Going to read the text layout inline elements");
495 total = 0; 706 total = 0;
496 for (i = 0; i < psiconv_list_length(result); i++) { 707 for (i = 0; i < psiconv_list_length(result); i++) {
497 para = psiconv_list_get(result,i); 708 if (!(para = psiconv_list_get(result,i))) {
709 psiconv_warn(lev+3,off+len,"Massive memory corruption");
710 goto ERROR4;
711 }
498 line_length = -1; 712 line_length = -1;
499 for (j = 0; j < inline_count[i]; j++) { 713 for (j = 0; j < inline_count[i]; j++) {
500 psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d", 714 psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d",
501 total,i,j); 715 total,i,j);
502 if (total >= nr) { 716 if (total >= nr) {
503 psiconv_warn(lev+3,off+len, 717 psiconv_warn(lev+3,off+len,
504 "Layout section inlines: not enough element"); 718 "Layout section inlines: not enough element");
505 res = -1;
506 psiconv_debug(lev+3,off+len,"Can't read element!"); 719 psiconv_debug(lev+3,off+len,"Can't read element!");
507 } else { 720 } else {
508 total ++; 721 total ++;
722 in_line.object = NULL;
723 in_line.layout = NULL;
509 in_line.layout = psiconv_clone_character_layout(para->base_character); 724 if (!(in_line.layout = psiconv_clone_character_layout
725 (para->base_character)))
726 goto ERROR4;
510 psiconv_progress(lev+4,off+len,"Going to read the element type"); 727 psiconv_progress(lev+4,off+len,"Going to read the element type");
511 temp = psiconv_read_u8(buf,lev+4,len+off); 728 temp = psiconv_read_u8(buf,lev+4,len+off,&res);
729 if (res)
730 goto ERROR5;
512 len += 1; 731 len += 1;
513 psiconv_debug(lev+4,off,"Type: %02x",temp); 732 psiconv_debug(lev+4,off+len,"Type: %02x",temp);
514 psiconv_progress(lev+4,off, 733 psiconv_progress(lev+4,off+len,
515 "Going to read the number of characters it applies to"); 734 "Going to read the number of characters it applies to");
516 in_line.length = psiconv_read_u32(buf,lev+4,len+off); 735 in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res);
736 if (res)
737 goto ERROR5;
517 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); 738 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length);
518 len += 4; 739 len += 4;
519 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 740 psiconv_progress(lev+4,off+len,"Going to read the character layout");
520 res |= psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 741 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,
521 in_line.layout); 742 in_line.layout)))
743 goto ERROR5;
522 len += leng; 744 len += leng;
523 745
524 if (temp == 0x01) { 746 if (temp == 0x01) {
525 psiconv_debug(lev+4,off+len,"Skipping object data"); 747 psiconv_debug(lev+4,off+len,"Found an embedded object");
526 len += 0x10; 748 psiconv_progress(lev+4,off+len,"Going to read the object marker "
749 "(0x%08x expected)",PSICONV_ID_OBJECT);
750 temp = psiconv_read_u32(buf,lev+4,off+len,&res);
751 if (res)
752 goto ERROR5;
753 if (temp != PSICONV_ID_OBJECT) {
754 psiconv_warn(lev+4,off+len,"Unknown id marks embedded object");
755 psiconv_debug(lev+4,off+len,"Marker: read %08x, expected %08x",
756 temp,PSICONV_ID_OBJECT);
757 }
758 len += 4;
759 psiconv_progress(lev+4,off+len,
760 "Going to read the Embedded Object Section offset");
761 temp = psiconv_read_u32(buf,lev+4,off+len,&res);
762 if (res)
763 goto ERROR5;
764 psiconv_debug(lev+4,off+len, "Offset: %08x",temp);
765 len += 4;
766 psiconv_progress(lev+4,off+len,
767 "Going to parse the Embedded Object");
768 if ((res = psiconv_parse_embedded_object(buf,lev+4,temp,
769 NULL,&(in_line.object))))
770 goto ERROR5;
771 psiconv_progress(lev+4,off+len,
772 "Going to read the object width");
773 in_line.object_width = psiconv_read_length(buf,lev+4,off+len,
774 &leng,&res);
775 if (res)
776 goto ERROR5;
777 psiconv_debug(lev+4,off+len,"Object width: %f cm",
778 in_line.object_width);
779 len += leng;
780 psiconv_progress(lev+4,off+len,
781 "Going to read the object height");
782 in_line.object_height = psiconv_read_length(buf,lev+4,off+len,&leng,
783 &res);
784 if (res)
785 goto ERROR5;
786 psiconv_debug(lev+4,off+len,"Object height: %f cm",
787 in_line.object_height);
788 len += leng;
527 } else if (temp != 0x00) { 789 } else if (temp != 0x00) {
528 psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); 790 psiconv_warn(lev+4,off+len,"Layout section unknown inline type");
529 res = -1;
530 } 791 }
531 if (line_length + in_line.length > strlen(para->text)) { 792 if (line_length + in_line.length > strlen(para->text)) {
532 psiconv_warn(lev+4,off+len, 793 psiconv_warn(lev+4,off+len,
533 "Layout section inlines: line length mismatch"); 794 "Layout section inlines: line length mismatch");
534 res = -1; 795 res = -1;
535 in_line.length = strlen(para->text) - line_length; 796 in_line.length = strlen(para->text) - line_length;
536 } 797 }
537 line_length += in_line.length; 798 line_length += in_line.length;
538 psiconv_list_add(para->in_lines,&in_line); 799 if ((res = psiconv_list_add(para->in_lines,&in_line)))
800 goto ERROR5;
539 } 801 }
540 } 802 }
541 } 803 }
542 804
543 if (total != nr) { 805 if (total != nr) {
… …
546 } 808 }
547 809
548 free(inline_count); 810 free(inline_count);
549 811
550 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { 812 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
551 anon_ptr = psiconv_list_get(anon_styles,i); 813 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
814 psiconv_warn(lev+4,off+len,"Massive memory corruption");
815 goto ERROR2;
816 }
552 psiconv_free_character_layout(anon_ptr->character); 817 psiconv_free_character_layout(anon_ptr->character);
553 psiconv_free_paragraph_layout(anon_ptr->paragraph); 818 psiconv_free_paragraph_layout(anon_ptr->paragraph);
554 } 819 }
555 psiconv_list_free(anon_styles); 820 psiconv_list_free(anon_styles);
556 821
557 if (length) 822 if (length)
558 *length = len; 823 *length = len;
559 824
560 psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x", 825 psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)",
561 len); 826 len);
562 827
828 return 0;
829
830ERROR4_4:
831 psiconv_free_paragraph_layout(para->base_paragraph);
832ERROR4_3:
833 psiconv_free_character_layout(para->base_character);
834ERROR4_2:
835 psiconv_list_free(para->in_lines);
836ERROR4_1:
837 free(para);
838 goto ERROR4;
839
840ERROR3_2:
841 psiconv_free_character_layout(anon.character);
842ERROR3_1:
843 psiconv_free_paragraph_layout(anon.paragraph);
844 goto ERROR3;
845
846ERROR5:
847 if (in_line.layout)
848 psiconv_free_character_layout(in_line.layout);
849 if (in_line.object)
850 psiconv_free_object(in_line.object);
851ERROR4:
852 free(inline_count);
853ERROR3:
854 for (i = 0; i < psiconv_list_length(anon_styles); i++) {
855 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
856 psiconv_warn(lev+1,off,"Massive memory corruption");
857 break;
858 }
859 psiconv_free_paragraph_layout(anon_ptr->paragraph);
860 psiconv_free_character_layout(anon_ptr->character);
861 }
862
863ERROR2:
864 psiconv_list_free(anon_styles);
865ERROR1:
866 psiconv_warn(lev+1,off,"Reading of Layout Section failed");
867 if (length)
868 *length = 0;
869 if (!res)
870 return -PSICONV_E_NOMEM;
871 else
563 return res; 872 return res;
564} 873}
565 874
566int psiconv_parse_styled_layout_section(const psiconv_buffer buf, 875int psiconv_parse_styled_layout_section(const psiconv_buffer buf,
567 int lev,psiconv_u32 off, 876 int lev,psiconv_u32 off,
568 int *length, 877 int *length,
… …
571{ 880{
572 return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); 881 return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1);
573} 882}
574 883
575int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, 884int psiconv_parse_styleless_layout_section(const psiconv_buffer buf,
576 int lev,psiconv_u32 off, 885 int lev,psiconv_u32 off,
577 int *length, 886 int *length,
578 psiconv_text_and_layout result, 887 psiconv_text_and_layout result,
579 psiconv_character_layout base_char, 888 const psiconv_character_layout base_char,
580 psiconv_paragraph_layout base_para) 889 const psiconv_paragraph_layout base_para)
581{ 890{
582 int res; 891 int res = 0;
583 psiconv_word_styles_section styles_section; 892 psiconv_word_styles_section styles_section;
584 893
585 styles_section = malloc(sizeof(*styles_section)); 894 if (!(styles_section = malloc(sizeof(*styles_section))))
895 goto ERROR1;
586 styles_section->normal = malloc(sizeof(*styles_section->normal)); 896 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
587 styles_section->normal->character = psiconv_clone_character_layout(base_char); 897 goto ERROR2;
588 styles_section->normal->paragraph = psiconv_clone_paragraph_layout(base_para); 898 if (!(styles_section->normal->character =
899 psiconv_clone_character_layout(base_char)))
900 goto ERROR3;
901 if (!(styles_section->normal->paragraph =
902 psiconv_clone_paragraph_layout(base_para)))
903 goto ERROR4;
589 styles_section->normal->hotkey = 0; 904 styles_section->normal->hotkey = 0;
590 styles_section->normal->name = strdup(""); 905 if (!(styles_section->normal->name = strdup("")))
591 styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s)); 906 goto ERROR5;
907 if (!(styles_section->styles = psiconv_list_new(sizeof(
908 struct psiconv_word_style_s))))
909 goto ERROR6;
592 910
593 res = psiconv_parse_layout_section(buf,lev,off,length,result, 911 res = psiconv_parse_layout_section(buf,lev,off,length,result,
594 styles_section,0); 912 styles_section,0);
595 913
596 psiconv_free_word_styles_section(styles_section); 914 psiconv_free_word_styles_section(styles_section);
597 return res; 915 return res;
916
917ERROR6:
918 free(styles_section->normal->name);
919ERROR5:
920 psiconv_free_paragraph_layout(styles_section->normal->paragraph);
921ERROR4:
922 psiconv_free_character_layout(styles_section->normal->character);
923ERROR3:
924 free(styles_section->normal);
925ERROR2:
926 free(styles_section);
927ERROR1:
928 psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed");
929 if (length)
930 *length = 0;
931 if (!res)
932 return -PSICONV_E_NOMEM;
933 else
934 return res;
598} 935}
599 936
937int psiconv_parse_embedded_object(const psiconv_buffer buf, int lev,
938 psiconv_u32 off, int *length,
939 psiconv_object *result)
940{
941 int res=0;
942 int len=0;
943 int leng,i;
944 psiconv_section_table_section table;
945 psiconv_section_table_entry entry;
946 psiconv_u32 icon_sec=0,display_sec=0,table_sec=0;
947 psiconv_buffer subbuf;
948
949 psiconv_progress(lev+1,off+len,"Going to read an Embedded Object");
950 if (!(*result = malloc(sizeof(**result))))
951 goto ERROR1;
952
953 psiconv_progress(lev+2,off+len,"Going to read the Embedded Object Section");
954 psiconv_parse_section_table_section(buf,lev+2,off+len,&leng,&table);
955 len += leng;
956
957 for (i = 0; i < psiconv_list_length(table); i++) {
958 psiconv_progress(lev+2,off+len,"Going to read entry %d",i);
959 if (!(entry = psiconv_list_get(table,i)))
960 goto ERROR2;
961 if (entry->id == PSICONV_ID_OBJECT_DISPLAY_SECTION) {
962 display_sec = entry->offset;
963 psiconv_debug(lev+3,off+len,"Found the Object Display Section at %08x",
964 display_sec);
965 } else if (entry->id == PSICONV_ID_OBJECT_ICON_SECTION) {
966 icon_sec = entry->offset;
967 psiconv_debug(lev+3,off+len,"Found the Object Icon Section at %08x",
968 icon_sec);
969 } else if (entry->id == PSICONV_ID_OBJECT_SECTION_TABLE_SECTION) {
970 table_sec = entry->offset;
971 psiconv_debug(lev+3,off+len,"Found the Object Section Table Section at %08x",
972 table_sec);
973 } else {
974 psiconv_warn(lev+3,off+len,
975 "Found unknown section in the Object Display Section "
976 "(ignoring)");
977 psiconv_debug(lev+3,off+len,"Section ID %08x, offset %08x",
978 entry->id, entry->offset);
979 }
980 }
981
982 psiconv_progress(lev+2,off+len,"Looking for the Object Display Section");
983 if (!icon_sec) {
984 psiconv_warn(lev+2,off+len,"Object Display Section not found");
985 (*result)->display = NULL;
986 } else {
987 psiconv_debug(lev+2,off+len,"Object Display Section at offset %08x",
988 display_sec);
989 if ((res = psiconv_parse_object_display_section(buf,lev+2,display_sec,NULL,
990 &(*result)->display)))
991 goto ERROR2;
992 }
993
994 psiconv_progress(lev+2,off+len,"Looking for the Object Icon Section");
995 if (!icon_sec) {
996 psiconv_warn(lev+2,off+len,"Object Icon Section not found");
997 (*result)->icon = NULL;
998 } else {
999 psiconv_debug(lev+2,off+len,"Object Icon Section at offset %08x",icon_sec);
1000 if ((res = psiconv_parse_object_icon_section(buf,lev+2,icon_sec,NULL,
1001 &(*result)->icon)))
1002 goto ERROR3;
1003 }
1004
1005 psiconv_progress(lev+2,off+len,
1006 "Looking for the Section Table Offset Section");
1007 if (!table_sec) {
1008 psiconv_warn(lev+2,off+len,
1009 "Embedded Section Table Offset Section not found");
1010 (*result)->object = NULL;
1011 } else {
1012 psiconv_progress(lev+2,off+len,
1013 "Extracting object: add %08x to all following offsets",
1014 table_sec);
1015 /* We can't determine the length of the object, so we just take it all */
1016 if ((res = psiconv_buffer_subbuffer(&subbuf,buf,table_sec,
1017 psiconv_buffer_length(buf)-table_sec)))
1018 goto ERROR4;
1019
1020 if (!((*result)->object = malloc(sizeof(*(*result)->object))))
1021 goto ERROR5;
1022
1023 /* We need to find the file type, but we don't have a normal header */
1024 /* So we try to find the Application ID Section and hope for the best */
1025 psiconv_progress(lev+3,0,"Trying to determine the file type");
1026 (*result)->object->type = psiconv_determine_embedded_object_type
1027 (subbuf,lev+3,&res);
1028 switch ((*result)->object->type) {
1029 case psiconv_word_file:
1030 if ((res = psiconv_parse_word_file(subbuf,lev+3,0,
1031 ((psiconv_word_f *) &(*result)->object->file))))
1032 goto ERROR6;
1033 break;
1034 case psiconv_texted_file:
1035 if ((res = psiconv_parse_texted_file(subbuf,lev+3,0,
1036 ((psiconv_texted_f *) &(*result)->object->file))))
1037 goto ERROR6;
1038 break;
1039 case psiconv_sheet_file:
1040 if ((res = psiconv_parse_sheet_file(subbuf,lev+3,0,
1041 ((psiconv_sheet_f *) &(*result)->object->file))))
1042 goto ERROR6;
1043 break;
1044 case psiconv_sketch_file:
1045 if ((res = psiconv_parse_sketch_file(subbuf,lev+3,0,
1046 ((psiconv_sketch_f *) &(*result)->object->file))))
1047 goto ERROR6;
1048 break;
1049 default:
1050 psiconv_warn(lev+3,0,"Can't parse embedded object (still continuing)");
1051 (*result)->object->file = NULL;
1052 }
1053 }
1054
1055 if (length)
1056 *length = len;
1057
1058 psiconv_progress(lev+1,off+len-1,"End of Embedded Object Section "
1059 "(total length: %08x)",len);
1060
1061 return res;
1062
1063
1064ERROR6:
1065 free((*result)->object);
1066ERROR5:
1067 psiconv_buffer_free(subbuf);
1068ERROR4:
1069 psiconv_free_object_icon_section((*result)->icon);
1070ERROR3:
1071 psiconv_free_object_display_section((*result)->display);
1072ERROR2:
1073 psiconv_free_section_table_section(table);
1074ERROR1:
1075 psiconv_warn(lev+1,off,"Reading Embedded Object failed");
1076
1077 if (length)
1078 *length = 0;
1079
1080 if (res == 0)
1081 return -PSICONV_E_NOMEM;
1082 else
1083 return res;
1084}
1085
1086psiconv_file_type_t psiconv_determine_embedded_object_type
1087 (const psiconv_buffer buf,int lev,
1088 int *status)
1089{
1090 psiconv_u32 off;
1091 psiconv_section_table_section table;
1092 int res,i;
1093 psiconv_file_type_t file_type = psiconv_unknown_file;
1094 psiconv_section_table_entry entry;
1095 psiconv_application_id_section applid;
1096
1097 psiconv_progress(lev+1,0,"Going to determine embedded object file type");
1098 psiconv_progress(lev+2,0,"Going to read the Section Table Offset Section");
1099 off = psiconv_read_u32(buf,lev,0,&res);
1100 if (res)
1101 goto ERROR1;
1102 psiconv_debug(lev+2,0,"Offset: %08x",off);
1103
1104 psiconv_progress(lev+2,off,"Going to read the Section Table Section");
1105 if ((res = psiconv_parse_section_table_section(buf,lev+2,off,NULL,&table)))
1106 goto ERROR1;
1107
1108 psiconv_progress(lev+2,off,"Going to search the Section Table Section "
1109 "for the Application ID Section");
1110 for (i=0; i < psiconv_list_length(table); i++) {
1111 psiconv_progress(lev+3,off,"Going to read entry %d",i);
1112 if (!(entry = psiconv_list_get(table,i)))
1113 goto ERROR2;
1114 if (entry->id == PSICONV_ID_APPL_ID_SECTION) {
1115 psiconv_progress(lev+3,off,
1116 "Found the Application ID Section at offset %08x",
1117 entry->offset);
1118 off = entry->offset;
1119 break;
1120 }
1121 }
1122 if (i == psiconv_list_length(table)) {
1123 psiconv_warn(lev+2,off,"No Application ID Section found");
1124 res = PSICONV_E_PARSE;
1125 goto ERROR2;
1126 }
1127
1128 psiconv_progress(lev+2,off,"Going to read the Application ID Section");
1129 if ((res = psiconv_parse_application_id_section(buf,lev+2,off,NULL,&applid)))
1130 goto ERROR2;
1131
1132 switch (applid->id) {
1133 case PSICONV_ID_WORD: file_type = psiconv_word_file;
1134 psiconv_debug(lev+2,off,"Found a Word file");
1135 break;
1136 case PSICONV_ID_TEXTED: file_type = psiconv_texted_file;
1137 psiconv_debug(lev+2,off,"Found a TextEd file");
1138 break;
1139 case PSICONV_ID_SKETCH: file_type = psiconv_sketch_file;
1140 psiconv_debug(lev+2,off,"Found a Sketch file");
1141 break;
1142 case PSICONV_ID_SHEET: file_type = psiconv_sheet_file;
1143 psiconv_debug(lev+2,off,"Found a Sheet file");
1144 break;
1145 default: psiconv_warn(lev+2,off,"Found an unknown file type");
1146 psiconv_debug(lev+2,off,"Found ID %08x",applid->id);
1147 }
1148
1149ERROR2:
1150 psiconv_free_application_id_section(applid);
1151ERROR1:
1152 psiconv_free_section_table_section(table);
1153 if (status)
1154 *status = res;
1155 return file_type;
1156
1157}
1158
1159int psiconv_parse_object_display_section(const psiconv_buffer buf,int lev,
1160 psiconv_u32 off, int *length,
1161 psiconv_object_display_section *result)
1162{
1163 int res = 0;
1164 int len = 0;
1165 int leng;
1166 psiconv_u32 temp;
1167
1168 psiconv_progress(lev+1,off,"Going to read the Object Display Section");
1169 if (!(*result = malloc(sizeof(**result))))
1170 goto ERROR1;
1171
1172 psiconv_progress(lev+2,off+len,"Going to read the display as icon flag "
1173 "(expecting 0x00 or 0x01)");
1174 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
1175 if (res)
1176 goto ERROR2;
1177 if (temp == 0x00) {
1178 (*result)->show_icon = psiconv_bool_true;
1179 psiconv_debug(lev+2,off+len,"Displayed as icon");
1180 } else if (temp == 0x01) {
1181 (*result)->show_icon = psiconv_bool_false;
1182 psiconv_debug(lev+2,off+len,"Displayed as full document");
1183 } else {
1184 psiconv_warn(lev+2,off+len,"Unknown Object Display Section Icon Flag");
1185 psiconv_debug(lev+2,off+len,"Icon flag found: %02x",temp);
1186 /* Improvise */
1187 (*result)->show_icon = (temp & 0x01?psiconv_bool_false:psiconv_bool_true);
1188 }
1189 len ++;
1190
1191 psiconv_progress(lev+2,off+len,"Going to read the display width");
1192 (*result)->width = psiconv_read_length(buf,lev+2,off+len,&leng,&res);
1193 if (res)
1194 goto ERROR2;
1195 psiconv_debug(lev+2,off+len,"Display width: %f cm",(*result)->width);
1196 len += leng;
1197
1198 psiconv_progress(lev+2,off+len,"Going to read the display height");
1199 (*result)->height = psiconv_read_length(buf,lev+2,off+len,&leng,&res);
1200 if (res)
1201 goto ERROR2;
1202 psiconv_debug(lev+2,off+len,"Display length: %f cm",(*result)->height);
1203 len += leng;
1204
1205 psiconv_progress(lev+2,off+len,"Going to read unknown long (%08x expected)",
1206 0);
1207 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
1208 if (temp != 0) {
1209 psiconv_warn(lev+2,off+len,"Unknown Object Display Section final long");
1210 psiconv_debug(lev+2,off+len,"Long read: %08x",temp);
1211 }
1212 len += 4;
1213
1214 if (length)
1215 *length = len;
1216
1217 psiconv_progress(lev+1,off+len-1,"End of Object Display Section "
1218 "(total length: %08x",len);
1219 return res;
1220
1221ERROR2:
1222 free(*result);
1223ERROR1:
1224 psiconv_warn(lev+1,off+len,"Reading of Object Display Section failed");
1225 if (length)
1226 *length=0;
1227 if (!res)
1228 return -PSICONV_E_NOMEM;
1229 else
1230 return res;
1231}
1232
1233int psiconv_parse_object_icon_section(const psiconv_buffer buf,int lev,
1234 psiconv_u32 off, int *length,
1235 psiconv_object_icon_section *result)
1236{
1237 int res = 0;
1238 int len = 0;
1239 int leng;
1240
1241 psiconv_progress(lev+1,off,"Going to read the Object Icon Section");
1242 if (!(*result = malloc(sizeof(**result))))
1243 goto ERROR1;
1244
1245 psiconv_progress(lev+2,off+len,"Going to read the icon name");
1246 (*result)->icon_name = psiconv_read_string(buf,lev+2,off+len,&leng,&res);
1247 if (res)
1248 goto ERROR2;
1249 psiconv_debug(lev+2,off+len,"Icon name: %s",(*result)->icon_name);
1250 len += leng;
1251
1252 psiconv_progress(lev+2,off+len,"Going to read the icon width");
1253 (*result)->icon_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res);
1254 if (res)
1255 goto ERROR3;
1256 psiconv_debug(lev+2,off+len,"Icon width: %f cm",(*result)->icon_width);
1257 len += leng;
1258
1259 psiconv_progress(lev+2,off+len,"Going to read the icon height");
1260 (*result)->icon_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res);
1261 if (res)
1262 goto ERROR3;
1263 psiconv_debug(lev+2,off+len,"Icon length: %f cm",(*result)->icon_height);
1264 len += leng;
1265
1266 if (length)
1267 *length = len;
1268
1269 psiconv_progress(lev+1,off+len-1,"End of Object Icon Section"
1270 "(total length: %08x",len);
1271 return res;
1272
1273ERROR3:
1274 free((*result)->icon_name);
1275ERROR2:
1276 free(*result);
1277ERROR1:
1278 psiconv_warn(lev+1,off+len,"Reading of Object Icon Section failed");
1279 if (length)
1280 *length=0;
1281 if (!res)
1282 return -PSICONV_E_NOMEM;
1283 else
1284 return res;
1285}
Legend:
Removed from v.56  
changed lines
  Added in v.162
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26