commit 2bf0e14286389430bde40885f1aa6ce51b1e8b8e
author Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com> Wed Mar 24 23:16:26 2010 +0200
committer Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com> Wed Mar 24 23:16:45 2010 +0200
tree dc9e9b8f08859af6cdc470b7f07da51efce621fe
parent 37ba10ff87de4247b2b91486d09c1f0b3fe9233f

Fix directly dereferenced pointer 'auth'

src/device.c

diff --git a/src/device.c b/src/device.c
index dfdacd8..3cfef03 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2052,7 +2052,7 @@
 	struct btd_device *device = auth->device;
 
 	/* No need to reply anything if the authentication already failed */
-	if (!auth || !auth->cb)
+	if (auth->cb == NULL)
 		return;
 
 	((agent_pincode_cb) auth->cb)(agent, err, pincode, device);
@@ -2067,7 +2067,7 @@
 	struct btd_device *device = auth->device;
 
 	/* No need to reply anything if the authentication already failed */
-	if (!auth || !auth->cb)
+	if (auth->cb == NULL)
 		return;
 
 	((agent_cb) auth->cb)(agent, err, device);
@@ -2083,7 +2083,7 @@
 	struct btd_device *device = auth->device;
 
 	/* No need to reply anything if the authentication already failed */
-	if (!auth || !auth->cb)
+	if (auth->cb == NULL)
 		return;
 
 	((agent_passkey_cb) auth->cb)(agent, err, passkey, device);
@@ -2152,13 +2152,16 @@
 
 static void cancel_authentication(struct authentication_req *auth)
 {
-	struct btd_device *device = auth->device;
-	struct agent *agent = auth->agent;
+	struct btd_device *device;
+	struct agent *agent;
 	DBusError err;
 
 	if (!auth || !auth->cb)
 		return;
 
+	device = auth->device;
+	agent = auth->agent;
+
 	dbus_error_init(&err);
 	dbus_set_error_const(&err, "org.bluez.Error.Canceled", NULL);