Merge "Merge branch '1.3-rel' (5a1209c)"
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tue, 5 Dec 2017 16:25:01 +0000 (16:25 +0000)
committerNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tue, 5 Dec 2017 16:25:01 +0000 (16:25 +0000)
resource/csdk/security/provisioning/sample/cloud/cloudWrapper.c
resource/csdk/security/tool/SConscript
resource/provisioning/examples/cloudWrapper.cpp

index 4b6b5bb..7257153 100644 (file)
@@ -317,6 +317,10 @@ bool readFile(const char *name, OCByteString *out)
     result = true;
 exit:
     fclose(file);
+    if (buffer) 
+    {
+        free(buffer);
+    }
     return result;
 }
 
index b89f3e2..247393d 100644 (file)
@@ -118,5 +118,7 @@ svrdbeditor_src = [
     SVRDBEDITOR_DIR + 'svrdbeditor.c'
 ]
 svrdbeditor = tools_env.Program("svrdbeditor", svrdbeditor_src)
-Alias("securitytool", [json2cbor, svrdbeditor])
-tools_env.AppendTarget('securitytool')
+securitytools = [json2cbor, svrdbeditor]
+Alias("securitytools", securitytools)
+tools_env.AppendTarget('securitytools')
+tools_env.UserInstallTargetExtra(securitytools)
index 7fc8f5c..44f3de4 100644 (file)
@@ -271,6 +271,7 @@ static int ReadFile(const char *name, OCByteString *crl)
     result = 0;
 exit:
     fclose(file);
+    OICFree(buffer);
     return 0;
 }