From b83417401223d3b208eeb6b449799e25cc53783c Mon Sep 17 00:00:00 2001 From: shivakumar jagalur matt Date: Thu, 25 Apr 2013 16:43:38 +0530 Subject: [PATCH] Fix for Double free error check in FMessaging Change-Id: Id7d3deea639b48f32a566584f84c33682ec0ae75 Signed-off-by: shivakumar jagalur matt --- src/FMsg_WapPushManagerImpl.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/FMsg_WapPushManagerImpl.cpp b/src/FMsg_WapPushManagerImpl.cpp index b50aa1a..0e5afd6 100644 --- a/src/FMsg_WapPushManagerImpl.cpp +++ b/src/FMsg_WapPushManagerImpl.cpp @@ -264,6 +264,7 @@ _WapPushManagerImpl::UnregisterCondition(const Tizen::Base::String& wapApplicati msg_set_str_value(pushInfo, MSG_PUSH_CONFIG_APPLICATON_ID_STR, pWapAppId, MAX_WAPPUSH_ID_LEN); msg_set_str_value(pushInfo, MSG_PUSH_CONFIG_PACKAGE_NAME_STR, pPkgName, MSG_FILEPATH_LEN_MAX); free(pPkgName); + pPkgName = null; err = msg_delete_push_event(__msgHandle, pushInfo); msg_release_struct(&pushInfo); @@ -285,8 +286,17 @@ _WapPushManagerImpl::UnregisterCondition(const Tizen::Base::String& wapApplicati return r; CATCH: - free(pPkgName); - msg_release_struct(&pushInfo); + if (pPkgName) + { + free(pPkgName); + pPkgName = null; + } + + if (pushInfo) + { + msg_release_struct(&pushInfo); + pushInfo = null; + } if (pWapAppId) { -- 2.7.4