mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

fix bug in parser

Browse Source
This commit is contained in:
Mario Hüttel 2018-05-31 02:16:12 +02:00
parent 8455491c11
commit dc208c6ad3
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gds-parser/gds-parser.c
View File

@ -387,7 +387,7 @@ void gds_parse_date(const char *buffer, int length, struct gds_time_field *mod_d
int parse_gds_from_file(const char *filename, GList **library_list) int parse_gds_from_file(const char *filename, GList **library_list)
{ {
char workbuff[1024]; char *workbuff;
int read; int read;
int i; int i;
int run = 1; int run = 1;
@ -404,6 +404,12 @@ int parse_gds_from_file(const char *filename, GList **library_list)
lib_list = *library_list; lib_list = *library_list;
/* Allocate working buffer */
workbuff = (char *)malloc(sizeof(char)*128*1024);
if(!workbuff)
return -100;
/* open File */ /* open File */
gds_file = fopen(filename, "r"); gds_file = fopen(filename, "r");
if (gds_file == NULL) { if (gds_file == NULL) {
@ -428,8 +434,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
break; break;
} }
rec_data_length = (uint16_t)((((uint16_t)(workbuff[0])) << 8) | rec_data_length = gds_convert_unsigend_int16(workbuff);
(uint16_t)(workbuff[1]));
if (rec_data_length < 4) { if (rec_data_length < 4) {
/* Possible Zero-Padding: */ /* Possible Zero-Padding: */
@ -452,8 +457,7 @@ int parse_gds_from_file(const char *filename, GList **library_list)
GDS_ERROR("Unexpected end of file"); GDS_ERROR("Unexpected end of file");
break; break;
} }
rec_type = (uint16_t)((((uint16_t)(workbuff[0])) << 8) | rec_type = gds_convert_unsigend_int16(workbuff);
(uint16_t)(workbuff[1]));
/* if begin: Allocate structures */ /* if begin: Allocate structures */
switch (rec_type) { switch (rec_type) {
@ -595,7 +599,8 @@ int parse_gds_from_file(const char *filename, GList **library_list)
read = fread(workbuff, sizeof(char), rec_data_length, gds_file); read = fread(workbuff, sizeof(char), rec_data_length, gds_file);
if (read != rec_data_length) { if (read != rec_data_length) {
GDS_ERROR("Could not read enough data"); GDS_ERROR("Could not read enough data: requested: %u, read: %u | Type: %04x\n",
(unsigned int)rec_data_length, (unsigned int)read, (unsigned int)rec_type);
run = -5; run = -5;
break; break;
} }
@ -696,10 +701,15 @@ int parse_gds_from_file(const char *filename, GList **library_list)
fclose(gds_file); fclose(gds_file);
if (!run) {
/* Iterate and find references to cells */ /* Iterate and find references to cells */
g_list_foreach(lib_list, scan_library_references, NULL); g_list_foreach(lib_list, scan_library_references, NULL);
}
*library_list = lib_list; *library_list = lib_list;
free(workbuff);
return run; return run;
} }