From ef903b3c87dee47ce7e590849cc539afdb2481a2 Mon Sep 17 00:00:00 2001 From: hjkim Date: Wed, 27 Mar 2024 10:35:58 +0900 Subject: [PATCH] check parameter before using strlen() Change-Id: Ideff7dbf3212c09653a3262f06b52a147eeece70 --- packaging/capi-media-controller.spec | 2 +- test/client_test/media_controller_client_test.c | 18 +++++++++++-- test/server_test/media_controller_server_test.c | 36 ++++++++++++++++++++++--- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec index 72455ef..2df010e 100644 --- a/packaging/capi-media-controller.spec +++ b/packaging/capi-media-controller.spec @@ -1,6 +1,6 @@ Name: capi-media-controller Summary: A media controller library in Tizen Native API -Version: 0.2.45 +Version: 0.2.46 Release: 1 Group: Multimedia/API License: Apache-2.0 diff --git a/test/client_test/media_controller_client_test.c b/test/client_test/media_controller_client_test.c index 96490ea..35d50a0 100755 --- a/test/client_test/media_controller_client_test.c +++ b/test/client_test/media_controller_client_test.c @@ -1088,7 +1088,14 @@ static void __display_menu(void) static void __interpret_information_menu(char *cmd) { - int len = strlen(cmd); + int len; + + if (!cmd) { + g_print("invalid command.\n"); + return; + } + + len = strlen(cmd); if (len == 1) { if (!strncmp(cmd, "1", len)) @@ -1118,7 +1125,14 @@ static void __interpret_information_menu(char *cmd) static void __interpret_main_menu(char *cmd) { - int len = strlen(cmd); + int len; + + if (!cmd) { + g_print("invalid command.\n"); + return; + } + + len = strlen(cmd); if (len == 1) { if (!strncmp(cmd, "1", len)) diff --git a/test/server_test/media_controller_server_test.c b/test/server_test/media_controller_server_test.c index 08e24d0..d727cee 100755 --- a/test/server_test/media_controller_server_test.c +++ b/test/server_test/media_controller_server_test.c @@ -1108,7 +1108,14 @@ static void __display_menu(void) static void __interpret_update_info_menu(char *cmd) { - int len = strlen(cmd); + int len; + + if (!cmd) { + g_print("invalid command.\n"); + return; + } + + len = strlen(cmd); if (len == 1 || len == 2) { if (!strncmp(cmd, "1", len)) @@ -1266,7 +1273,14 @@ static void __interpret_update_ability_menu(char *cmd) static void __interpret_set_info_menu(char *cmd) { - int len = strlen(cmd); + int len; + + if (!cmd) { + g_print("invalid command.\n"); + return; + } + + len = strlen(cmd); if (len == 1) { if (!strncmp(cmd, "1", len)) @@ -1298,7 +1312,14 @@ static void __interpret_set_info_menu(char *cmd) static void __interpret_send_event_menu(char *cmd) { - int len = strlen(cmd); + int len; + + if (!cmd) { + g_print("invalid command.\n"); + return; + } + + len = strlen(cmd); if (len == 1) { if (!strncmp(cmd, "1", len)) { @@ -1326,7 +1347,14 @@ static void __interpret_send_event_menu(char *cmd) static void __interpret_main_menu(char *cmd) { - int len = strlen(cmd); + int len; + + if (!cmd) { + g_print("invalid command.\n"); + return; + } + + len = strlen(cmd); if (len == 1) { if (!strncmp(cmd, "1", len)) -- 2.7.4