From e55c4050c83d56c5a1fe0de1342a6d7282dc2473 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Wed, 12 May 2021 08:45:33 +0900 Subject: [PATCH] Add to check input value getting API Change-Id: I449951a7cce5132f92b89709c5da58d5f9fe2ba1 Signed-off-by: JinWang An --- src/sst_api.c | 29 +++++++++++++++++++++++------ tests/sst_gtest_normal_api.cpp | 7 +++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/sst_api.c b/src/sst_api.c index a4bd2a4..eda23cd 100644 --- a/src/sst_api.c +++ b/src/sst_api.c @@ -31,7 +31,7 @@ API int system_settings_set_value_int(system_settings_key_e key, int value) } if (SYSTEM_SETTING_DATA_TYPE_INT != iface->data_type) { - ERR("Invalide type for key(%d) : %d", key, iface->data_type); + ERR("Invalid type for key(%d) : %d", key, iface->data_type); return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; } @@ -53,6 +53,12 @@ API int system_settings_get_value_int(system_settings_key_e key, int *value) { int ret; sst_interface *iface = NULL; + + if (NULL == value) { + ERR("Invalid input parameter value == NULL"); + return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; + } + ret = sst_get_interface(key, &iface); if (SYSTEM_SETTINGS_ERROR_NONE != ret) { ERR("sst_get_interface(%d) Fail(%d)", key, ret); @@ -60,7 +66,7 @@ API int system_settings_get_value_int(system_settings_key_e key, int *value) } if (SYSTEM_SETTING_DATA_TYPE_INT != iface->data_type) { - ERR("Invalide type for key(%d) : %d", key, iface->data_type); + ERR("Invalid type for key(%d) : %d", key, iface->data_type); return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; } @@ -91,7 +97,7 @@ API int system_settings_set_value_bool(system_settings_key_e key, bool value) } if (SYSTEM_SETTING_DATA_TYPE_BOOL != iface->data_type) { - ERR("Invalide type for key(%d) : %d", key, iface->data_type); + ERR("Invalid type for key(%d) : %d", key, iface->data_type); return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; } @@ -113,6 +119,12 @@ API int system_settings_get_value_bool(system_settings_key_e key, bool *value) { int ret; sst_interface *iface = NULL; + + if (NULL == value) { + ERR("Invalid input parameter value == NULL"); + return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; + } + ret = sst_get_interface(key, &iface); if (SYSTEM_SETTINGS_ERROR_NONE != ret) { ERR("sst_get_interface(%d) Fail(%d)", key, ret); @@ -120,7 +132,7 @@ API int system_settings_get_value_bool(system_settings_key_e key, bool *value) } if (SYSTEM_SETTING_DATA_TYPE_BOOL != iface->data_type) { - ERR("Invalide type for key(%d) : %d", key, iface->data_type); + ERR("Invalid type for key(%d) : %d", key, iface->data_type); return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; } @@ -151,7 +163,7 @@ API int system_settings_set_value_string(system_settings_key_e key, const char * } if (SYSTEM_SETTING_DATA_TYPE_STRING != iface->data_type) { - ERR("Invalide type for key(%d) : %d", key, iface->data_type); + ERR("Invalid type for key(%d) : %d", key, iface->data_type); return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; } @@ -173,6 +185,11 @@ API int system_settings_get_value_string(system_settings_key_e key, char **value { int ret; sst_interface *iface = NULL; + if (NULL == value) { + ERR("Invalid input parameter value == NULL"); + return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; + } + ret = sst_get_interface(key, &iface); if (SYSTEM_SETTINGS_ERROR_NONE != ret) { ERR("sst_get_interface(%d) Fail(%d)", key, ret); @@ -180,7 +197,7 @@ API int system_settings_get_value_string(system_settings_key_e key, char **value } if (SYSTEM_SETTING_DATA_TYPE_STRING != iface->data_type) { - ERR("Invalide type for key(%d) : %d", key, iface->data_type); + ERR("Invalid type for key(%d) : %d", key, iface->data_type); return SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; } diff --git a/tests/sst_gtest_normal_api.cpp b/tests/sst_gtest_normal_api.cpp index 15244c6..7b5904a 100644 --- a/tests/sst_gtest_normal_api.cpp +++ b/tests/sst_gtest_normal_api.cpp @@ -134,6 +134,9 @@ TEST(SstApiTest, getValueInt) int ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &val); EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret); + ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, NULL); + EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret); + ret = system_settings_get_value_int((system_settings_key_e)SST_DEPRECATED_KEY, &val); EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret); @@ -169,6 +172,8 @@ TEST(SstApiTest, getValueBool) int ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_MOTION_ACTIVATION, &val); EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret); + ret = system_settings_get_value_bool((system_settings_key_e)SST_DEPRECATED_KEY, NULL); + EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret); ret = system_settings_get_value_bool((system_settings_key_e)SST_DEPRECATED_KEY, &val); EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret); ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &val); @@ -202,6 +207,8 @@ TEST(SstApiTest, getValueString) EXPECT_EQ(SYSTEM_SETTINGS_ERROR_NONE, ret); free(val); + ret = system_settings_get_value_string((system_settings_key_e)SST_DEPRECATED_KEY, NULL); + EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret); ret = system_settings_get_value_string((system_settings_key_e)SST_DEPRECATED_KEY, &val); EXPECT_EQ(SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER, ret); ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_SCREEN_BACKLIGHT_TIME, &val); -- 2.34.1