Merge lp:~larsu/unity/lp1495173 into lp:unity

[Lars Karlitski]

DevicesSettingsImp: dont't feed garbage to gsettings

Use a const reference for the iteration variable in the loop over _blacklist so that the pointers returned from c_str() are still valid when feeding them to g_settings_set_strv().

In the best case, this only wrote garbage to the "blacklist" key (making that setting useless). In the worst case, it led to a crash because the garbage was invalid utf8, which gsettings refuses to accept.

Fixes LP: #1495173

DevicesSettingsImp: dont't feed garbage to gsettings

Use a const reference for the iteration variable in the loop over _blacklist so that the pointers returned from c_str() are still valid when feeding them to g_settings_set_strv().

In the best case, this only wrote garbage to the "blacklist" key (making that setting useless). In the worst case, it led to a crash because the garbage was invalid utf8, which gsettings refuses to accept.

Fixes LP: #1495173

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4009
http://jenkins.qa.ubuntu.com/job/unity-ci/1297/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/73
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/73/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1297/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'launcher/DevicesSettingsImp.cpp'
--- launcher/DevicesSettingsImp.cpp	2012-10-29 09:34:54 +0000
+++ launcher/DevicesSettingsImp.cpp	2015-09-17 10:46:53 +0000
@@ -77,7 +77,7 @@
     const char* blacklist_to_be_uploaded[size+1];
 
     int index = 0;
-    for (auto item : blacklist_)
+    for (auto const &item : blacklist_)
       blacklist_to_be_uploaded[index++] = item.c_str();
     blacklist_to_be_uploaded[index] = nullptr;