From 0bd5677f92c072dc5e038dda33e5d9c1591b68ab Mon Sep 17 00:00:00 2001 From: Atul Rai Date: Mon, 29 Jun 2015 12:14:13 +0530 Subject: [PATCH] android/hal-bluetooth: Fix NULL ptr dereference Add NULL check on malloc return to fix NULL pointer dereference in case malloc fails. --- android/hal-bluetooth.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c index e24f7d2af..66f4a3774 100644 --- a/android/hal-bluetooth.c +++ b/android/hal-bluetooth.c @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -1103,6 +1104,11 @@ static int open_bluetooth(const struct hw_module_t *module, char const *name, DBG(""); + if (!dev) { + error("Failed to allocate memory for device"); + return -ENOMEM; + } + memset(dev, 0, sizeof(bluetooth_device_t)); dev->common.tag = HARDWARE_DEVICE_TAG; dev->common.version = 0; -- 2.47.3