/[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 18 Revision 142
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.
… …
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21#include "compat.h"
21#include <stdlib.h> 22#include <stdlib.h>
22#include <string.h> 23#include <string.h>
23 24
24#include "data.h"
25#include "parse_routines.h" 25#include "parse_routines.h"
26#include "error.h"
27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
26 32
27static int psiconv_parse_layout_section(const psiconv_buffer buf, 33static int psiconv_parse_layout_section(const psiconv_buffer buf,
28 int lev,psiconv_u32 off, 34 int lev,psiconv_u32 off,
29 int *length, 35 int *length,
30 psiconv_text_and_layout result, 36 psiconv_text_and_layout result,
… …
38 int res=0; 44 int res=0;
39 int len=0; 45 int len=0;
40 psiconv_u32 temp; 46 psiconv_u32 temp;
41 47
42 psiconv_progress(lev+1,off+len,"Going to read the header section"); 48 psiconv_progress(lev+1,off+len,"Going to read the header section");
43 (*result) = malloc(sizeof(**result)); 49 if (!((*result) = malloc(sizeof(**result))))
50 goto ERROR1;
44 51
45 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3"); 52 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3");
46 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len); 53 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len,&res);
54 if (res)
55 goto ERROR2;
47 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); 56 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1);
57 if ((*result)->uid1 == PSICONV_ID_CLIPART) {
58 /* That's all folks... */
59 (*result)->file = psiconv_clipart_file;
60 (*result)->uid2 = 0;
61 (*result)->uid3 = 0;
62 (*result)->checksum = 0;
63 len += 4;
64 psiconv_debug(lev+2,off+len,"File is a Clipart file");
65 goto DONE;
66 }
48 if ((*result)->uid1 != PSICONV_ID_PSION5) { 67 if ((*result)->uid1 != PSICONV_ID_PSION5) {
49 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably " 68 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably "
50 "not a (parsable) Psion 5 file"); 69 "not a (parsable) Psion 5 file");
51 res = -1; 70 res = -PSICONV_E_PARSE;
71 goto ERROR2;
52 } 72 }
53 len += 4; 73 len += 4;
54 (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len); 74 (*result)->uid2 = psiconv_read_u32(buf,lev+2,off+len,&res);
75 if (res)
76 goto ERROR2;
55 psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2); 77 psiconv_debug(lev+2,off+len,"UID2: %08x",(*result)->uid2);
56 len += 4; 78 len += 4;
57 (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len); 79 (*result)->uid3 = psiconv_read_u32(buf,lev+2,off+len,&res);
80 if (res)
81 goto ERROR2;
58 psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3); 82 psiconv_debug(lev+2,off+len,"UID3: %08x",(*result)->uid3);
59 len += 4; 83 len += 4;
60 84
61 (*result)->file = psiconv_unknown_file; 85 (*result)->file = psiconv_unknown_file;
62 if ((*result)->uid1 == PSICONV_ID_PSION5) { 86 if ((*result)->uid1 == PSICONV_ID_PSION5) {
… …
65 (*result)->file = psiconv_word_file; 89 (*result)->file = psiconv_word_file;
66 psiconv_debug(lev+2,off+len,"File is a Word file"); 90 psiconv_debug(lev+2,off+len,"File is a Word file");
67 } else if ((*result)->uid3 == PSICONV_ID_TEXTED) { 91 } else if ((*result)->uid3 == PSICONV_ID_TEXTED) {
68 (*result)->file = psiconv_texted_file; 92 (*result)->file = psiconv_texted_file;
69 psiconv_debug(lev+2,off+len,"File is a TextEd file"); 93 psiconv_debug(lev+2,off+len,"File is a TextEd file");
94 } else if ((*result)->uid3 == PSICONV_ID_SKETCH) {
95 (*result)->file = psiconv_sketch_file;
96 psiconv_debug(lev+2,off+len,"File is a Sketch file");
97 } else if ((*result)->uid3 == PSICONV_ID_SHEET) {
98 (*result)->file = psiconv_sheet_file;
99 psiconv_debug(lev+2,off+len,"File is a Sheet file");
70 } 100 }
71 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { 101 } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) {
72 (*result)->file = psiconv_mbm_file; 102 (*result)->file = psiconv_mbm_file;
73 if ((*result)->uid3 != 0x00) 103 if ((*result)->uid3 != 0x00)
74 psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); 104 psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?");
… …
79 psiconv_warn(lev+2,off+len,"Unknown file type"); 109 psiconv_warn(lev+2,off+len,"Unknown file type");
80 (*result)->file = psiconv_unknown_file; 110 (*result)->file = psiconv_unknown_file;
81 } 111 }
82 112
83 psiconv_progress(lev+2,off+len,"Checking UID4"); 113 psiconv_progress(lev+2,off+len,"Checking UID4");
84 temp = psiconv_read_u32(buf,lev+2,off+len); 114 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
115 if (res)
116 goto ERROR2;
85 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2, 117 if (temp == psiconv_checkuid((*result)->uid1,(*result)->uid2,
86 (*result)->uid3)) 118 (*result)->uid3))
87 psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp); 119 psiconv_debug(lev+2,off+len,"Checksum %08x is correct",temp);
88 else { 120 else {
89 psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!"); 121 psiconv_warn(lev+2,off+len,"Checksum failed, file corrupted!");
90 psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x", 122 psiconv_debug(lev+2,off+len,"Expected checksum %08x, found %08x",
91 psiconv_checkuid((*result)->uid1,(*result)->uid2, 123 psiconv_checkuid((*result)->uid1,(*result)->uid2,
92 (*result)->uid3),temp); 124 (*result)->uid3),temp);
93 res = -1; 125 res = -PSICONV_E_PARSE;
126 goto ERROR2;
94 } 127 }
95 len += 4; 128 len += 4;
96 129
130DONE:
97 if (length) 131 if (length)
98 *length = len; 132 *length = len;
99 133
100 psiconv_progress(lev+1,off+len-1, 134 psiconv_progress(lev+1,off+len-1,
101 "End of Header Section (total length: %08x)",len); 135 "End of Header Section (total length: %08x)",len);
102 136
103 return res; 137 return res;
138
139ERROR2:
140 free(*result);
141ERROR1:
142 psiconv_warn(lev+1,off,"Reading of Header Section failed");
143 if (length)
144 *length = 0;
145 if (res == 0)
146 return -PSICONV_E_NOMEM;
147 else
148 return res;
104} 149}
105 150
106int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev, 151int psiconv_parse_section_table_section(const psiconv_buffer buf, int lev,
107 psiconv_u32 off, int *length, 152 psiconv_u32 off, int *length,
108 psiconv_section_table_section *result) 153 psiconv_section_table_section *result)
… …
113 158
114 int i; 159 int i;
115 psiconv_u8 nr; 160 psiconv_u8 nr;
116 161
117 psiconv_progress(lev+1,off+len,"Going to read the section table section"); 162 psiconv_progress(lev+1,off+len,"Going to read the section table section");
118 *result = psiconv_list_new(sizeof(*entry)); 163 if (!(*result = psiconv_list_new(sizeof(*entry))))
164 goto ERROR1;
119 165
120 psiconv_progress(lev+2,off+len,"Going to read the section table length"); 166 psiconv_progress(lev+2,off+len,"Going to read the section table length");
121 nr = psiconv_read_u8(buf,lev+2,off+len); 167 nr = psiconv_read_u8(buf,lev+2,off+len,&res);
168 if (res)
169 goto ERROR2;
122 psiconv_debug(lev+2,off+len,"Length: %08x",nr); 170 psiconv_debug(lev+2,off+len,"Length: %08x",nr);
123 if (nr & 0x01) { 171 if (nr & 0x01) {
124 psiconv_warn(lev+2,off+len, 172 psiconv_warn(lev+2,off+len,
125 "Section table length odd - ignoring last entry"); 173 "Section table length odd - ignoring last entry");
126 res = -1;
127 } 174 }
128 len ++; 175 len ++;
129 176
130 psiconv_progress(lev+2,off+len,"Going to read the section table entries"); 177 psiconv_progress(lev+2,off+len,"Going to read the section table entries");
131 entry = malloc(sizeof(*entry)); 178 entry = malloc(sizeof(*entry));
132 for (i = 0; i < nr / 2; i++) { 179 for (i = 0; i < nr / 2; i++) {
133 entry->id = psiconv_read_u32(buf,lev+2,off + len); 180 entry->id = psiconv_read_u32(buf,lev+2,off + len,&res);
181 if (res)
182 goto ERROR3;
134 psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id); 183 psiconv_debug(lev+2,off + len,"Entry %d: ID = %08x",i,entry->id);
135 len += 0x04; 184 len += 0x04;
136 entry->offset = psiconv_read_u32(buf,lev+2,off + len); 185 entry->offset = psiconv_read_u32(buf,lev+2,off + len,&res);
186 if (res)
187 goto ERROR3;
137 psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset); 188 psiconv_debug(lev+2,off +len,"Entry %d: Offset = %08x",i,entry->offset);
138 len += 0x04; 189 len += 0x04;
139 psiconv_list_add(*result,entry); 190 if ((res=psiconv_list_add(*result,entry)))
191 goto ERROR3;
140 } 192 }
141 193
142 free(entry); 194 free(entry);
143 195
144 if (length) 196 if (length)
145 *length = len; 197 *length = len;
146 198
147 psiconv_progress(lev+1,off+len-1,"End of section table section " 199 psiconv_progress(lev+1,off+len-1,"End of section table section "
148 "(total length: %08x", len); 200 "(total length: %08x)", len);
149 201
202 return 0;
203ERROR3:
204 free(entry);
205ERROR2:
206 psiconv_list_free(*result);
207ERROR1:
208 psiconv_warn(lev+1,off,"Reading of Section Table Section failed");
209 if (length)
210 *length = 0;
211 if (res == 0)
212 return -PSICONV_E_NOMEM;
213 else
150 return res; 214 return res;
151} 215}
152 216
153int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev, 217int psiconv_parse_application_id_section(const psiconv_buffer buf, int lev,
154 psiconv_u32 off, int *length, 218 psiconv_u32 off, int *length,
155 psiconv_application_id_section *result) 219 psiconv_application_id_section *result)
… …
157 int res=0; 221 int res=0;
158 int len=0; 222 int len=0;
159 int leng; 223 int leng;
160 224
161 psiconv_progress(lev+1,off,"Going to read the application id section"); 225 psiconv_progress(lev+1,off,"Going to read the application id section");
162 (*result) = malloc(sizeof(**result)); 226 if (!(*result = malloc(sizeof(**result))))
227 goto ERROR1;
163 228
164 psiconv_progress(lev+2,off+len,"Going to read the type identifier"); 229 psiconv_progress(lev+2,off+len,"Going to read the type identifier");
165 (*result)->id = psiconv_read_u32(buf,lev+2,off+len); 230 (*result)->id = psiconv_read_u32(buf,lev+2,off+len,&res);
231 if (res)
232 goto ERROR2;
166 psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id); 233 psiconv_debug(lev+2,off+len,"Identifier: %08x",(*result)->id);
167 len += 4; 234 len += 4;
168 235
169 psiconv_progress(lev+2,off+len,"Going to read the application id string"); 236 psiconv_progress(lev+2,off+len,"Going to read the application id string");
170 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng); 237 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res);
238 if (res)
239 goto ERROR2;
171 len += leng; 240 len += leng;
172 241
173 if (length) 242 if (length)
174 *length = len; 243 *length = len;
175 244
176 psiconv_progress(lev+1,off+len-1,"End of application id section " 245 psiconv_progress(lev+1,off+len-1,"End of application id section "
177 "(total length: %08x", len); 246 "(total length: %08x", len);
178 247
179 return res; 248 return res;
249ERROR2:
250 free(*result);
251ERROR1:
252 psiconv_warn(lev+1,off,"Reading of Application ID Section failed");
253 if (length)
254 *length = 0;
255 if (res == 0)
256 return -PSICONV_E_NOMEM;
257 else
258 return res;
180} 259}
181 260
182int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off, 261int psiconv_parse_text_section(const psiconv_buffer buf,int lev,psiconv_u32 off,
183 int *length,psiconv_text_and_layout *result) 262 int *length,psiconv_text_and_layout *result)
184{ 263{
… …
188 267
189 psiconv_u32 text_len; 268 psiconv_u32 text_len;
190 psiconv_paragraph para; 269 psiconv_paragraph para;
191 270
192 int nr; 271 int nr;
193 int i,j,start,leng; 272 int i,j,start,leng,temp;
194 char *str_copy; 273 char *str_copy;
195 274
196 psiconv_progress(lev+1,off,"Going to parse the text section"); 275 psiconv_progress(lev+1,off,"Going to parse the text section");
197 psiconv_progress(lev+2,off,"Reading the text length"); 276 psiconv_progress(lev+2,off,"Reading the text length");
277
278 if(!(*result = psiconv_list_new(sizeof(*para))))
279 goto ERROR1;
280 if (!(para = malloc(sizeof(*para))))
281 goto ERROR2;
282
198 text_len = psiconv_read_X(buf,lev+2,off,&leng); 283 text_len = psiconv_read_X(buf,lev+2,off,&leng,&res);
284 if (res)
285 goto ERROR3;
199 psiconv_debug(lev+2,off,"Length: %08x",text_len); 286 psiconv_debug(lev+2,off,"Length: %08x",text_len);
200 len += leng; 287 len += leng;
201
202 *result = psiconv_list_new(sizeof(*para));
203 para = malloc(sizeof(*para));
204 288
205 psiconv_progress(lev+2,off+len,"Going to read all paragraph text"); 289 psiconv_progress(lev+2,off+len,"Going to read all paragraph text");
206 nr = 0; 290 nr = 0;
207 start = 0; 291 start = 0;
208 for (i = 0; i < text_len; i++) 292 for (i = 0; i < text_len; i++) {
209 if (psiconv_read_u8(buf,lev+2,off+len+i) == 0x06) { 293 temp = psiconv_read_u8(buf,lev+2,off+len+i,&res);
294 if (res)
295 goto ERROR3;
296 if (temp == 0x06) {
210 para->text = malloc(i - start + 1); 297 if (!(para->text = malloc(i - start + 1)))
298 goto ERROR3;
211 for (j = 0; j < i - start; j++) 299 for (j = 0; j < i - start; j++) {
212 para->text[j] = psiconv_read_u8(buf,lev+1,off + len + start + j); 300 temp = psiconv_read_u8(buf,lev+1,off + len + start + j,&res);
301 if (res)
302 goto ERROR4;
303 para->text[j] = temp;
304 }
213 para->text[j] = 0; 305 para->text[j] = 0;
214 306
215 psiconv_list_add(*result,para); 307 if ((res = psiconv_list_add(*result,para)))
308 goto ERROR4;
216 309
217 str_copy = psiconv_make_printable(para->text); 310 if (!(str_copy = psiconv_make_printable(para->text)))
311 goto ERROR3;
218 psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr, 312 psiconv_debug(lev+2,off+i+len,"Line %d: %d characters",nr,
219 strlen(str_copy) +1); 313 strlen(str_copy) +1);
220 psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy); 314 psiconv_debug(lev+2,off+i+len,"Line %d: `%s'",nr,str_copy);
221 free(str_copy); 315 free(str_copy);
222 316
223 start = i + 1; 317 start = i + 1;
224 nr ++; 318 nr ++;
225 } 319 }
320 }
226 321
227 if (start != text_len) { 322 if (start != text_len) {
228 res = -1;
229 psiconv_warn(lev+2,off+start+len, 323 psiconv_warn(lev+2,off+start+len,
230 "Last line does not end on EOL (%d characters left)", len - start); 324 "Last line does not end on EOL (%d characters left)", len - start);
231 para->text = malloc(text_len - start + 1); 325 if (!(para->text = malloc(text_len - start + 1)))
326 goto ERROR3;
232 for (j = 0; j < text_len - start; j++) 327 for (j = 0; j < text_len - start; j++) {
233 para->text[j] = psiconv_read_u8(buf,lev+2,off + start + j + len); 328 temp = psiconv_read_u8(buf,lev+2,off + start + j + len, &res);
329 if (res)
330 goto ERROR4;
331 para->text[j] = temp;
332 }
234 para->text[text_len - start] = 0; 333 para->text[text_len - start] = 0;
235 psiconv_list_add(*result,para); 334 if ((res = psiconv_list_add(*result,para)))
335 goto ERROR4;
236 str_copy = psiconv_make_printable(para->text); 336 if (!(str_copy = psiconv_make_printable(para->text)))
337 goto ERROR3;
237 psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr, 338 psiconv_debug(lev+2,off+start+len,"Last line: %d characters",nr,
238 strlen(str_copy)+1); 339 strlen(str_copy)+1);
239 psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy); 340 psiconv_debug(lev+2,off+start+len,"Last line: `%s'",str_copy);
240 free(str_copy); 341 free(str_copy);
241 } 342 }
242 343
243 free(para); 344 free(para);
244 345
245 /* Initialize the remaining parts of each paragraph */ 346 /* Initialize the remaining parts of each paragraph */
246 for (i = 0; i < psiconv_list_length(*result); i ++) { 347 for (i = 0; i < psiconv_list_length(*result); i ++) {
247 para = psiconv_list_get(*result,i); 348 if (!(para = psiconv_list_get(*result,i))) {
248 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout)); 349 psiconv_warn(lev+2,off+len,"Massive memory corruption");
249 para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement)); 350 goto ERROR2_0;
351 }
352 if (!(para->in_lines = psiconv_list_new(sizeof(
353 struct psiconv_in_line_layout_s))))
354 goto ERROR2_0;
355 if (!(para->replacements = psiconv_list_new(sizeof(
356 struct psiconv_replacement_s))))
357 goto ERROR2_1;
358 if (!(para->base_character = psiconv_basic_character_layout()))
359 goto ERROR2_2;
360 if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
361 goto ERROR2_3;
250 para->base_style = 0; 362 para->base_style = 0;
251 para->base_character = psiconv_basic_character_layout();
252 para->base_paragraph = psiconv_basic_paragraph_layout();
253 } 363 }
254 364
255 365
256 len += text_len; 366 len += text_len;
257 367
… …
260 370
261 psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x", 371 psiconv_progress(lev+1,off+len-1,"End of text section (total length: %08x",
262 len); 372 len);
263 373
264 return res; 374 return res;
375
376ERROR2_3:
377 psiconv_free_character_layout(para->base_character);
378ERROR2_2:
379 psiconv_list_free(para->replacements);
380ERROR2_1:
381 psiconv_list_free(para->in_lines);
382ERROR2_0:
383 for (j = 0; j < i; j++) {
384 if (!(para = psiconv_list_get(*result,j))) {
385 psiconv_warn(lev+1,off,"Massive memory corruption...");
386 break;
387 }
388 psiconv_list_free(para->in_lines);
389 psiconv_list_free(para->replacements);
390 psiconv_free_character_layout(para->base_character);
391 psiconv_free_paragraph_layout(para->base_paragraph);
392 }
393 goto ERROR2;
394
395ERROR4:
396 free(para->text);
397ERROR3:
398 free(para);
399ERROR2:
400 for (i = 0; i < psiconv_list_length(*result);i++) {
401 if (!(para = psiconv_list_get(*result,i))) {
402 psiconv_warn(lev+1,off,"Massive memory corruption...");
403 break;
404 }
405 free(para->text);
406 }
407 psiconv_list_free(*result);
408ERROR1:
409 psiconv_warn(lev+1,off,"Reading of Text Section failed");
410 if (length)
411 *length = 0;
412 if (!res)
413 return -PSICONV_E_NOMEM;
414 else
415 return res;
265} 416}
266 417
267/* First do a parse_text_section, or you will get into trouble here */ 418/* First do a parse_text_section, or you will get into trouble here */
268int psiconv_parse_layout_section(const psiconv_buffer buf, 419int psiconv_parse_layout_section(const psiconv_buffer buf,
269 int lev,psiconv_u32 off, 420 int lev,psiconv_u32 off,
… …
275 int res = 0; 426 int res = 0;
276 int len = 0; 427 int len = 0;
277 psiconv_u32 temp; 428 psiconv_u32 temp;
278 int parse_styles,nr,i,j,total,leng,line_length; 429 int parse_styles,nr,i,j,total,leng,line_length;
279 430
280 typedef struct anon_style 431 typedef struct anon_style_s
281 { 432 {
282 int nr; 433 int nr;
283 psiconv_s16 base_style; 434 psiconv_s16 base_style;
284 psiconv_character_layout character; 435 psiconv_character_layout character;
285 psiconv_paragraph_layout paragraph; 436 psiconv_paragraph_layout paragraph;
286 } *anon_style; 437 } *anon_style;
287 438
288 typedef psiconv_list anon_style_list; /* of struct anon_style */ 439 typedef psiconv_list anon_style_list; /* of struct anon_style */
289 440
290 anon_style_list anon_styles; 441 anon_style_list anon_styles;
291 struct anon_style anon; 442 struct anon_style_s anon;
292 anon_style anon_ptr=NULL; 443 anon_style anon_ptr=NULL;
293 444
445 psiconv_character_layout temp_char;
446 psiconv_paragraph_layout temp_para;
447 psiconv_word_style temp_style;
294 psiconv_paragraph para; 448 psiconv_paragraph para;
295 struct psiconv_in_line_layout in_line; 449 struct psiconv_in_line_layout_s in_line;
296 450
297 int *inline_count; 451 int *inline_count;
298 452
299 453
300 psiconv_progress(lev+1,off,"Going to read the layout section"); 454 psiconv_progress(lev+1,off,"Going to read the layout section");
301 455
302 psiconv_progress(lev+2,off,"Going to read the section type"); 456 psiconv_progress(lev+2,off,"Going to read the section type");
303 temp = psiconv_read_u16(buf,lev+2,off+len); 457 temp = psiconv_read_u16(buf,lev+2,off+len,&res);
458 if (res)
459 goto ERROR1;
304 psiconv_debug(lev+2,off+len,"Type: %02x",temp); 460 psiconv_debug(lev+2,off+len,"Type: %02x",temp);
305 parse_styles = with_styles; 461 parse_styles = with_styles;
306 if ((temp == 0x0001) && !with_styles) { 462 if ((temp == 0x0001) && !with_styles) {
307 psiconv_warn(lev+2,off+len,"Styleless layout section expected, " 463 psiconv_warn(lev+2,off+len,"Styleless layout section expected, "
308 "but styled section found!"); 464 "but styled section found!");
309 parse_styles = 1; 465 parse_styles = 1;
310 res = -1;
311 } else if ((temp == 0x0000) && (with_styles)) { 466 } else if ((temp == 0x0000) && (with_styles)) {
312 psiconv_warn(lev+2,off+len,"Styled layout section expected, " 467 psiconv_warn(lev+2,off+len,"Styled layout section expected, "
313 "but styleless section found!"); 468 "but styleless section found!");
314 parse_styles = 0; 469 parse_styles = 0;
315 res = -1;
316 } else if ((temp != 0x0000) && (temp != 0x0001)) { 470 } else if ((temp != 0x0000) && (temp != 0x0001)) {
317 psiconv_warn(lev+2,off+len, 471 psiconv_warn(lev+2,off+len,
318 "Layout section type indicator has unknown value!"); 472 "Layout section type indicator has unknown value!");
319 res = -1;
320 } 473 }
321 len += 0x02; 474 len += 0x02;
322 475
323 psiconv_progress(lev+2,off+len,"Going to read paragraph type list"); 476 psiconv_progress(lev+2,off+len,"Going to read paragraph type list");
324 anon_styles = psiconv_list_new(sizeof(anon)); 477 if (!(anon_styles = psiconv_list_new(sizeof(anon))))
478 goto ERROR1;
325 psiconv_progress(lev+3,off+len,"Going to read paragraph type list length"); 479 psiconv_progress(lev+3,off+len,"Going to read paragraph type list length");
326 nr = psiconv_read_u8(buf,lev+3,off+len); 480 nr = psiconv_read_u8(buf,lev+3,off+len,&res);
481 if (res)
482 goto ERROR2;
327 psiconv_debug(lev+3,off+len,"Length: %02x",nr); 483 psiconv_debug(lev+3,off+len,"Length: %02x",nr);
328 len ++; 484 len ++;
329 485
330 psiconv_progress(lev+3,off+len, 486 psiconv_progress(lev+3,off+len,
331 "Going to read the paragraph type list elements"); 487 "Going to read the paragraph type list elements");
332 for (i = 0; i < nr; i ++) { 488 for (i = 0; i < nr; i ++) {
333 psiconv_progress(lev+3,off+len,"Element %d",i); 489 psiconv_progress(lev+3,off+len,"Element %d",i);
334 anon.nr = psiconv_read_u32(buf,lev+4,off+len); 490 anon.nr = psiconv_read_u32(buf,lev+4,off+len,&res);
491 if (res)
492 goto ERROR3;
335 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr); 493 psiconv_debug(lev+4,off+len,"Number: %08x",anon.nr);
336 len += 0x04; 494 len += 0x04;
337 495
338 psiconv_progress(lev+4,off,"Going to determine the base style"); 496 psiconv_progress(lev+4,off,"Going to determine the base style");
339 if (parse_styles) { 497 if (parse_styles) {
498 temp = psiconv_read_u32(buf,lev+4, off+len,&res);
499 if (res)
500 goto ERROR3;
340 anon.base_style = psiconv_read_u8(buf,lev+3, 501 anon.base_style = psiconv_read_u8(buf,lev+3, off+len+4+temp,&res);
341 off+len+4+psiconv_read_u32(buf,lev+4, 502 if (res)
342 off+len)); 503 goto ERROR3;
343 psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len), 504 psiconv_debug(lev+4,off+len+temp,
344 "Style indicator: %02x",anon.base_style); 505 "Style indicator: %02x",anon.base_style);
345 } else 506 } else
346 anon.base_style = 0; 507 anon.base_style = 0;
508 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
509 psiconv_warn(lev+4,off,"Unknown Style referenced");
510 if (!(temp_style = psiconv_get_style(styles,anon.base_style))) {
511 psiconv_warn(lev+4,off,"Base style unknown");
512 goto ERROR3;
513 }
514 }
347 anon.paragraph = psiconv_clone_paragraph_layout(psiconv_get_style 515 if (!(anon.paragraph = psiconv_clone_paragraph_layout
348 (styles,anon.base_style)->paragraph); 516 (temp_style->paragraph)))
517 goto ERROR3;
349 anon.character = psiconv_clone_character_layout(psiconv_get_style 518 if (!(anon.character = psiconv_clone_character_layout
350 (styles,anon.base_style)->character); 519 (temp_style->character)))
520 goto ERROR3_1;
351 521
352 psiconv_progress(lev+4,off+len,"Going to read the paragraph layout"); 522 psiconv_progress(lev+4,off+len,"Going to read the paragraph layout");
353 res |= psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, 523 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,
354 anon.paragraph); 524 anon.paragraph)))
525 goto ERROR3_2;
355 len += leng; 526 len += leng;
356 if (parse_styles) 527 if (parse_styles)
357 len ++; 528 len ++;
358 529
359 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 530 psiconv_progress(lev+4,off+len,"Going to read the character layout");
360 res |= psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 531 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,
361 anon.character); 532 anon.character)))
533 goto ERROR3_2;
362 len += leng; 534 len += leng;
363 psiconv_list_add(anon_styles,&anon); 535 if ((res = psiconv_list_add(anon_styles,&anon)))
536 goto ERROR3_2;
364 } 537 }
365 538
366 psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list"); 539 psiconv_progress(lev+2,off+len,"Going to parse the paragraph element list");
367 psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs"); 540 psiconv_progress(lev+3,off+len,"Going to read the number of paragraphs");
368 nr = psiconv_read_u32(buf,lev+3,off+len); 541 nr = psiconv_read_u32(buf,lev+3,off+len,&res);
542 if (res)
543 goto ERROR3;
369 if (nr != psiconv_list_length(result)) { 544 if (nr != psiconv_list_length(result)) {
370 psiconv_warn(lev+3,off+len, 545 psiconv_warn(lev+3,off+len,
371 "Number of text paragraphs and paragraph elements does not match"); 546 "Number of text paragraphs and paragraph elements does not match");
372 psiconv_debug(lev+3,off+len, 547 psiconv_debug(lev+3,off+len,
373 "%d text paragraphs, %d paragraph elements", 548 "%d text paragraphs, %d paragraph elements",
374 psiconv_list_length(result),nr); 549 psiconv_list_length(result),nr);
375 } 550 }
376 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr); 551 psiconv_debug(lev+3,off+len,"Number of paragraphs: %d",nr);
377 len += 4; 552 len += 4;
378 inline_count = malloc(nr * sizeof(*inline_count)); 553 if (!(inline_count = malloc(nr * sizeof(*inline_count))))
554 goto ERROR3;
379 555
380 psiconv_progress(lev+3,off+len,"Going to read the paragraph elements"); 556 psiconv_progress(lev+3,off+len,"Going to read the paragraph elements");
381 for (i = 0; i < nr; i ++) { 557 for (i = 0; i < nr; i ++) {
382 psiconv_progress(lev+3,off+len,"Element %d",i); 558 psiconv_progress(lev+3,off+len,"Element %d",i);
383 if (i >= psiconv_list_length(result)) { 559 if (i >= psiconv_list_length(result)) {
384 psiconv_debug(lev+4,off+len,"Going to allocate a new element"); 560 psiconv_debug(lev+4,off+len,"Going to allocate a new element");
385 para = malloc(sizeof(*para)); 561 if (!(para = malloc(sizeof(*para))))
386 para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout)); 562 goto ERROR4;
563 if (!(para->in_lines = psiconv_list_new(sizeof(
564 struct psiconv_in_line_layout_s))))
565 goto ERROR4_1;
387 para->base_style = 0; 566 para->base_style = 0;
388 para->base_character = psiconv_basic_character_layout(); 567 if (!(para->base_character = psiconv_basic_character_layout()))
568 goto ERROR4_2;
389 para->base_paragraph = psiconv_basic_paragraph_layout(); 569 if (!(para->base_paragraph = psiconv_basic_paragraph_layout()))
570 goto ERROR4_3;
571 if ((res = psiconv_list_add(result,para)))
572 goto ERROR4_4;
390 free(para); 573 free(para);
391 } 574 }
392 para = psiconv_list_get(result,i); 575 if (!(para = psiconv_list_get(result,i)))
576 goto ERROR4;
393 577
394 psiconv_progress(lev+4,off+len,"Going to read the paragraph length"); 578 psiconv_progress(lev+4,off+len,"Going to read the paragraph length");
395 temp = psiconv_read_u32(buf,lev+4,off+len); 579 temp = psiconv_read_u32(buf,lev+4,off+len,&res);
580 if (res)
581 goto ERROR4;
396 if (temp != strlen(para->text)+1) { 582 if (temp != strlen(para->text)+1) {
397 res = -1;
398 psiconv_warn(lev+4,off+len, 583 psiconv_warn(lev+4,off+len,
399 "Disagreement of the length of paragraph in layout section"); 584 "Disagreement of the length of paragraph in layout section");
400 psiconv_debug(lev+4,off+len, 585 psiconv_debug(lev+4,off+len,
401 "Paragraph length: layout section says %d, counted %d", 586 "Paragraph length: layout section says %d, counted %d",
402 temp,strlen(para->text)+1); 587 temp,strlen(para->text)+1);
403 } else 588 } else
404 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp); 589 psiconv_debug(lev+4,off+len,"Paragraph length: %d",temp);
405 len += 4; 590 len += 4;
406 591
407 psiconv_progress(lev+4,off+len,"Going to read the paragraph type"); 592 psiconv_progress(lev+4,off+len,"Going to read the paragraph type");
408 temp = psiconv_read_u8(buf,lev+4,off+len); 593 temp = psiconv_read_u8(buf,lev+4,off+len,&res);
594 if (res)
595 goto ERROR4;
409 if (temp != 0x00) { 596 if (temp != 0x00) {
410 psiconv_debug(lev+4,off+len,"Type: %02x",temp); 597 psiconv_debug(lev+4,off+len,"Type: %02x",temp);
411 for (j = 0; j < psiconv_list_length(anon_styles); j++) { 598 for (j = 0; j < psiconv_list_length(anon_styles); j++) {
412 anon_ptr = psiconv_list_get(anon_styles,j); 599 if (!(anon_ptr = psiconv_list_get(anon_styles,j))) {
600 psiconv_warn(lev+4,off+len,"Massive memory curruption");
601 goto ERROR4;
602 }
413 if (temp == anon_ptr->nr) 603 if (temp == anon_ptr->nr)
414 break; 604 break;
415 } 605 }
416 if (j == psiconv_list_length(anon_styles)) { 606 if (j == psiconv_list_length(anon_styles)) {
417 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown"); 607 psiconv_warn(lev+4,off+len,"Layout section paragraph type unknown");
418 psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead"); 608 psiconv_debug(lev+4,off+len,"Unknown type - using base styles instead");
419 para->base_style = 0; 609 para->base_style = 0;
610 if (!(temp_style = psiconv_get_style(styles,0))) {
611 psiconv_warn(lev+4,off,"Base style unknown");
612 goto ERROR4;
613 }
614 if (!(temp_para = psiconv_clone_paragraph_layout
615 (temp_style->paragraph)))
616 goto ERROR4;
420 psiconv_free_paragraph_layout(para->base_paragraph); 617 psiconv_free_paragraph_layout(para->base_paragraph);
618 para->base_paragraph = temp_para;
619
620 if (!(temp_char = psiconv_clone_character_layout
621 (temp_style->character)))
622 goto ERROR4;
421 psiconv_free_character_layout(para->base_character); 623 psiconv_free_character_layout(para->base_character);
422 para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style 624 para->base_character = temp_char;
423 (styles,0)->paragraph);
424 para->base_character = psiconv_clone_character_layout(psiconv_get_style
425 (styles,0)->character);
426 } else { 625 } else {
427 para->base_style = anon_ptr->base_style; 626 para->base_style = anon_ptr->base_style;
627 if (!(temp_para = psiconv_clone_paragraph_layout (anon_ptr->paragraph)))
628 goto ERROR4;
428 psiconv_free_paragraph_layout(para->base_paragraph); 629 psiconv_free_paragraph_layout(para->base_paragraph);
630 para->base_paragraph = temp_para;
631
632 if (!(temp_char = psiconv_clone_character_layout (anon_ptr->character)))
633 goto ERROR4;
429 psiconv_free_character_layout(para->base_character); 634 psiconv_free_character_layout(para->base_character);
430 para->base_paragraph = psiconv_clone_paragraph_layout 635 para->base_character = temp_char;
431 (anon_ptr->paragraph);
432 para->base_character = psiconv_clone_character_layout
433 (anon_ptr->character);
434 } 636 }
435 inline_count[i] = 0; 637 inline_count[i] = 0;
436 len += 0x01; 638 len += 0x01;
437 } else { 639 } else {
438 psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)" 640 psiconv_debug(lev+4,off+len,"Type: %02x (not based on a paragraph type)"
439 ,temp); 641 ,temp);
440 len += 0x01; 642 len += 0x01;
441 if (parse_styles) { 643 if (parse_styles) {
442 psiconv_progress(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len), 644 temp = psiconv_read_u32(buf,lev+4,off+len,&res);
645 if (res)
646 goto ERROR4;
647 psiconv_progress(lev+4,off+len+temp+4,
443 "Going to read the paragraph element base style"); 648 "Going to read the paragraph element base style");
444 temp = psiconv_read_u8(buf,lev+4, 649 temp = psiconv_read_u8(buf,lev+4, off+len+temp+4,&res);
445 off+len+psiconv_read_u32(buf,lev+4,off+len)); 650 if (res)
446 psiconv_debug(lev+4,off+len+psiconv_read_u32(buf,lev+4,off+len), 651 goto ERROR4;
447 "Style: %02x",temp); 652 psiconv_debug(lev+4,off+len+temp+4, "Style: %02x",temp);
448 } else 653 } else
449 temp = 0x00; 654 temp = 0x00;
655
656 if (!(temp_style = psiconv_get_style (styles,temp))) {
657 psiconv_warn(lev+4,off,"Unknown Style referenced");
658 if (!(temp_style = psiconv_get_style(styles,0))) {
659 psiconv_warn(lev+4,off,"Base style unknown");
660 goto ERROR4;
661 }
662 }
663
664 if (!(temp_para = psiconv_clone_paragraph_layout(temp_style->paragraph)))
665 goto ERROR4;
450 psiconv_free_paragraph_layout(para->base_paragraph); 666 psiconv_free_paragraph_layout(para->base_paragraph);
667 para->base_paragraph = temp_para;
668
669 if (!(temp_char = psiconv_clone_character_layout(temp_style->character)))
670 goto ERROR4;
451 psiconv_free_character_layout(para->base_character); 671 psiconv_free_character_layout(para->base_character);
452 para->base_paragraph = psiconv_clone_paragraph_layout(psiconv_get_style 672 para->base_character = temp_char;
453 (styles,temp)->paragraph); 673
454 para->base_character = psiconv_clone_character_layout(psiconv_get_style
455 (styles,temp)->character);
456 para->base_style = temp; 674 para->base_style = temp;
457 psiconv_progress(lev+4,off+len,"Going to read paragraph layout"); 675 psiconv_progress(lev+4,off+len,"Going to read paragraph layout");
458 psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng, 676 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+4,off+len,&leng,
459 para->base_paragraph); 677 para->base_paragraph)))
678 goto ERROR4;
460 len += leng; 679 len += leng;
461 if (parse_styles) 680 if (parse_styles)
462 len += 1; 681 len += 1;
463 psiconv_progress(lev+4,off+len,"Going to read number of in-line " 682 psiconv_progress(lev+4,off+len,"Going to read number of in-line "
464 "layout elements"); 683 "layout elements");
465 inline_count[i] = psiconv_read_u32(buf,lev+4,off+len); 684 inline_count[i] = psiconv_read_u32(buf,lev+4,off+len,&res);
685 if (res)
686 goto ERROR4;
466 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]); 687 psiconv_debug(lev+4,off+len,"Nr: %08x",inline_count[i]);
467 len += 4; 688 len += 4;
468 } 689 }
469 } 690 }
470 691
471 psiconv_progress(lev+2,off+len,"Going to read the text layout inline list"); 692 psiconv_progress(lev+2,off+len,"Going to read the text layout inline list");
472 693
473 psiconv_progress(lev+3,off+len,"Going to read the number of elements"); 694 psiconv_progress(lev+3,off+len,"Going to read the number of elements");
474 nr = psiconv_read_u32(buf,lev+3,off+len); 695 nr = psiconv_read_u32(buf,lev+3,off+len,&res);
696 if (res)
697 goto ERROR4;
475 psiconv_debug(lev+3,off,"Elements: %08x",nr); 698 psiconv_debug(lev+3,off+len,"Elements: %08x",nr);
476 len += 0x04; 699 len += 0x04;
477 700
478 psiconv_progress(lev+3,off+len, 701 psiconv_progress(lev+3,off+len,
479 "Going to read the text layout inline elements"); 702 "Going to read the text layout inline elements");
480 total = 0; 703 total = 0;
481 for (i = 0; i < psiconv_list_length(result); i++) { 704 for (i = 0; i < psiconv_list_length(result); i++) {
482 para = psiconv_list_get(result,i); 705 if (!(para = psiconv_list_get(result,i))) {
706 psiconv_warn(lev+3,off+len,"Massive memory corruption");
707 goto ERROR4;
708 }
483 line_length = -1; 709 line_length = -1;
484 for (j = 0; j < inline_count[i]; j++) { 710 for (j = 0; j < inline_count[i]; j++) {
485 psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d", 711 psiconv_progress(lev+3,off+len,"Element %d: Paragraph %d, element %d",
486 total,i,j); 712 total,i,j);
487 if (total >= nr) { 713 if (total >= nr) {
488 psiconv_warn(lev+3,off+len, 714 psiconv_warn(lev+3,off+len,
489 "Layout section inlines: not enough element"); 715 "Layout section inlines: not enough element");
490 res = -1;
491 psiconv_debug(lev+3,off+len,"Can't read element!"); 716 psiconv_debug(lev+3,off+len,"Can't read element!");
492 } else { 717 } else {
493 total ++; 718 total ++;
494 in_line.layout = psiconv_clone_character_layout(para->base_character); 719 if (!(in_line.layout = psiconv_clone_character_layout
720 (para->base_character)))
721 goto ERROR4;
495 psiconv_progress(lev+4,off+len,"Going to read the element type"); 722 psiconv_progress(lev+4,off+len,"Going to read the element type");
496 temp = psiconv_read_u8(buf,lev+4,len+off); 723 temp = psiconv_read_u8(buf,lev+4,len+off,&res);
724 if (res)
725 goto ERROR4;
497 len += 1; 726 len += 1;
498 psiconv_debug(lev+4,off,"Type: %02x",temp); 727 psiconv_debug(lev+4,off+len,"Type: %02x",temp);
499 psiconv_progress(lev+4,off, 728 psiconv_progress(lev+4,off+len,
500 "Going to read the number of characters it applies to"); 729 "Going to read the number of characters it applies to");
501 in_line.length = psiconv_read_u32(buf,lev+4,len+off); 730 in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res);
731 if (res)
732 goto ERROR4;
502 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); 733 psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length);
503 len += 4; 734 len += 4;
504 psiconv_progress(lev+4,off+len,"Going to read the character layout"); 735 psiconv_progress(lev+4,off+len,"Going to read the character layout");
505 res |= psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng, 736 if ((res = psiconv_parse_character_layout_list(buf,lev+4,off+len,&leng,
506 in_line.layout); 737 in_line.layout)))
738 goto ERROR4;
507 len += leng; 739 len += leng;
508 740
509 if (temp == 0x01) { 741 if (temp == 0x01) {
510 psiconv_debug(lev+4,off+len,"Skipping object data"); 742 psiconv_debug(lev+4,off+len,"Skipping object data");
511 len += 0x10; 743 len += 0x10;
512 } else if (temp != 0x00) { 744 } else if (temp != 0x00) {
513 psiconv_warn(lev+4,off+len,"Layout section unknown inline type"); 745 psiconv_warn(lev+4,off+len,"Layout section unknown inline type");
514 res = -1;
515 } 746 }
516 if (line_length + in_line.length > strlen(para->text)) { 747 if (line_length + in_line.length > strlen(para->text)) {
517 psiconv_warn(lev+4,off+len, 748 psiconv_warn(lev+4,off+len,
518 "Layout section inlines: line length mismatch"); 749 "Layout section inlines: line length mismatch");
519 res = -1; 750 res = -1;
520 in_line.length = strlen(para->text) - line_length; 751 in_line.length = strlen(para->text) - line_length;
521 } 752 }
522 line_length += in_line.length; 753 line_length += in_line.length;
523 psiconv_list_add(para->in_lines,&in_line); 754 if ((res = psiconv_list_add(para->in_lines,&in_line)))
755 goto ERROR4;
524 } 756 }
525 } 757 }
526 } 758 }
527 759
528 if (total != nr) { 760 if (total != nr) {
… …
531 } 763 }
532 764
533 free(inline_count); 765 free(inline_count);
534 766
535 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) { 767 for (i = 0 ; i < psiconv_list_length(anon_styles); i ++) {
536 anon_ptr = psiconv_list_get(anon_styles,i); 768 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
769 psiconv_warn(lev+4,off+len,"Massive memory corruption");
770 goto ERROR2;
771 }
537 psiconv_free_character_layout(anon_ptr->character); 772 psiconv_free_character_layout(anon_ptr->character);
538 psiconv_free_paragraph_layout(anon_ptr->paragraph); 773 psiconv_free_paragraph_layout(anon_ptr->paragraph);
539 } 774 }
540 psiconv_list_free(anon_styles); 775 psiconv_list_free(anon_styles);
541 776
542 if (length) 777 if (length)
543 *length = len; 778 *length = len;
544 779
545 psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x", 780 psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)",
546 len); 781 len);
547 782
783 return 0;
784
785ERROR4_4:
786 psiconv_free_paragraph_layout(para->base_paragraph);
787ERROR4_3:
788 psiconv_free_character_layout(para->base_character);
789ERROR4_2:
790 psiconv_list_free(para->in_lines);
791ERROR4_1:
792 free(para);
793 goto ERROR4;
794
795ERROR3_2:
796 psiconv_free_character_layout(anon.character);
797ERROR3_1:
798 psiconv_free_paragraph_layout(anon.paragraph);
799 goto ERROR3;
800
801ERROR4:
802 free(inline_count);
803ERROR3:
804 for (i = 0; i < psiconv_list_length(anon_styles); i++) {
805 if (!(anon_ptr = psiconv_list_get(anon_styles,i))) {
806 psiconv_warn(lev+1,off,"Massive memory corruption");
807 break;
808 }
809 psiconv_free_paragraph_layout(anon_ptr->paragraph);
810 psiconv_free_character_layout(anon_ptr->character);
811 }
812
813ERROR2:
814 psiconv_list_free(anon_styles);
815ERROR1:
816 psiconv_warn(lev+1,off,"Reading of Layout Section failed");
817 if (length)
818 *length = 0;
819 if (!res)
820 return -PSICONV_E_NOMEM;
821 else
548 return res; 822 return res;
549} 823}
550 824
551int psiconv_parse_styled_layout_section(const psiconv_buffer buf, 825int psiconv_parse_styled_layout_section(const psiconv_buffer buf,
552 int lev,psiconv_u32 off, 826 int lev,psiconv_u32 off,
553 int *length, 827 int *length,
… …
556{ 830{
557 return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); 831 return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1);
558} 832}
559 833
560int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, 834int psiconv_parse_styleless_layout_section(const psiconv_buffer buf,
561 int lev,psiconv_u32 off, 835 int lev,psiconv_u32 off,
562 int *length, 836 int *length,
563 psiconv_text_and_layout result, 837 psiconv_text_and_layout result,
564 psiconv_character_layout base_char, 838 const psiconv_character_layout base_char,
565 psiconv_paragraph_layout base_para) 839 const psiconv_paragraph_layout base_para)
566{ 840{
567 int res; 841 int res = 0;
568 psiconv_word_styles_section styles_section; 842 psiconv_word_styles_section styles_section;
569 843
570 styles_section = malloc(sizeof(*styles_section)); 844 if (!(styles_section = malloc(sizeof(*styles_section))))
845 goto ERROR1;
571 styles_section->normal = malloc(sizeof(*styles_section->normal)); 846 if (!(styles_section->normal = malloc(sizeof(*styles_section->normal))))
572 styles_section->normal->character = psiconv_clone_character_layout(base_char); 847 goto ERROR2;
573 styles_section->normal->paragraph = psiconv_clone_paragraph_layout(base_para); 848 if (!(styles_section->normal->character =
849 psiconv_clone_character_layout(base_char)))
850 goto ERROR3;
851 if (!(styles_section->normal->paragraph =
852 psiconv_clone_paragraph_layout(base_para)))
853 goto ERROR4;
574 styles_section->normal->hotkey = 0; 854 styles_section->normal->hotkey = 0;
575 styles_section->normal->name = strdup(""); 855 if (!(styles_section->normal->name = strdup("")))
856 goto ERROR5;
576 styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style)); 857 if (!(styles_section->styles = psiconv_list_new(sizeof(
858 struct psiconv_word_style_s))))
859 goto ERROR6;
577 860
578 res = psiconv_parse_layout_section(buf,lev,off,length,result, 861 res = psiconv_parse_layout_section(buf,lev,off,length,result,
579 styles_section,0); 862 styles_section,0);
580 863
581 psiconv_free_word_styles_section(styles_section); 864 psiconv_free_word_styles_section(styles_section);
582 return res; 865 return res;
866
867ERROR6:
868 free(styles_section->normal->name);
869ERROR5:
870 psiconv_free_paragraph_layout(styles_section->normal->paragraph);
871ERROR4:
872 psiconv_free_character_layout(styles_section->normal->character);
873ERROR3:
874 free(styles_section->normal);
875ERROR2:
876 free(styles_section);
877ERROR1:
878 psiconv_warn(lev+1,off,"Reading of Styleless Layout Section failed");
879 if (length)
880 *length = 0;
881 if (!res)
882 return -PSICONV_E_NOMEM;
883 else
884 return res;
583} 885}
584 886
Legend:
Removed from v.18  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26