----- Original Message -----
> Check that the QLit list has the same size as the qlist, this should
> ensure that we have an exact match when iterating over qlist for
> comparing the elements.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> qobject/qlit.c | 39 ++++++++++++++++++++++++++-------------
> tests/check-qlit.c | 3 +++
> 2 files changed, 29 insertions(+), 13 deletions(-)
>
> diff --git a/qobject/qlit.c b/qobject/qlit.c
> index 45ae0635c0..0a60802d74 100644
> --- a/qobject/qlit.c
> +++ b/qobject/qlit.c
> @@ -67,6 +67,28 @@ end:
> return success;
> }
>
> +static bool qlit_equal_qlist(const QLitObject *lhs, const QList *qlist)
> +{
> + QListCompareHelper helper;
> + int i;
> +
> + for (i = 0; lhs->value.qlist[i].type != QTYPE_NONE; i++) {
> + continue;
> + }
> +
> + if (qlist_size(qlist) != i) {
> + return false;
> + }
> +
> + helper.index = 0;
> + helper.objs = lhs->value.qlist;
> + helper.result = true;
> +
> + qlist_iter(qlist, compare_helper, &helper);
> +
> + return helper.result;
> +}
> +
> bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)
> {
> int64_t val;
> @@ -82,21 +104,12 @@ bool qlit_equal_qobject(const QLitObject *lhs, const
> QObject *rhs)
> val = qnum_get_int(qobject_to_qnum(rhs));
> return lhs->value.qnum == val;
> case QTYPE_QSTRING:
> - return (strcmp(lhs->value.qstr,
> - qstring_get_str(qobject_to_qstring(rhs))) == 0);
> + return g_str_equal(lhs->value.qstr,
> + qstring_get_str(qobject_to_qstring(rhs)));
drop this hunk, it slipped in by mistake.
> case QTYPE_QDICT:
> return qlit_equal_qdict(lhs, qobject_to_qdict(rhs));
> - case QTYPE_QLIST: {
> - QListCompareHelper helper;
> -
> - helper.index = 0;
> - helper.objs = lhs->value.qlist;
> - helper.result = true;
> -
> - qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);
> -
> - return helper.result;
> - }
> + case QTYPE_QLIST:
> + return qlit_equal_qlist(lhs, qobject_to_qlist(rhs));
> case QTYPE_QNULL:
> return true;
> default:
> diff --git a/tests/check-qlit.c b/tests/check-qlit.c
> index 5d9558dfd9..ae74bfcb83 100644
> --- a/tests/check-qlit.c
> +++ b/tests/check-qlit.c
> @@ -58,6 +58,9 @@ static void qlit_equal_qobject_test(void)
>
> g_assert(!qlit_equal_qobject(&qlit_foo, qobj));
>
> + qdict_put(qobject_to_qdict(qobj), "bee", qlist_new());
> + g_assert(!qlit_equal_qobject(&qlit, qobj));
> +
> qobject_decref(qobj);
> }
>
> --
> 2.14.1.146.gd35faa819
>
>
