[Tizen 6.0] Enable build with GCC 9.2

Change-Id: Iaf302e3c6ea05207b5f71c10b9c7207528753c7d

diff --git a/common/cryptoutil/src/AsmCrypto.cpp b/common/cryptoutil/src/AsmCrypto.cpp
index ee1c601..5281cbf 100644 (file)
--- a/common/cryptoutil/src/AsmCrypto.cpp
+++ b/common/cryptoutil/src/AsmCrypto.cpp
@@ -16,7 +16,6 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include <openssl/bio.h>
 #include <openssl/aes.h>
 #include <bluetooth.h>
 #include <stdio.h>
@@ -187,6 +186,7 @@ AsmCrypto::getAsmToken(void)
                snprintf(mac, 128 - 1, "%d", (AsmCrypto::genRandomInt()%1000 + 1));
 
                char *macClone = _SAFE_DUP(mac);
+               if(macClone)
                _INFO("%s", macClone);
                std::string macStr(macClone);
                _INFO("%s", macStr.c_str());

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index ccfcb45..721b36c 100755 (executable)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -34,7 +34,7 @@ FOREACH(flag ${SERVICE_PKGS_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE -Wno-stringop-truncation")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
 SET(PKGS_LDFLAGS "${SERVICE_PKGS_LDFLAGS} -pie")
 

diff --git a/server/src/AsmStorage.cpp b/server/src/AsmStorage.cpp
index 41aa1ee..59c8370 100755 (executable)
--- a/server/src/AsmStorage.cpp
+++ b/server/src/AsmStorage.cpp
@@ -493,8 +493,8 @@ AsmStorage::insertData(IStorageParcel *parcel)
                gettimeofday(&curTime, NULL);
                int milli = curTime.tv_usec/1000;
 
-               char currentTime[BUFFLEN] = "";
-               snprintf(currentTime, BUFFLEN, "%s:%d", buf, milli);
+               char currentTime[BUFFLEN + 1 + 2*sizeof(milli)] = "";
+               snprintf(currentTime, BUFFLEN + 1 + 2*sizeof(milli), "%s:%d", buf, milli);
 
                const std::string& ts = currentTime;