caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stla: fix two potential bugs in gmio_stla_read()

Browse Source 
* more tolerant read of solid name (can even include "solid")
* set the attribute_byte_count to 0 (triangle passed to callback)
This commit is contained in:
Hugues Delorme 2015-09-11 16:34:18 +02:00
parent aca4e77976
commit ac7fd554f8
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gmio_stl/stla_read.c
View File

@ -358,17 +358,12 @@ static void parse_solidname_beg(gmio_stla_parse_data_t* data)
if (!parsing_can_continue(data)) if (!parsing_can_continue(data))
return; return;
switch (data->token) { if (data->token == FACET_token || data->token == ENDSOLID_token) {
case ID_token: gmio_string_buffer_clear(&data->string_buffer);
}
else {
/* Solid name can be made of multiple words */ /* Solid name can be made of multiple words */
parse_eat_until_token(data, FACET_token | ENDSOLID_token); parse_eat_until_token(data, FACET_token | ENDSOLID_token);
break;
case FACET_token:
case ENDSOLID_token:
gmio_string_buffer_clear(&data->string_buffer);
break;
default:
parsing_error_msg(data, "unexpected token for 'solid <name>'");
} }
} }
@ -481,6 +476,7 @@ static void parse_facets(gmio_stla_parse_data_t* data)
uint32_t i_facet = 0; uint32_t i_facet = 0;
gmio_stl_triangle_t facet; gmio_stl_triangle_t facet;
facet.attribute_byte_count = 0;
while (data->token == FACET_token && parsing_can_continue(data)) { while (data->token == FACET_token && parsing_can_continue(data)) {
parse_facet(data, &facet); parse_facet(data, &facet);
gmio_stl_mesh_creator_add_triangle(data->creator, i_facet, &facet); gmio_stl_mesh_creator_add_triangle(data->creator, i_facet, &facet);