From 1c2efb50934e59713ec223ce0ac55c6ebf554cf3 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Mon, 25 Nov 2013 15:08:51 +0200 Subject: [PATCH] android/hal-utils: Fix possible NULL pointer dereference --- android/hal-utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/android/hal-utils.c b/android/hal-utils.c index 4f44d9892..e3c0c6070 100644 --- a/android/hal-utils.c +++ b/android/hal-utils.c @@ -33,6 +33,9 @@ const char *bt_uuid_t2str(const uint8_t *uuid, char *buf) unsigned int i; int is_bt; + if (!uuid) + return strcpy(buf, "NULL"); + is_bt = !memcmp(&uuid[4], &BT_BASE_UUID[4], HAL_UUID_LEN - 4); for (i = 0; i < HAL_UUID_LEN; i++) { @@ -167,6 +170,9 @@ const char *bt_bdaddr_t2str(const bt_bdaddr_t *bd_addr, char *buf) { const uint8_t *p = bd_addr->address; + if (!bd_addr) + return strcpy(buf, "NULL"); + snprintf(buf, MAX_ADDR_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x", p[0], p[1], p[2], p[3], p[4], p[5]); -- 2.47.3