commit 9f25c7a279bb5a56c6c8b95edab2d68d48d88ad3
parent 411a1fbc59730e8913b2b65e130a286735e27f71
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 13 Oct 2023 16:54:47 +0200
Correct loading function input argument checks
An assert was issued when the argument structure was null.
Diffstat:
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/smsh.c b/src/smsh.c
@@ -42,7 +42,6 @@ check_smsh_create_args(const struct smsh_create_args* args)
static INLINE res_T
check_smsh_load_args(const struct smsh_load_args* args)
{
- ASSERT(args);
if(!args || !args->path) return RES_BAD_ARG;
return RES_OK;
}
@@ -50,7 +49,6 @@ check_smsh_load_args(const struct smsh_load_args* args)
static INLINE res_T
check_smsh_load_stream_args(const struct smsh_load_stream_args* args)
{
- ASSERT(args);
if(!args || !args->stream || !args->name) return RES_BAD_ARG;
return RES_OK;
}
diff --git a/src/test_smsh_load.c b/src/test_smsh_load.c
@@ -123,6 +123,7 @@ test_load_mesh(struct smsh* smsh, const uint32_t dnode, const uint32_t dcell)
stream_args.stream = fp;
stream_args.name = filename;
CHK(smsh_load_stream(NULL, &stream_args) == RES_BAD_ARG);
+ CHK(smsh_load_stream(smsh, NULL) == RES_BAD_ARG);
stream_args.stream = NULL;
CHK(smsh_load_stream(smsh, &stream_args) == RES_BAD_ARG);
stream_args.stream = fp;
@@ -152,6 +153,7 @@ test_load_mesh(struct smsh* smsh, const uint32_t dnode, const uint32_t dcell)
args.path = filename;
CHK(smsh_load(NULL, &args) == RES_BAD_ARG);
+ CHK(smsh_load(smsh, NULL) == RES_BAD_ARG);
args.path = NULL;
CHK(smsh_load(smsh, &args) == RES_BAD_ARG);
args.path = "nop";