From 951a43cf99d845d398442fa75b36c0d638dbea3b Mon Sep 17 00:00:00 2001 From: Atul Rai Date: Tue, 28 Jul 2015 09:50:50 +0530 Subject: [PATCH] android/client: Fix memory leak while using realloc() While reallocating space to store additional "remote device set" using realloc, if realloc() fails, the original block is left untouched but reference to that block is lost as NULL is assigned to remote_devices. The original block needs to be freed before return. --- android/client/if-bt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/android/client/if-bt.c b/android/client/if-bt.c index 4723024e7..c9acf6c83 100644 --- a/android/client/if-bt.c +++ b/android/client/if-bt.c @@ -118,10 +118,19 @@ void add_remote_device(const bt_bdaddr_t *addr) /* Realloc space if needed */ if (remote_devices_cnt >= remote_devices_capacity) { + bt_bdaddr_t *tmp; + remote_devices_capacity *= 2; + /* + * Save reference to previously allocated memory block so that + * it can be freed in case realloc fails. + */ + tmp = remote_devices; + remote_devices = realloc(remote_devices, sizeof(bt_bdaddr_t) * remote_devices_capacity); if (remote_devices == NULL) { + free(tmp); remote_devices_capacity = 0; remote_devices_cnt = 0; return; -- 2.47.3