- Fixed Invalid number of character ')'s in caleadapter.c
- Fixed Possible null pointer dereference in ccmessagehandler.c
- Fixed double memory free condition JniNotificationConsumer.cpp
- Fixed double memory free condition JniNotificationProvider.cpp
https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/548/commits/
222bbb7e84830c5a2ecc17332df1c60f2bcf3a71
(cherry-picked from
222bbb7e84830c5a2ecc17332df1c60f2bcf3a71)
Change-Id: I724ee387dfc932c0614b7e19bb289b85d0254106
Signed-off by: samanway <samanway@samanway.sa.corp.samsungelectronics.net>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>
static CAResult_t CALEServerSendDataSingleThread(const uint8_t *data,
uint32_t dataLen)
{
- OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "%s", __func__););
+ OIC_LOG_V(DEBUG, CALEADAPTER_TAG, "%s", __func__);
VERIFY_NON_NULL(data, CALEADAPTER_TAG, "Param data is NULL");
char log_buffer[1024] = "";
sprintf(log_buffer, "CA_LOG [%5d] | %-13s | %-12s | msg size : %4d | %s", pdu->transport_hdr->udp.id , type, method, pdu->length, info->resourceUri);
+ if(NULL != info)
+ {
+ sprintf(log_buffer, "CA_LOG [%5d] | %-13s | %-12s | msg size : %4d | %s", pdu->transport_hdr->udp.id , type, method, pdu->length, info->resourceUri);
+ }
+
puts(log_buffer);
}
{\r
NS_LOGE ("Failed to create OcRepresentation");\r
delete ocRepresentation;\r
+ return NULL;\r
}\r
else\r
{\r
{
NS_LOGE ("Failed to create OcRepresentation");
delete ocRepresentation;
+ return NULL;
}
else
{