Prevent Issue

[Issue#] 35100, 29696, 28548, 23973
[Problem]
[Cause] N/A
[Solution] 1. strdup dereference issue : 35100, 29696, 23979
2. wrong value issue : 28548

Change-Id: I3d936290221dda1d0b1d97561188ec73e87e6f1d

diff --git a/webapp-common/listview.cpp b/webapp-common/listview.cpp
index fd7751d..5cb7e9e 100755 (executable)
--- a/webapp-common/listview.cpp
+++ b/webapp-common/listview.cpp
@@ -64,8 +64,9 @@ char *ListView::getText(void *data,
         str = onOffData->m_title.c_str();
     else if (!strcmp(part, "elm.text.1"))
         str = onOffData->m_title.c_str();
-    else
-        str = NULL;
+    else {
+        return NULL;
+    }
     return strdup(str);
 }
 
@@ -907,8 +908,10 @@ void ListView::addComplianceModeItem(Evas_Object *gl)
                                      ELM_GENLIST_ITEM_NONE,
                                      onComplianceModeClicked,
                                      static_cast<void *>(compModeData));
-        if (!it)
+        if (!it) {
             delete compModeData;
+            return;
+        }
 
         if (WrtDB::GlobalDAOReadOnly::getComplianceMode())
             addComplianceModeOpts(gl, it);

diff --git a/webapp-detail/detailview.cpp b/webapp-detail/detailview.cpp
index c3df569..d033d9d 100644 (file)
--- a/webapp-detail/detailview.cpp
+++ b/webapp-detail/detailview.cpp
@@ -492,7 +492,7 @@ void DetailView::_mouse_up_license(void *data,
             "clicked",
             viewlicenseCallback,
             (void *)popup);
-    evas_object_show(r_button);
+    evas_object_show(l_button);
 
     r_button = elm_button_add(popup);
     if (!r_button) {
@@ -508,7 +508,7 @@ void DetailView::_mouse_up_license(void *data,
             "clicked",
             closeCallback,
             (void *)popup);
-    evas_object_show(l_button);
+    evas_object_show(r_button);
     elm_object_focus_allow_set(popup, EINA_TRUE);
     elm_object_focus_set(popup, EINA_TRUE);
 }
@@ -679,7 +679,7 @@ char *DetailView::getText(void *data,
     else if(!strcmp(part, "elm.text.2"))
         str = detailData->m_title.c_str();
     else
-        str = NULL;
+        return NULL;
     return strdup(str);
 }