summary refs log tree commit diff stats
path: root/tests/check-qobject.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-07-30 09:55:47 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-07-30 09:55:47 +0100
commit6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e (patch)
treea60591188270f2ec5ade8eef780b26da5ddf0efd /tests/check-qobject.c
parent18a398f6a39df4b08ff86ac0d38384193ca5f4cc (diff)
parentba891d68b4ff17faaea3d3a8bfd82af3eed0a134 (diff)
downloadfocaccia-qemu-6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e.tar.gz
focaccia-qemu-6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-07-27-v2' into staging
QObject patches for 2018-07-27 (3.0.0-rc3)

# gpg: Signature made Sat 28 Jul 2018 08:10:39 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qobject-2018-07-27-v2:
  qstring: Move qstring_from_substr()'s @end one to the right
  qstring: Assert size calculations don't overflow
  qstring: Fix qstring_from_substr() not to provoke int overflow

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/check-qobject.c')
-rw-r--r--tests/check-qobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/check-qobject.c b/tests/check-qobject.c
index 16ccbde82c..593c3a0618 100644
--- a/tests/check-qobject.c
+++ b/tests/check-qobject.c
@@ -154,7 +154,7 @@ static void qobject_is_equal_string_test(void)
     str_case = qstring_from_str("Foo");
 
     /* Should yield "foo" */
-    str_built = qstring_from_substr("form", 0, 1);
+    str_built = qstring_from_substr("form", 0, 2);
     qstring_append_chr(str_built, 'o');
 
     check_unequal(str_base, str_whitespace_0, str_whitespace_1,