From d93b90edecd942c8af927472b48c1ce81f97e012 Mon Sep 17 00:00:00 2001 From: Yongjoo Ahn Date: Fri, 5 Jan 2024 18:17:27 +0900 Subject: [PATCH] [mlagent] Let `mlagent_get_model_path_from` returns uri in fallback - Let the function returns properly allocated gchar* in fallback case. - Fix memleak (g_strfreev). - Fix memleak in a testcase. Signed-off-by: Yongjoo Ahn --- gst/nnstreamer/ml_agent.c | 4 +++- tests/unittest_mlagent/unittest_mlagent.cc | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gst/nnstreamer/ml_agent.c b/gst/nnstreamer/ml_agent.c index f95a049..d5567ff 100644 --- a/gst/nnstreamer/ml_agent.c +++ b/gst/nnstreamer/ml_agent.c @@ -146,6 +146,8 @@ mlagent_get_model_path_from (const GValue * val) "Invalid value for the key, %s", JSON_KEY_MODEL_PATH); goto fallback; } + + g_strfreev (parts); return g_strdup (path); } } @@ -155,5 +157,5 @@ fallback: g_clear_error (&err); g_strfreev (parts); - return uri; + return g_strdup (uri); } diff --git a/tests/unittest_mlagent/unittest_mlagent.cc b/tests/unittest_mlagent/unittest_mlagent.cc index 5a0b8d7..1f55a76 100644 --- a/tests/unittest_mlagent/unittest_mlagent.cc +++ b/tests/unittest_mlagent/unittest_mlagent.cc @@ -127,6 +127,8 @@ TEST (testMLAgent, GetModelInvalidModel_n) * the given URI as it is so that it is handled by the fallback procedure (i.e., regarding it as a file path). */ EXPECT_STREQ (uri, path); + + g_value_reset (&val); } /** -- 2.7.4