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

gmio_stl: fix some defects reported by coverity scan

Browse Source
This commit is contained in:
Hugues Delorme 2015-11-06 15:33:01 +01:00
parent c800b4afc3
commit 516242b9ba
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gmio_stl/internal/stlb_write.c
View File

@ -46,15 +46,12 @@ static void gmio_stlb_write_facets(
const gmio_stl_triangle_func_fix_endian_t func_fix_endian = const gmio_stl_triangle_func_fix_endian_t func_fix_endian =
wparams->func_fix_endian; wparams->func_fix_endian;
const gmio_stl_mesh_func_get_triangle_t func_get_triangle = const gmio_stl_mesh_func_get_triangle_t func_get_triangle =
mesh != NULL ? mesh->func_get_triangle : NULL; mesh->func_get_triangle;
const void* cookie = mesh->cookie; const void* cookie = mesh->cookie;
gmio_stl_triangle_t triangle; gmio_stl_triangle_t triangle;
uint32_t mblock_offset = 0; uint32_t mblock_offset = 0;
uint32_t i_facet = 0; uint32_t i_facet = 0;
if (func_get_triangle == NULL)
return;
triangle.attribute_byte_count = 0; triangle.attribute_byte_count = 0;
for (i_facet = 0; i_facet < facet_count; ++i_facet) { for (i_facet = 0; i_facet < facet_count; ++i_facet) {
func_get_triangle(cookie, i_facet_offset + i_facet, &triangle); func_get_triangle(cookie, i_facet_offset + i_facet, &triangle);
@ -85,10 +82,11 @@ int gmio_stlb_write(
int error = GMIO_ERROR_OK; int error = GMIO_ERROR_OK;
/* Check validity of input parameters */ /* Check validity of input parameters */
gmio_stl_check_mesh(&error, mesh); if (!gmio_stl_check_mesh(&error, mesh)
gmio_stlb_check_params(&error, trsf, byte_order); || !gmio_stlb_check_params(&error, trsf, byte_order))
if (gmio_error(error)) {
return error; return error;
}
/* Initialize wparams */ /* Initialize wparams */
if (byte_order != GMIO_ENDIANNESS_HOST) if (byte_order != GMIO_ENDIANNESS_HOST)

1
src/gmio_stl/stlb_read.c
View File

@ -47,6 +47,7 @@ static void gmio_stlb_read_facets(
const uint32_t i_facet_offset = rparams->i_facet_offset; const uint32_t i_facet_offset = rparams->i_facet_offset;
const gmio_stl_triangle_func_fix_endian_t func_fix_endian = const gmio_stl_triangle_func_fix_endian_t func_fix_endian =
rparams->func_fix_endian; rparams->func_fix_endian;
/* coverity[var_deref_op : FALSE] */
const gmio_stl_mesh_creator_func_add_triangle_t func_add_triangle = const gmio_stl_mesh_creator_func_add_triangle_t func_add_triangle =
creator != NULL ? creator->func_add_triangle : NULL; creator != NULL ? creator->func_add_triangle : NULL;
void* cookie = creator->cookie; void* cookie = creator->cookie;