Fix defects detected by static analysis tool

Change-Id: If49622bd1d0bf113c2cd9d7c750bcbef21b0aa41

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index 005fb697957239002ab57f1bbf7493d6440f750b..04f14d035dd2a185f0ae9e6dc358c70311a54d50 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -743,7 +743,7 @@ static Evas_Object* get_candidate (const String& str, Evas_Object *parent, int *
                     if (candidate_is_long)
                         break;
                     tokenize_result = tokenize_tag (sub_splited_string [j], &image_data);
-                    if (tokenize_result && _candidate_image_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE) {
+                    if (tokenize_result && _candidate_image_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE && _candidate_text_count < SCIM_LOOKUP_TABLE_MAX_PAGESIZE) {
                         _candidate_image [_candidate_image_count] = elm_image_add (parent);
                         snprintf (image_key, sizeof (image_key), "%d",_candidate_image_count);
                         elm_image_file_set (_candidate_image [_candidate_image_count], image_data.path.c_str (), image_key);

diff --git a/ism/src/ltdl.cpp b/ism/src/ltdl.cpp
index ce88fc3a59d855045c1fa3bbd68536a42b38b793..da4aa4920d5fa2e3f878d4c0f158aef884d06b3a 100644 (file)
--- a/ism/src/ltdl.cpp
+++ b/ism/src/ltdl.cpp
@@ -2637,6 +2637,7 @@ foreach_dirinpath (
       {
         if (filename[lendir -1] != '/')
           filename[lendir++] = '/';
+
         strncpy (filename + lendir, base_name, filenamesize - lendir);
       }
 

diff --git a/ism/src/scim_socket.cpp b/ism/src/scim_socket.cpp
index 30cfde7120b7d4e00ebea5df5d4b86407456d89f..f0aa9a0677fc663195d2eb7a08a172352cca7c95 100644 (file)
--- a/ism/src/scim_socket.cpp
+++ b/ism/src/scim_socket.cpp
@@ -656,7 +656,8 @@ public:
 
         if (ret < 0 && addrlen > 0)
             m_err = errno;
-        else {
+
+        if (ret >= 0) {
             int flag = fcntl (ret, F_GETFD, 0);
             fcntl (ret, F_SETFD, flag|FD_CLOEXEC);
         }