From fcb22276d9bf2bdc307910bf0e175073aa5173cf Mon Sep 17 00:00:00 2001 From: Jakub Tyszkowski Date: Tue, 20 May 2014 12:52:44 +0200 Subject: [PATCH] android/gatt: Fix possible invalid read Fix dereferencing attrib before checking if not null. --- android/gatt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index 023b7d8fc..384b7179c 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -553,11 +553,12 @@ static void connection_cleanup(struct gatt_device *device) device->att_io = NULL; } - if (device->server_id > 0) - g_attrib_unregister(device->attrib, device->server_id); - if (device->attrib) { GAttrib *attrib = device->attrib; + + if (device->server_id > 0) + g_attrib_unregister(device->attrib, device->server_id); + device->attrib = NULL; g_attrib_cancel_all(attrib); g_attrib_unref(attrib); -- 2.47.3