From: JinWang An Date: Wed, 17 Jun 2020 12:40:01 +0000 (+0900) Subject: Add deinitialize of sqlite3 and rand_r() X-Git-Tag: submit/tizen/20200618.140547^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8aa739bc689581ee73d922537faf87f92b76d2d;p=platform%2Fcore%2Fapi%2Fsystem-settings.git Add deinitialize of sqlite3 and rand_r() Change-Id: Ifbecefe45d72686adef70f0b019a2d8d3b6e51fc Signed-off-by: JinWang An --- diff --git a/tests/mocks/vconf.cpp b/tests/mocks/vconf.cpp index ba15569..a8a7cd0 100644 --- a/tests/mocks/vconf.cpp +++ b/tests/mocks/vconf.cpp @@ -360,8 +360,10 @@ static int _vconf_set_str(const char *in_key, const char *strval) _sqlite_close(); return VCONF_ERROR; } + sqlite3_finalize(stmt); } #endif + _sqlite_close(); return VCONF_OK; } @@ -499,9 +501,17 @@ API char *vconf_get_str(const char *in_key) sqlite3_column_text(stmt, 2)); str = (char*)malloc(MAX_BUF_LEN + 1); + if (NULL == str) { + ERR("malloc(%d) Fail()", MAX_BUF_LEN + 1); + sqlite3_finalize(stmt); + _sqlite_close(); + return NULL; + } + strncpy(str, (char*)sqlite3_column_text(stmt, 2), MAX_BUF_LEN); sqlite3_finalize(stmt); + _sqlite_close(); DBG("vconf get: key[%s], value[%s]", in_key, str); return str; diff --git a/tests/sstt_test.c b/tests/sstt_test.c index be937e9..f0fe221 100644 --- a/tests/sstt_test.c +++ b/tests/sstt_test.c @@ -2459,9 +2459,9 @@ RETTYPE utc_system_settings_set_value_int_p2(void) SYSTEM_SETTINGS_FONT_SIZE_GIANT }; - srand(time(NULL)); + unsigned int next_val = time(NULL); int size = sizeof(arr) / sizeof(arr[0]); - int sel = rand() % size; + int sel = rand_r(&next_val) % size; /* backup */ ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &backup);