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