summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsaerome.kim <saerome.kim@samsung.com>2019-10-07 17:33:26 +0900
committersaerome.kim <saerome.kim@samsung.com>2019-10-08 09:53:12 +0900
commit52bb88e991ffe1f696ac11abae10d23afa84482c (patch)
treeb4cc25bcf16224c62c2387b20126aae51802fc64 /src
parent24927fd39dacde31a8e6596256027268ea27c354 (diff)
downloaduser-awareness-52bb88e991ffe1f696ac11abae10d23afa84482c.tar.gz
user-awareness-52bb88e991ffe1f696ac11abae10d23afa84482c.tar.bz2
user-awareness-52bb88e991ffe1f696ac11abae10d23afa84482c.zip
Add null-check to prevent crash.
Change-Id: Ibaf4f40cf8a07c2cb974573378b320149d9a869f Signed-off-by: saerome.kim <saerome.kim@samsung.com>
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/user-awareness-device.c14
-rwxr-xr-x[-rw-r--r--]src/user-awareness-event-handler.c0
2 files changed, 9 insertions, 5 deletions
diff --git a/src/user-awareness-device.c b/src/user-awareness-device.c
index 133f18c..c6a97fc 100644..100755
--- a/src/user-awareness-device.c
+++ b/src/user-awareness-device.c
@@ -350,11 +350,15 @@ void _ua_handle_device_added(int result, uam_device_info_s *uam_info)
result = _ua_get_error_code(result);
if (UA_ERROR_NONE != result) {
- dev = __ua_get_device_from_list(uam_info->device_id,
- uam_info->mac, _to_ua_mac_type(uam_info->type));
- if (NULL != dev)
- UA_ERR("Add device failed for Id:[%s] MAC type:[0x%4.4X]",
- dev->device_id, dev->type);
+ if (NULL == uam_info) {
+ UA_ERR("Add device failed [%s]", _ua_get_error_string(result));
+ } else {
+ dev = __ua_get_device_from_list(uam_info->device_id,
+ uam_info->mac, _to_ua_mac_type(uam_info->type));
+ if (NULL != dev)
+ UA_ERR("Add device failed for Id:[%s] MAC type:[0x%4.4X]",
+ dev->device_id, dev->type);
+ }
} else {
dev = __ua_add_device_info_to_list(uam_info);
}
diff --git a/src/user-awareness-event-handler.c b/src/user-awareness-event-handler.c
index 5511d66..5511d66 100644..100755
--- a/src/user-awareness-event-handler.c
+++ b/src/user-awareness-event-handler.c