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