Merge lp:~michael-sheldon/ubuntu-keyboard/fix-oxide-crash-rtm into lp:ubuntu-keyboard/rtm-14.09

[Michael Sheldon]

Back port fix for keyboard crashing when clients send invalid surrounding text/offset data.

Back port fix for keyboard crashing when clients send invalid surrounding text/offset data.

[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 (in sync with RTM branch)

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

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2015-04-27 15:37:18 +0000
+++ src/view/abstracttexteditor.cpp	2015-04-27 17:02:49 +0000
@@ -1098,7 +1098,7 @@
     }
 
     int currentOffset = text()->surroundingOffset();
-    if(currentOffset > 1 && !text()->surrounding().isEmpty()) {
+    if(currentOffset > 1 && currentOffset <= text()->surrounding().size()) {
         QString lastChar;
         if(uncommittedDelete) {
             // -2 for just deleted character that hasn't been committed and to reach character before cursor
 
=== modified file 'tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp'
--- tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp	2014-05-16 16:12:46 +0000
+++ tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp	2015-04-27 17:02:49 +0000
@@ -207,6 +207,38 @@
         QCOMPARE(host->keyEventCount(), 4);
     }
 
+    Q_SLOT void testInvalidSurroundingText_data()
+    {   
+        QTest::addColumn<Method>("initiate");
+        Method release = &Editor::onKeyReleased;
+
+        QTest::newRow("release") << release;
+    }
+
+    /*
+     * Verifies that the keyboard doesn't crash when pressing backspace with
+     * invalid surrounding text data.
+     */
+    Q_SLOT void testInvalidSurroundingText()
+    {
+        QFETCH(Method, initiate);
+
+        editor->wordEngine()->setEnabled(true);
+        editor->setPreeditEnabled(true);
+        editor->onHasSelectionChanged(false);
+        editor->text()->setSurrounding("123");
+        editor->text()->setSurroundingOffset(9);
+
+        Key backspace;
+        backspace.setAction(Key::ActionBackspace);
+
+        (editor.data()->*initiate)(backspace);
+        editor->onKeyReleased(backspace);
+        editor->checkPreeditReentry(true);
+        QCOMPARE(host->keyEventCount(), 2);
+    }
+
+
 };
 
 QTEST_MAIN(TestRepeatBackspace)