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 /include | |
| 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 'include')
| -rw-r--r-- | include/qapi/qmp/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index b3b3d44..3e83e3a 100644 --- a/include/qapi/qmp/qstring.h +++ b/include/qapi/qmp/qstring.h @@ -24,7 +24,7 @@ struct QString { QString *qstring_new(void); QString *qstring_from_str(const char *str); -QString *qstring_from_substr(const char *str, int start, int end); +QString *qstring_from_substr(const char *str, size_t start, size_t end); size_t qstring_get_length(const QString *qstring); const char *qstring_get_str(const QString *qstring); const char *qstring_get_try_str(const QString *qstring); |