Fix prevent issue
authorDuyoung Jang <duyoung.jang@samsung.com>
Mon, 6 May 2013 05:25:46 +0000 (14:25 +0900)
committerDuyoung Jang <duyoung.jang@samsung.com>
Mon, 6 May 2013 05:25:46 +0000 (14:25 +0900)
Change-Id: I149dbea58df07941290e07c48e778b2f69e71fc8
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>
inc/InstallerDefs.h
src/Manager/SmackManager.cpp
src/Util/InstallerUtil.cpp
src/XmlHandler/XmlWriter.cpp

index e929df3..ee53e68 100755 (executable)
@@ -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"
index 91d6453..ad7de45 100755 (executable)
@@ -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
index 80fdefa..4ab1f92 100755 (executable)
@@ -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];
+       charpStart = &temp[0];
 
        for (int i = 0; i < bufLen; i++)
        {
index a534f6f..85a49c7 100755 (executable)
@@ -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;
 }
-