Merge lp:~seb128/ubuntu-system-settings/bluetooth-null-device into lp:ubuntu-system-settings

[Sebastien Bacher]

bluetooth: check if the device is valid before getting details

bluetooth: check if the device is valid before getting details

Not sure what are the exact steps to get into that case but DeviceModel::slotDeviceRemoved() does

" auto device = getDeviceFromPath(path.path());

    const int row = findRowFromAddress(device->getAddress());"

or getDeviceFromPath() can return a null value, which leads to a segfault (saw that on a krillin device a few time while trying to pair the phone with a car (which was not working, but that's another issue)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1336
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2003/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1517
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1517/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18330

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2003/rebuild

review: Needs Fixing (continuous-integration)

[lp:~seb128/ubuntu-system-settings/bluetooth-null-device]

1337. By Sebastien Bacher on 2015-03-11

Rebase on trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1337
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2019/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1730
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1730/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18769

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2019/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Excellent!

review: Approve

=== modified file 'plugins/bluetooth/devicemodel.cpp'
--- plugins/bluetooth/devicemodel.cpp	2015-02-24 18:29:52 +0000
+++ plugins/bluetooth/devicemodel.cpp	2015-03-11 17:41:25 +0000
@@ -400,9 +400,11 @@
 
     auto device = getDeviceFromPath(path.path());
 
-    const int row = findRowFromAddress(device->getAddress());
-    if ((row >= 0))
-        removeRow(row);
+    if (device != nullptr) {
+        const int row = findRowFromAddress(device->getAddress());
+        if ((row >= 0))
+            removeRow(row);
+    }
 }
 
 void DeviceModel::slotDeviceDisappeared(const QString &address)