Merge pull request #1 from bcmi-labs/hotfix/memoryleak

Fixed memory leak in CborArray, fixed ssize_t, #define CBOR_INT_T int

Author: facchinm

ArduinoCloudThing.cpp

@@ -49,7 +49,7 @@ void ArduinoCloudThing::begin() {
 
 int ArduinoCloudThing::publish(CborArray& object, uint8_t* data) {
 
-    size_t size = object.encode(data, sizeof(data));
+    ssize_t size = object.encode(data, sizeof(data));
 
 #ifdef TESTING_PROTOCOL
     decode(data, size);

lib/ArduinoCbor/src/ArduinoCbor.h

@@ -6,7 +6,7 @@
 #include "cn-cbor/cn-cbor.h"
 
 #ifndef CBOR_INT_T
-#define CBOR_INT_T long
+#define CBOR_INT_T int
 #endif
 
 class CborArray;

lib/ArduinoCbor/src/CborArray.cpp

@@ -13,6 +13,14 @@ CborArray::CborArray(CborBuffer& buffer, cn_cbor* raw) : buffer(buffer) {
   }
 }
 
+CborArray::~CborArray() {
+  //Fixed memory leak
+   if (!raw->parent) {
+    cn_cbor_free(this->raw, &buffer.context);
+  }
+  
+}
+
 CborVariant CborArray::get(int index) {
   return CborVariant(buffer, cn_cbor_index(raw, index));
 }
@@ -31,6 +39,6 @@ void CborArray::add(CBOR_INT_T value) {
   add(CborVariant(buffer, value));
 }
 
-size_t CborArray::encode(uint8_t* data, size_t size) {
+ssize_t CborArray::encode(uint8_t* data, size_t size) {
   return cn_cbor_encoder_write(data, 0, size, raw);
 }

lib/ArduinoCbor/src/CborArray.h

@@ -8,14 +8,15 @@ class CborArray {
 
  public:
   CborArray(CborBuffer& buffer, cn_cbor* raw=0);
+  ~CborArray();
 
   CborVariant get(int index);
 
   void add(CborVariant value);
   void add(const char* value);
   void add(CBOR_INT_T value);
 
-  size_t encode(uint8_t* data, size_t size);
+  ssize_t encode(uint8_t* data, size_t size);
 
  protected:
   CborBuffer& buffer;