[Qemu-devel] [PULL for-2.6 0/1] QAPI patches for 2016-04-29

[Qemu-devel] [PULL for-2.6 0/1] QAPI patches for 2016-04-29

[Markus Armbruster]

Potential crash bug.  Missing 2.6 wouldn't be a big deal, but it's an
obvious one-liner, so let's try.

The following changes since commit 736f85d5db701cc9d464a03b583d4a04606a0dd5:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-04-28' into staging (2016-04-28 11:05:37 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2016-04-29

for you to fetch changes up to 0a40bdab0d48d9ce0c34bc2d319e44e92e0cc942:

  qapi: Don't pass NULL to printf in string input visitor (2016-04-29 11:11:36 +0200)

----------------------------------------------------------------
QAPI patches for 2016-04-29

----------------------------------------------------------------
Eric Blake (1):
      qapi: Don't pass NULL to printf in string input visitor

 qapi/string-input-visitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.5.5

[Qemu-devel] [PULL for-2.6 1/1] qapi: Don't pass NULL to printf in string input visitor

[Markus Armbruster]

From: Eric Blake <eblake@redhat.com>

Make sure the error message for visit_type_uint64() gracefully
handles a NULL 'name' when called from the top level or a list
context, as not all the world behaves like glibc in allowing
NULL through a printf-family %s.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-21-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qapi/string-input-visitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index ab12953..5ea2d77 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -222,7 +222,7 @@ static void parse_type_int64(Visitor *v, const char *name, int64_t *obj,
     return;
 
 error:
-    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name,
+    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null",
                "an int64 value or range");
 }
 
-- 
2.5.5

Re: [Qemu-devel] [PULL for-2.6 0/1] QAPI patches for 2016-04-29

[Peter Maydell]

On 29 April 2016 at 10:19, Markus Armbruster <armbru@redhat.com> wrote:
> Potential crash bug.  Missing 2.6 wouldn't be a big deal, but it's an
> obvious one-liner, so let's try.
>
> The following changes since commit 736f85d5db701cc9d464a03b583d4a04606a0dd5:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-04-28' into staging (2016-04-28 11:05:37 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2016-04-29
>
> for you to fetch changes up to 0a40bdab0d48d9ce0c34bc2d319e44e92e0cc942:
>
>   qapi: Don't pass NULL to printf in string input visitor (2016-04-29 11:11:36 +0200)
>
> ----------------------------------------------------------------
> QAPI patches for 2016-04-29
>
> ----------------------------------------------------------------
> Eric Blake (1):
>       qapi: Don't pass NULL to printf in string input visitor

Applied, thanks.

-- PMM