From 67cb4b09008aac890f878a009cde4204b5e2dea8 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 2 Mar 2018 12:22:44 -0500
Subject: [PATCH] qapi: Fix object input visit beyond end of list

Backports commit 1f41a645b65530859bf5984aa08e103bb452b473 from qemu
---
 qemu/qapi/qobject-input-visitor.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/qemu/qapi/qobject-input-visitor.c b/qemu/qapi/qobject-input-visitor.c
index aeb2892e..e7085842 100644
--- a/qemu/qapi/qobject-input-visitor.c
+++ b/qemu/qapi/qobject-input-visitor.c
@@ -121,10 +121,15 @@ static QObject *qobject_input_try_get_object(QObjectInputVisitor *qiv,
     } else {
         assert(qobject_type(qobj) == QTYPE_QLIST);
         assert(!name);
-        ret = qlist_entry_obj(tos->entry);
-        assert(ret);
+        if (tos->entry) {
+            ret = qlist_entry_obj(tos->entry);
+            if (consume) {
+                tos->entry = qlist_next(tos->entry);
+            }
+        } else {
+            ret = NULL;
+        }
         if (consume) {
-            tos->entry = qlist_next(tos->entry);
             tos->index++;
         }
     }