RC3 svace fix (cloudClient + crlresource.c)

Change-Id: Ic6093286d89daf6de10ed617c445fbc53d8a3bd1
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13029

diff --git a/resource/csdk/security/provisioning/sample/cloud/cloudCommon.c b/resource/csdk/security/provisioning/sample/cloud/cloudCommon.c
index 27403f188b5dfbd7bda0335d8e3782dd4006a3cf..32ae4041c10d7a81a925df9bb6b2f643e1376620 100644 (file)
--- a/resource/csdk/security/provisioning/sample/cloud/cloudCommon.c
+++ b/resource/csdk/security/provisioning/sample/cloud/cloudCommon.c
@@ -340,12 +340,15 @@ static OCStackResult saveTrustCert(void)
 
     res = OCSaveTrustCertChain(trustCertChainArray.data, trustCertChainArray.len, OIC_ENCODING_PEM,&g_credId);
 
-    if(OC_STACK_OK != res)
+    if (OC_STACK_OK != res)
     {
-        OIC_LOG(ERROR, TAG, "OCSaveTrustCertChainBin API error");
-        return res;
+        OIC_LOG(ERROR, TAG, "OCSaveTrustCertChain API error");
+    }
+    else
+    {
+        OIC_LOG_V(INFO, TAG, "CredId of Saved Trust Cert. Chain into Cred of SVR : %d.\n", g_credId);
     }
-    OIC_LOG_V(INFO, TAG, "CredId of Saved Trust Cert. Chain into Cred of SVR : %d.\n", g_credId);
+    OICFree(trustCertChainArray.data);
 
     return res;
 }

diff --git a/resource/csdk/security/src/crlresource.c b/resource/csdk/security/src/crlresource.c
index 46a82fb889bd06bb9704a4297dbc3f15997c107d..12d4f0b5507ec28a60e9846ee40890e09fdaf4fd 100644 (file)
--- a/resource/csdk/security/src/crlresource.c
+++ b/resource/csdk/security/src/crlresource.c
@@ -458,11 +458,16 @@ static void getCurrentUTCTime(char *out, size_t len)
 {
     //TODO: how to implement it in cross-platform way?
     time_t rawtime;
-    struct tm * timeinfo;
+    struct tm * timeinfo = NULL;
 
     time ( &rawtime );
     timeinfo = localtime ( &rawtime );
 
+    if (NULL == timeinfo)
+    {
+        return;
+    }
+
     snprintf(out, len, "%04d%02d%02d%02d%02d%02d",
             timeinfo->tm_year + 1900, timeinfo->tm_mon + 1, timeinfo->tm_mday,
             timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);