Fix the build errors

Author: sgbihu

libraries/BLE/src/BLECharacteristic.cpp

@@ -94,42 +94,38 @@ BLECharacteristic& BLECharacteristic::operator= (const BLECharacteristic& rhs)
     return *this;
 }
 
-BLECharacteristic::BLECharacteristic(const BLECharacteristic& rhs)
-{
-    unsigned char *_value = (unsigned char*)malloc(rhs._value_size);
-    if (_value)
-    {
-        memcpy(_value, rhs._value, rhs._value_size);
-        _value_size = rhs._value_size;
-        memcpy(_uuid_cstr, rhs._uuid_cstr, sizeof(_uuid_cstr));
-        _properties = rhs._properties;
-        _event_handlers = rhs._event_handlers;
-        _internal = rhs._internal;
-        _bledev = BLEDevice(&rhs._bledev);
-    }
-}
-
-BLECharacteristic& BLECharacteristic::operator= (const BLECharacteristic& rhs)
+BLECharacteristic::BLECharacteristic(const BLECharacteristic& rhs):
+    _value(NULL),
+    _event_handlers(NULL)
 {
-    if (this != &rhs)
+    _chrc_local_imp = NULL; // Not copy
+    _value_size = rhs._value_size;
+    _internal = rhs._internal;
+    _bledev = BLEDevice(&rhs._bledev);
+    memcpy(_uuid_cstr, rhs._uuid_cstr, sizeof(_uuid_cstr));
+    _properties = rhs._properties;
+    
+    if (rhs._internal == NULL)
     {
-        if (_value)
+        if (rhs._value != NULL)
         {
-            free(_value);
+            _value = (unsigned char*)malloc(rhs._value_size);
+            if (NULL != _value)
+            {
+                memcpy(_value, rhs._value, rhs._value_size);
+            }
+            
         }
-        _value = (unsigned char*)malloc(rhs._value_size);
-        if (_value)
+        
+        if (rhs._event_handlers != NULL)
         {
-            memcpy(_value, rhs._value, rhs._value_size);
-            _value_size = rhs._value_size;
-            memcpy(_uuid_cstr, rhs._uuid_cstr, sizeof(_uuid_cstr));
-            _properties = rhs._properties;
-            _event_handlers = rhs._event_handlers;
-            _internal = rhs._internal;
-            _bledev = BLEDevice(&rhs._bledev);
+            _event_handlers = (BLECharacteristicEventHandler*)malloc(sizeof(BLECharacteristicEventHandler) * BLECharacteristicEventLast);
+            
+            if (NULL != _event_handlers)
+                memcpy(_event_handlers, rhs._event_handlers, (sizeof(BLECharacteristicEventHandler) * BLECharacteristicEventLast));
         }
     }
-    return *this;
+    //return *this;
 }
 
 BLECharacteristic::~BLECharacteristic()
@@ -194,6 +190,50 @@ BLECharacteristic::operator bool() const
     return (strlen(_uuid_cstr) > 3);
 }
 
+BLECharacteristic& BLECharacteristic::operator= (const BLECharacteristic& chrc)
+{
+    if (this != &chrc)
+    {
+        memcpy(_uuid_cstr, chrc._uuid_cstr, sizeof(_uuid_cstr));
+        _bledev.setAddress(*chrc._bledev.bt_le_address());
+        _internal = chrc._internal;
+        _chrc_local_imp = NULL; // Not copy
+        _properties = chrc._properties;
+        
+        if (_value_size < chrc._value_size)
+        {
+            _value_size = chrc._value_size;
+            if (NULL != _value)
+            {
+                free(_value);
+                _value = NULL;
+            }
+        }
+        
+        if (_internal == NULL)
+        {
+            if (chrc._value != NULL)
+            {
+                if (NULL == _value)
+                    _value = (unsigned char*) malloc(_value_size);
+                
+                if (NULL != _value)
+                    memcpy(_value, chrc._value, chrc._value_size);
+            }
+            
+            if (chrc._event_handlers != NULL)
+            {
+                if (NULL == _event_handlers)
+                    _event_handlers = (BLECharacteristicEventHandler*)malloc(sizeof(BLECharacteristicEventHandler) * BLECharacteristicEventLast);
+                
+                if (NULL != _event_handlers)
+                    memcpy(_event_handlers, chrc._event_handlers, (sizeof(BLECharacteristicEventHandler) * BLECharacteristicEventLast));
+            }
+            
+        }
+    }
+    return *this;
+}
 
 byte BLECharacteristic::operator[] (int offset) const
 {

libraries/BLE/src/BLECharacteristic.h

@@ -86,8 +86,6 @@ class BLECharacteristic: public BLEAttributeWithValue
 
     BLECharacteristic(const BLECharacteristic&);
 
-    BLECharacteristic& operator=(const BLECharacteristic&);
-
     virtual ~BLECharacteristic();
 
     /**

libraries/BLE/src/BLEDescriptor.cpp

@@ -84,18 +84,25 @@ BLEDescriptor& BLEDescriptor::operator= (const BLEDescriptor& rhs)
 {
     if (this != &rhs)
     {
-        if (_value)
+        memcpy(_uuid_cstr, rhs._uuid_cstr, sizeof(_uuid_cstr));
+        _properties = rhs._properties;
+        _bledev = BLEDevice(&rhs._bledev);
+        if (_value_size < rhs._value_size)
         {
-            free(_value);
+            _value_size = rhs._value_size;
+            
+            if (NULL != _value)
+                free(_value);
+            _value = (unsigned char*)malloc(_value_size);
         }
-        _value = (unsigned char*)malloc(rhs._value_size);
-        if (_value)
+        
+        if (NULL != _value)
         {
             memcpy(_value, rhs._value, rhs._value_size);
-            _value_size = rhs._value_size;
-            memcpy(_uuid_cstr, rhs._uuid_cstr, sizeof(_uuid_cstr));
-            _properties = rhs._properties;
-            _bledev = BLEDevice(&rhs._bledev);
+        }
+        else
+        {
+            _value_size = 0;
         }
     }
     return *this;