Fixing the negative scenarios in ut_kvp_getStringField() #42

rdkcentral · Sep 17, 2024 · b906244 · b906244
1 parent 358f99c
commit b906244
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,9 +8,9 @@
       "args": [],
       "stopAtEntry": false,
       "externalConsole": false,
-      "cwd": "${workspaceFolder}/tests/bin/",
-      "program": "${workspaceFolder}/tests/bin/ut_control_test",
-      "environment": [ {"name": "LD_LIBRARY_PATH", "value":"${workspaceFolder}/tests/bin/"} ],
+      "cwd": "${workspaceFolder}/tests/build/bin/",
+      "program": "${workspaceFolder}/tests/build/bin/ut_control_test",
+      "environment": [ {"name": "LD_LIBRARY_PATH", "value":"${workspaceFolder}/tests/build/bin/"} ],
       "MIMode": "gdb",
       "miDebuggerPath": "gdb",
       "setupCommands": [

diff --git a/src/ut_kvp.c b/src/ut_kvp.c
@@ -597,14 +597,16 @@ uint32_t ut_kvp_getListCount( ut_kvp_instance_t *pInstance, const char *pszKey)
         return 0;
     }
 
-    if (fy_node_is_sequence(node))
+    if (!fy_node_is_sequence(node))
     {
-        count = fy_node_sequence_item_count(node);
-        if (count == -1)
-        {
-            UT_LOG_ERROR("fy_node_sequence_item_count() returned error\n ");
-            return 0;
-        }
+        return 0; // Early return on negative check
+    }
+
+    count = fy_node_sequence_item_count(node);
+    if (count == -1)
+    {
+        UT_LOG_ERROR("fy_node_sequence_item_count() returned error\n");
+        return 0;
     }
 
     return count;

diff --git a/tests/src/ut_test_kvp.c b/tests/src/ut_test_kvp.c
@@ -305,6 +305,9 @@ void test_ut_kvp_list(void)
     uint32_t result;
     int count;
 
+    count = ut_kvp_getListCount(gpMainTestInstance, "decodeTest/checkFloat");
+    UT_ASSERT( count == 0 );
+
     count = ut_kvp_getListCount(gpMainTestInstance, "decodeTest/checkStringList");
     UT_ASSERT( count == 3 );