diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-30 09:55:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-30 09:55:47 +0100 |
| commit | 6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e (patch) | |
| tree | a60591188270f2ec5ade8eef780b26da5ddf0efd /tests | |
| parent | 18a398f6a39df4b08ff86ac0d38384193ca5f4cc (diff) | |
| parent | ba891d68b4ff17faaea3d3a8bfd82af3eed0a134 (diff) | |
| download | qemu-6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e.zip qemu-6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e.tar.gz qemu-6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e.tar.bz2 | |
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')
| -rw-r--r-- | tests/check-qobject.c | 2 | ||||
| -rw-r--r-- | tests/check-qstring.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 16ccbde..593c3a0 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, diff --git a/tests/check-qstring.c b/tests/check-qstring.c index f11a7a8..2d07992 100644 --- a/tests/check-qstring.c +++ b/tests/check-qstring.c @@ -66,7 +66,7 @@ static void qstring_from_substr_test(void) { QString *qs; - qs = qstring_from_substr("virtualization", 3, 9); + qs = qstring_from_substr("virtualization", 3, 10); g_assert(qs != NULL); g_assert(strcmp(qstring_get_str(qs), "tualiza") == 0); |