Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1407584 into lp:ubuntu-keyboard

[Michael Sheldon]

Check candidates provided by libpinyin are valid before using them

Check candidates provided by libpinyin are valid before using them (fixes crash)

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/525/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/26

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'plugins/pinyin/src/pinyinadapter.cpp'
--- plugins/pinyin/src/pinyinadapter.cpp	2014-12-11 14:49:23 +0000
+++ plugins/pinyin/src/pinyinadapter.cpp	2015-01-05 10:54:14 +0000
@@ -64,13 +64,13 @@
     {
         lookup_candidate_t * candidate = NULL;
 
-        pinyin_get_candidate(m_instance, i, &candidate);
-
-        const char* word = NULL;
-        pinyin_get_candidate_string(m_instance, candidate, &word);
-        // Translate the token to utf-8 phrase.
-        if (word) {
-            candidates.append(QString(word));
+        if (pinyin_get_candidate(m_instance, i, &candidate)) {
+            const char* word = NULL;
+            pinyin_get_candidate_string(m_instance, candidate, &word);
+            // Translate the token to utf-8 phrase.
+            if (word) {
+                candidates.append(QString(word));
+            }
         }
     }
 
@@ -86,8 +86,9 @@
     Q_UNUSED(word)
 
     lookup_candidate_t * candidate = NULL;
-    pinyin_get_candidate(m_instance, 1, &candidate);
-    pinyin_choose_candidate(m_instance, 0, candidate);
+    if (pinyin_get_candidate(m_instance, 1, &candidate)) {
+        pinyin_choose_candidate(m_instance, 0, candidate);
+    }
 }
 
 void PinyinAdapter::reset()