From 5961e711666876c960a32aaeef41ab10adb3dd4e Mon Sep 17 00:00:00 2001 From: Jeesun Kim Date: Wed, 28 Dec 2016 16:40:04 +0900 Subject: [PATCH] remove invalid error message Change-Id: I40291fa71bd2b0019557d92ccd7a8bf3811d2408 --- server/ctsvc_utils_string.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/server/ctsvc_utils_string.c b/server/ctsvc_utils_string.c index 2245134..db0c9c2 100644 --- a/server/ctsvc_utils_string.c +++ b/server/ctsvc_utils_string.c @@ -494,10 +494,8 @@ static char *_strchr_with_nth(char *end_pointer, char *s, char *delimiters, int int len_delimiters = strlen(delimiters); while (*cursor) { - if (end_pointer <= cursor) { - ERR("over end"); + if (end_pointer <= cursor) return end_pointer; - } for (i = 0; i < len_delimiters; i++) { if (*cursor == delimiters[i]) { nth--; @@ -522,12 +520,8 @@ static char *_strrchr_with_nth(char *start_pointer, char *s, char *delimiters, i int len_delimiters = strlen(delimiters); while (*cursor) { - if (cursor <= start_pointer) { - /* LCOV_EXCL_START */ - ERR("over start"); + if (cursor <= start_pointer) return start_pointer; - /* LCOV_EXCL_STOP */ - } for (i = 0; i < len_delimiters; i++) { if (*cursor == delimiters[i]) { nth--; @@ -632,7 +626,7 @@ char *ctsvc_utils_get_modified_str(char *temp, bool is_snippet, const char *keyw cursor = _strchr_with_nth(mod_temp + len_full, keyword_start, " \n", token_number); *cursor = '\0'; cursor = _strrchr_with_nth(mod_temp, keyword_start, " \n", token_number); - memcpy(mod_temp, cursor, len_full); + strncpy(mod_temp, cursor, len_full); return mod_temp; } -- 2.7.4