diff options
| author | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-04-01 14:18:15 -0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-04-01 14:18:15 -0300 |
| commit | 4c736d92510c0a61fa8df49698903676c4e21d4b (patch) | |
| tree | 178b4d0fe972c9c06a48abe5a7e56d239296b20a /src | |
| parent | c2a07d4a29dba7b936744a9b5c42c886f478abfc (diff) | |
| download | bluez-4c736d92510c0a61fa8df49698903676c4e21d4b.tar.gz | |
Fix possible null pointer deference.
Diffstat (limited to 'src')
| -rw-r--r-- | src/device.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/device.c b/src/device.c index 447070c5..2ad0f443 100644 --- a/src/device.c +++ b/src/device.c @@ -1533,14 +1533,18 @@ static void bonding_request_free(struct bonding_req *bonding, gboolean close) } device = bonding->device; + g_free(bonding); - if (device && device->agent) { - agent_destroy(device->agent, FALSE); - device->agent = NULL; - } + if (!device) + return; device->bonding = NULL; - g_free(bonding); + + if (!device->agent) + return; + + agent_destroy(device->agent, FALSE); + device->agent = NULL; } static void device_set_paired(struct btd_device *device, gboolean value) |