Merge lp:~laney/ubuntu-system-settings/fix-translated-search into lp:ubuntu-system-settings

[Iain Lane]

When generating the translated list of keywords, keep the byte array alive for as long as it's needed.

When generating the translated list of keywords, keep the byte array alive for as long as it's needed.

Otherwise it can be freed and then we get invalid reads which breaks the translations and means you can't search for the translated text.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:493
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/11

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

seems good to me!

review: Approve

=== modified file 'src/item-model.cpp'
--- src/item-model.cpp	2013-09-06 09:40:03 +0000
+++ src/item-model.cpp	2013-11-18 14:00:00 +0000
@@ -108,7 +108,9 @@
         ret = QVariant::fromValue<QObject*>(const_cast<Plugin*>(item));
         break;
     case KeywordRole:
-        const char * domain = item->translations().toUtf8().constData();
+        QByteArray translations = item->translations().toUtf8();
+        QByteArray displayName = item->displayName().toUtf8();
+        const char * domain = translations.constData();
         QStringList temp(item->keywords());
         QMutableListIterator<QString> it(temp);
         while (it.hasNext()) {
@@ -119,8 +121,7 @@
                                 keyword.toUtf8().constData())));
         }
         temp << QString::fromUtf8(
-                dgettext(domain,
-                         item->displayName().toUtf8().constData()));
+                    dgettext(domain,displayName.constData()));
         ret = temp;
     }