Fix defects detected by static analysis tool

Change-Id: I79295aa1797081a050efdd1bcd42cdc30ec18c20

diff --git a/assistant-parser/src/ma_assistant_parser.c b/assistant-parser/src/ma_assistant_parser.c
index b9a7ab463b154fe0793bfa40339d1393b89bdc9c..258b79f13a0ed93428b7ccec99004c9d690f1d48 100644 (file)
--- a/assistant-parser/src/ma_assistant_parser.c
+++ b/assistant-parser/src/ma_assistant_parser.c
@@ -105,7 +105,7 @@ static int __save_assistant_info_xml(const char *pkgid, gchar *ut, uid_t uid, gi
        char *dir_assistant_base = NULL;
        char *dir_assistant_info = NULL;
 
-       if (NULL == ut || (NULL != ut && 0 == strncmp(ut, "none", strlen("none")))) {
+       if (NULL == ut || (NULL != ut && 0 == strncmp(ut, "none", strlen("none") + 1))) {
                LOGE("[ERROR] Usertype is NONE");
                return -1;
        }
@@ -454,43 +454,43 @@ static int __write_metadata_inxml(const char *pkgid, const char *appid, GList *l
                md = (metadata *)iter->data;
                if (NULL != md && NULL != md->key && NULL != md->value) {
                        LOGD(" - key(%s) value(%s)", md->key, md->value);
-                       if (!strncmp(md->key, MA_METADATA_LANGUAGE, strlen(MA_METADATA_LANGUAGE))) {
+                       if (!strncmp(md->key, MA_METADATA_LANGUAGE, strlen(MA_METADATA_LANGUAGE) + 1)) {
                                __insert_language_from_metadata(root, md->value);
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_WAKEUP_WORD, strlen(MA_METADATA_ASSISTANT_WAKEUP_WORD))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_WAKEUP_WORD, strlen(MA_METADATA_ASSISTANT_WAKEUP_WORD) + 1)) {
                                __insert_wakeup_word_from_metadata(root, md->value);
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_ICON_PATH, strlen(MA_METADATA_ASSISTANT_ICON_PATH))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_ICON_PATH, strlen(MA_METADATA_ASSISTANT_ICON_PATH) + 1)) {
                                cur = xmlNewNode(NULL, (const xmlChar*)MA_TAG_ASSISTANT_ICON_PATH);
                                if (cur) {
                                        xmlNodeSetContent(cur, (const xmlChar*)md->value);
                                        xmlAddChild(root, cur);
                                }
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_NAME, strlen(MA_METADATA_ASSISTANT_NAME))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_NAME, strlen(MA_METADATA_ASSISTANT_NAME) + 1)) {
                                cur = xmlNewNode(NULL, (const xmlChar*)MA_TAG_ASSISTANT_NAME);
                                if (cur) {
                                        xmlNodeSetContent(cur, (const xmlChar*)md->value);
                                        xmlAddChild(root, cur);
                                }
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_WAKEUP_ENGINE_APPID, strlen(MA_METADATA_ASSISTANT_WAKEUP_ENGINE_APPID))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_WAKEUP_ENGINE_APPID, strlen(MA_METADATA_ASSISTANT_WAKEUP_ENGINE_APPID) + 1)) {
                                __insert_wakeup_engine_from_metadata(root, md->value);
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_CUSTOM_UI, strlen(MA_METADATA_ASSISTANT_CUSTOM_UI))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_CUSTOM_UI, strlen(MA_METADATA_ASSISTANT_CUSTOM_UI) + 1)) {
                                cur = xmlNewNode(NULL, (const xmlChar*)MA_TAG_ASSISTANT_CUSTOM_UI);
                                if (cur) {
                                        xmlNodeSetContent(cur, (const xmlChar*)md->value);
                                        xmlAddChild(root, cur);
                                }
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_VOICE_KEY_SUPPORT_MODE, strlen(MA_METADATA_ASSISTANT_VOICE_KEY_SUPPORT_MODE))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_VOICE_KEY_SUPPORT_MODE, strlen(MA_METADATA_ASSISTANT_VOICE_KEY_SUPPORT_MODE) + 1)) {
                                cur = xmlNewNode(NULL, (const xmlChar*)MA_TAG_ASSISTANT_VOICE_KEY_SUPPORT_MODE);
                                if (cur) {
                                        xmlNodeSetContent(cur, (const xmlChar*)md->value);
                                        xmlAddChild(root, cur);
                                }
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_VOICE_KEY_TAP_DURATION, strlen(MA_METADATA_ASSISTANT_VOICE_KEY_TAP_DURATION))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_VOICE_KEY_TAP_DURATION, strlen(MA_METADATA_ASSISTANT_VOICE_KEY_TAP_DURATION) + 1)) {
                                cur = xmlNewNode(NULL, (const xmlChar*)MA_TAG_ASSISTANT_VOICE_KEY_TAP_DURATION);
                                if (cur) {
                                        xmlNodeSetContent(cur, (const xmlChar*)md->value);
                                        xmlAddChild(root, cur);
                                }
-                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_AUDIO_DATA_PROCESSOR, strlen(MA_METADATA_ASSISTANT_AUDIO_DATA_PROCESSOR))) {
+                       } else if (!strncmp(md->key, MA_METADATA_ASSISTANT_AUDIO_DATA_PROCESSOR, strlen(MA_METADATA_ASSISTANT_AUDIO_DATA_PROCESSOR) + 1)) {
                                cur = xmlNewNode(NULL, (const xmlChar*)MA_TAG_ASSISTANT_AUDIO_DATA_PROCESSOR);
                                if (cur) {
                                        xmlNodeSetContent(cur, (const xmlChar*)md->value);