From 488e2a89b9e2cddff62f9489d1d3a1f00f30be0c Mon Sep 17 00:00:00 2001 From: Aleksandr Sapozhnik Date: Fri, 10 Jun 2016 15:10:40 +0300 Subject: [PATCH] Fixed new Svace issues Change-Id: Ic21003e0441c3c24bd7e18a0c0d285e58158d2bb Signed-off-by: Aleksandr Sapozhnik --- lib-contacts/src/Contacts/Details/BasicInfoItem.cpp | 2 +- lib-phone/src/Phone/Dialer/DialerView.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib-contacts/src/Contacts/Details/BasicInfoItem.cpp b/lib-contacts/src/Contacts/Details/BasicInfoItem.cpp index d1e76f9..9f513c6 100644 --- a/lib-contacts/src/Contacts/Details/BasicInfoItem.cpp +++ b/lib-contacts/src/Contacts/Details/BasicInfoItem.cpp @@ -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) { diff --git a/lib-phone/src/Phone/Dialer/DialerView.cpp b/lib-phone/src/Phone/Dialer/DialerView.cpp index 61af3b1..313d96d 100644 --- a/lib-phone/src/Phone/Dialer/DialerView.cpp +++ b/lib-phone/src/Phone/Dialer/DialerView.cpp @@ -105,6 +105,9 @@ void DialerView::onPageAttached(Ui::NavigatorPage *page) void DialerView::onNavigation(bool isCurrentView) { Evas_Object *conf = findParent()->getConformant(); + if (!conf) { + return; + } if (isCurrentView) { elm_object_signal_emit(conf, "elm,state,virtualkeypad,disable", ""); elm_object_signal_emit(conf, "elm,state,clipboard,disable", ""); -- 2.7.4