fix KW issue for class BLEDescriptor, BLECharacteristic and port.c

Xie,Qi · eriknyquist · commit 25eb59fd4414 · 2016-11-10T10:36:28.000-08:00
diff --git a/libraries/BLE/src/BLECharacteristic.cpp b/libraries/BLE/src/BLECharacteristic.cpp
@@ -46,6 +46,44 @@ BLECharacteristic::BLECharacteristic(BLECharacteristicImp *characteristicImp,
     _value_size = characteristicImp->valueSize();
 }
 
+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)
+{
+    if (this != &rhs)
+    {
+        if (_value)
+        {
+            free(_value);
+        }
+        _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);
+        }
+    }
+    return *this;
+}
+
 BLECharacteristic::~BLECharacteristic()
 {
     if (_value) 
diff --git a/libraries/BLE/src/BLECharacteristic.h b/libraries/BLE/src/BLECharacteristic.h
@@ -84,6 +84,10 @@ class BLECharacteristic: public BLEAttributeWithValue
                       unsigned char properties, 
                       const char* value);
 
+    BLECharacteristic(const BLECharacteristic&);
+
+    BLECharacteristic& operator=(const BLECharacteristic&);
+
     virtual ~BLECharacteristic();
 
     /**
diff --git a/libraries/BLE/src/BLEDescriptor.cpp b/libraries/BLE/src/BLEDescriptor.cpp
@@ -66,6 +66,40 @@ BLEDescriptor::BLEDescriptor(const char* uuid,
      BLEDescriptor(uuid, (const unsigned char*)value, strlen(value))
 {}
 
+BLEDescriptor::BLEDescriptor(const BLEDescriptor& 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;
+        _bledev = BLEDevice(&rhs._bledev);
+    }
+}
+
+BLEDescriptor& BLEDescriptor::operator= (const BLEDescriptor& rhs)
+{
+    if (this != &rhs)
+    {
+        if (_value)
+        {
+            free(_value);
+        }
+        _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;
+            _bledev = BLEDevice(&rhs._bledev);
+        }
+    }
+    return *this;
+}
+
 BLEDescriptor::~BLEDescriptor()
 {
     if (_value)
diff --git a/libraries/BLE/src/BLEDescriptor.h b/libraries/BLE/src/BLEDescriptor.h
@@ -32,6 +32,8 @@ class BLEDescriptor
     BLEDescriptor(const char* uuid, const char* value); // create a descriptor the specified uuid and string value
 
     BLEDescriptor(BLEDescriptorImp* descriptorImp, const BLEDevice *bleDev);
+    BLEDescriptor(const BLEDescriptor&);
+    BLEDescriptor& operator=(const BLEDescriptor&);
 
     virtual ~BLEDescriptor();
 
diff --git a/libraries/BLE/src/internal/BLEProfileManager.cpp b/libraries/BLE/src/internal/BLEProfileManager.cpp
@@ -760,9 +760,12 @@ void BLEProfileManager::serviceDiscoverComplete(const BLEDevice &bledevice)
             servicePrevImp->setEndHandle(serviceCurImp->startHandle() - 1);
         }
         
-    pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());
+        if (servicePrevImp)
+        {
+            pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());
+        }
         servicePrevImp = serviceCurImp;   
-    pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());
+        pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());
         node = node->next;
     }
     return;
diff --git a/system/libarc32_arduino101/framework/src/infra/port.c b/system/libarc32_arduino101/framework/src/infra/port.c
@@ -129,7 +129,10 @@ static struct port * get_port(uint16_t port_id)
 void port_set_queue(uint16_t port_id, void * queue)
 {
 	struct port * p = get_port(port_id);
-	p->queue = queue;
+    if (p)
+    {
+        p->queue = queue;
+    }
 }
 
 #ifdef CONFIG_INFRA_IS_MASTER
@@ -176,8 +179,11 @@ uint16_t port_alloc(void *queue)
 void port_set_handler(uint16_t port_id, void (*handler)(struct message*, void*), void *param)
 {
 	struct port * port = get_port(port_id);
-	port->handle_message = handler;
-	port->handle_param = param;
+    if (port)
+    {
+        port->handle_message = handler;
+        port->handle_param = param;
+    }
 }
 
 struct message * message_alloc(int size, OS_ERR_TYPE * err)
@@ -193,27 +199,40 @@ struct message * message_alloc(int size, OS_ERR_TYPE * err)
 void port_process_message(struct message * msg)
 {
 	struct port * p = get_port(msg->dst_port_id);
-	if (p->handle_message != NULL) {
+	if (p && p->handle_message != NULL) {
 		p->handle_message(msg, p->handle_param);
 	}
 }
 
 void port_set_cpu_id(uint16_t port_id, uint8_t cpu_id)
 {
 	struct port * p = get_port(port_id);
-	p->cpu_id = cpu_id;
+    if (p)
+    {
+        p->cpu_id = cpu_id;
+    }
 }
 
 void port_set_port_id(uint16_t port_id)
 {
 	struct port * p = get_port(port_id);
-	p->id = port_id;
+    if (p)
+    {
+        p->id = port_id;
+    }
 }
 
 uint8_t port_get_cpu_id(uint16_t port_id)
 {
 	struct port * p = get_port(port_id);
-	return p->cpu_id;
+    if (p)
+    {
+	    return p->cpu_id;
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 #ifdef INFRA_MULTI_CPU_SUPPORT
@@ -258,7 +277,7 @@ int port_send_message(struct message * message)
             pr_info(LOG_MODULE_MAIN, "Sending message %p to port %p(q:%p) ret: %d", message, port, port->queue, err);
 #endif
             struct port *src_port = get_port(MESSAGE_SRC(message));
-            if (src_port->cpu_id == get_cpu_id()) {
+            if (src_port && src_port->cpu_id == get_cpu_id()) {
                 /* We bypass the software queue here and process directly
                  * due to lack of background thread on this implementation
                  */
@@ -278,6 +297,10 @@ int port_send_message(struct message * message)
 void message_free(struct message * msg)
 {
     struct port * port = get_port(MESSAGE_SRC(msg));
+    if (!port)
+    {
+        return;
+    }
     pr_debug(LOG_MODULE_MAIN, "free message %p: port %p[%d] this %d id %d",
             msg, port, port->cpu_id, get_cpu_id(), MESSAGE_SRC(msg));
     if (port->cpu_id == get_cpu_id()) {
@@ -291,8 +314,12 @@ void message_free(struct message * msg)
 
 int port_send_message(struct message * msg)
 {
-	struct port * port = get_port(MESSAGE_DST(msg));
 	OS_ERR_TYPE err;
+	struct port * port = get_port(MESSAGE_DST(msg));
+    if (!port)
+    {
+        return E_OS_ERR_NO_MEMORY;
+    }
         if (src_port->cpu_id == get_cpu_id()) {
             /* We bypass the software queue here and process directly
              * due to lack of background thread on this implementation

Original file line number	Diff line number	Diff line change
`@@ -760,9 +760,12 @@ void BLEProfileManager::serviceDiscoverComplete(const BLEDevice &bledevice)`
`760`	`760`	`servicePrevImp->setEndHandle(serviceCurImp->startHandle() - 1);`
`761`	`761`	`}`
`762`	`762`
`763`		`- pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());`
	`763`	`+ if (servicePrevImp)`
	`764`	`+ {`
	`765`	`+ pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());`
	`766`	`+ }`
`764`	`767`	`servicePrevImp = serviceCurImp;`
`765`		`- pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());`
	`768`	`+ pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());`
`766`	`769`	`node = node->next;`
`767`	`770`	`}`
`768`	`771`	`return;`