From 30ab002e661467c24a530027218059f56614589d Mon Sep 17 00:00:00 2001 From: Duyoung Jang Date: Mon, 6 May 2013 14:25:46 +0900 Subject: [PATCH] Fix prevent issue Change-Id: I149dbea58df07941290e07c48e778b2f69e71fc8 Signed-off-by: Duyoung Jang --- inc/InstallerDefs.h | 2 +- src/Manager/SmackManager.cpp | 13 +++++++------ src/Util/InstallerUtil.cpp | 6 +++--- src/XmlHandler/XmlWriter.cpp | 8 ++++++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index e929df3..ee53e68 100755 --- a/inc/InstallerDefs.h +++ b/inc/InstallerDefs.h @@ -23,7 +23,7 @@ #include "InstallerUtil.h" -#define OSP_INSTALLER_VERSION "version=[20130503.3]" +#define OSP_INSTALLER_VERSION "version=[20130506.1]" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" diff --git a/src/Manager/SmackManager.cpp b/src/Manager/SmackManager.cpp index 91d6453..ad7de45 100755 --- a/src/Manager/SmackManager.cpp +++ b/src/Manager/SmackManager.cpp @@ -369,10 +369,11 @@ SmackManager::EnablePermissions(const PackageId& packageId) if (pPrivilege) { char* pPrivilegeString = _StringConverter::CopyToCharArrayN(*pPrivilege); - TryReturn(pPrivilegeString, false, "pPrivilegeString is null."); - - pList[i] = pPrivilegeString; - AppLog("Privilege - [%s]", pList[i]); + if (pPrivilegeString) + { + pList[i] = pPrivilegeString; + AppLog("Privilege - [%s]", pList[i]); + } } } @@ -387,6 +388,8 @@ SmackManager::EnablePermissions(const PackageId& packageId) delete[] pList; } + return true; + #if 0 if ((__pContext->__isPreloaded == true) && (__pContext->__isUpdated == false)) { @@ -420,8 +423,6 @@ SmackManager::EnablePermissions(const PackageId& packageId) } } #endif - - return true; } bool diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp index 80fdefa..4ab1f92 100755 --- a/src/Util/InstallerUtil.cpp +++ b/src/Util/InstallerUtil.cpp @@ -465,13 +465,13 @@ InstallerUtil::CreateInfoFile(const String& filePath, const String* pContext) bool InstallerUtil::DumpLog(const char* pBuf) { - char temp[4096] = {0}; TryReturn(pBuf, false, "pBuf is null"); + char temp[4096] = {0}; int bufLen = strlen(pBuf); - strncpy(temp, pBuf, sizeof(temp)); + strncpy(temp, pBuf, sizeof(temp)-1); - char *pStart = &temp[0]; + char* pStart = &temp[0]; for (int i = 0; i < bufLen; i++) { diff --git a/src/XmlHandler/XmlWriter.cpp b/src/XmlHandler/XmlWriter.cpp index a534f6f..85a49c7 100755 --- a/src/XmlHandler/XmlWriter.cpp +++ b/src/XmlHandler/XmlWriter.cpp @@ -194,7 +194,11 @@ XmlWriter::WriteString(const Tizen::Base::String& content) bool XmlWriter::EndElement(void) { - xmlTextWriterEndElement(__pXmlWriter); + int err = xmlTextWriterEndElement(__pXmlWriter); + if (err == -1) + { + AppLog("xmlTextWriterEndElement() failed. [%d]", err); + } + return true; } - -- 2.7.4