Fix prevent issue
authorDuyoung Jang <duyoung.jang@samsung.com>
Fri, 12 Apr 2013 05:07:15 +0000 (14:07 +0900)
committerDuyoung Jang <duyoung.jang@samsung.com>
Fri, 12 Apr 2013 05:07:15 +0000 (14:07 +0900)
Change-Id: I456a6c6826ed542c7d60146a6ebd66f126a66dce
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>
inc/InstallerDefs.h
src/Util/InstallerUtil.cpp
src/backend/backend.cpp

index b22ec6e..dd82ea7 100755 (executable)
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130411.1]"
+#define OSP_INSTALLER_VERSION "version=[20130412.1]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"
index b47e175..7b6ec33 100755 (executable)
@@ -837,7 +837,8 @@ InstallerUtil::GetFileDigest(const String& filePath, String& digestValue)
                if (readBytes > 0)
                {
                        ByteBuffer buffer;
-                       buffer.Construct((const byte*)pBuf.get(), 0, readBytes, bufSize);
+                       r = buffer.Construct((const byte*)pBuf.get(), 0, readBytes, bufSize);
+                       TryReturn(!IsFailed(r), false, "buffer.Construct() is failed.");
 
                        r = pHash->Update(buffer);
                        TryReturn(!IsFailed(r), false, "pHash->Update() is failed.");
index 176f76f..dc9bb96 100755 (executable)
@@ -62,11 +62,14 @@ main(int argc, char **argv)
        for (int i = 0; i < argc; i++)
        {
                const char* pStr = argv[i];
-               String cmd(pStr);
-               buf.Append(cmd);
-               if (i != argc - 1)
+               if (pStr)
                {
-                       buf.Append(" ");
+                       String cmd(pStr);
+                       buf.Append(cmd);
+                       if (i != argc - 1)
+                       {
+                               buf.Append(" ");
+                       }
                }
        }