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