From 516242b9bace97931b4762bb6aed11a3b1f9efb6 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 6 Nov 2015 15:33:01 +0100 Subject: [PATCH] gmio_stl: fix some defects reported by coverity scan --- src/gmio_stl/internal/stlb_write.c | 12 +++++------- src/gmio_stl/stlb_read.c | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gmio_stl/internal/stlb_write.c b/src/gmio_stl/internal/stlb_write.c index a77d294..334d333 100644 --- a/src/gmio_stl/internal/stlb_write.c +++ b/src/gmio_stl/internal/stlb_write.c @@ -46,15 +46,12 @@ static void gmio_stlb_write_facets( const gmio_stl_triangle_func_fix_endian_t func_fix_endian = wparams->func_fix_endian; 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; gmio_stl_triangle_t triangle; uint32_t mblock_offset = 0; uint32_t i_facet = 0; - if (func_get_triangle == NULL) - return; - triangle.attribute_byte_count = 0; for (i_facet = 0; i_facet < facet_count; ++i_facet) { func_get_triangle(cookie, i_facet_offset + i_facet, &triangle); @@ -85,10 +82,11 @@ int gmio_stlb_write( int error = GMIO_ERROR_OK; /* Check validity of input parameters */ - gmio_stl_check_mesh(&error, mesh); - gmio_stlb_check_params(&error, trsf, byte_order); - if (gmio_error(error)) + if (!gmio_stl_check_mesh(&error, mesh) + || !gmio_stlb_check_params(&error, trsf, byte_order)) + { return error; + } /* Initialize wparams */ if (byte_order != GMIO_ENDIANNESS_HOST) diff --git a/src/gmio_stl/stlb_read.c b/src/gmio_stl/stlb_read.c index 89d36c4..3173706 100644 --- a/src/gmio_stl/stlb_read.c +++ b/src/gmio_stl/stlb_read.c @@ -47,6 +47,7 @@ static void gmio_stlb_read_facets( const uint32_t i_facet_offset = rparams->i_facet_offset; const gmio_stl_triangle_func_fix_endian_t func_fix_endian = rparams->func_fix_endian; + /* coverity[var_deref_op : FALSE] */ const gmio_stl_mesh_creator_func_add_triangle_t func_add_triangle = creator != NULL ? creator->func_add_triangle : NULL; void* cookie = creator->cookie;