Fixed new Svace issues 41/74041/3
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 10 Jun 2016 12:10:40 +0000 (15:10 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Fri, 10 Jun 2016 12:56:01 +0000 (15:56 +0300)
Change-Id: Ic21003e0441c3c24bd7e18a0c0d285e58158d2bb
Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>
lib-contacts/src/Contacts/Details/BasicInfoItem.cpp
lib-phone/src/Phone/Dialer/DialerView.cpp

index d1e76f9..9f513c6 100644 (file)
@@ -71,7 +71,7 @@ Elm_Genlist_Item_Class *BasicInfoItem::getItemClass() const
 char *BasicInfoItem::getText(Evas_Object *parent, const char *part)
 {
        if (strcmp(part, PART_NAME) == 0) {
-               return strdup(m_Name.getValue());
+               return Utils::safeDup(m_Name.getValue());
        } else if (strcmp(part, PART_PHONETIC_NAME) == 0) {
                return strdup(m_PhoneticName.getValue().c_str());
        } else if (strcmp(part, PART_COMPANY) == 0) {
index 61af3b1..313d96d 100644 (file)
@@ -105,6 +105,9 @@ void DialerView::onPageAttached(Ui::NavigatorPage *page)
 void DialerView::onNavigation(bool isCurrentView)
 {
        Evas_Object *conf = findParent<Ui::Window>()->getConformant();
+       if (!conf) {
+               return;
+       }
        if (isCurrentView) {
                elm_object_signal_emit(conf, "elm,state,virtualkeypad,disable", "");
                elm_object_signal_emit(conf, "elm,state,clipboard,disable", "");