Commit 1f41a645 authored Mar 03, 2017 by Markus Armbruster

qapi: Fix object input visit beyond end of list



Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1488544368-30622-28-git-send-email-armbru@redhat.com>

parent a9416dc6

qapi/qobject-input-visitor.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -122,10 +122,15 @@ static QObject qobject_input_try_get_object(QObjectInputVisitor qiv,
		} else {
		assert(qobject_type(qobj) == QTYPE_QLIST);
		assert(!name);
		if (tos->entry) {
		ret = qlist_entry_obj(tos->entry);
		assert(ret);
		if (consume) {
		tos->entry = qlist_next(tos->entry);
		}
		} else {
		ret = NULL;
		}
		if (consume) {
		tos->index++;
		}
		}

tests/test-qobject-input-visitor.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -953,10 +953,8 @@ static void test_visitor_in_fail_list(TestInputVisitorData *data,
		v = visitor_input_test_init(data, "[]");

		visit_start_list(v, NULL, NULL, 0, &error_abort);
		#if 0 /* FIXME crash */
		visit_type_int(v, NULL, &i64, &err);
		error_free_or_abort(&err);
		#endif
		visit_end_list(v, NULL);
		}