]> code.delx.au - pulseaudio/commitdiff
bluetooth: Fix too late assertion
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>
Wed, 5 Jun 2013 14:45:06 +0000 (17:45 +0300)
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>
Wed, 19 Jun 2013 15:25:56 +0000 (18:25 +0300)
u was dereferenced before the assertion that checks that u isn't NULL.

src/modules/bluetooth/module-bluetooth-device.c

index f82033aa24bec922771ff7c7418cc2cded025f54..a517e59d737f09c36aba98bf3992a3a55b8275d4 100644 (file)
@@ -2233,11 +2233,13 @@ static int add_card(struct userdata *u) {
     pa_bt_form_factor_t ff;
     char *n;
     const char *default_profile;
-    const pa_bluetooth_device *device = u->device;
+    const pa_bluetooth_device *device;
     const pa_bluetooth_uuid *uuid;
 
     pa_assert(u);
-    pa_assert(device);
+    pa_assert(u->device);
+
+    device = u->device;
 
     pa_card_new_data_init(&data);
     data.driver = __FILE__;