Commit c978bd52 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qapi: Clean up visitor's recovery from input with invalid type 



An alternate type's visit_type_FOO() fails when it runs into an
invalid ->type.  If it's an input visit, we then need to free the the
object we got from visit_start_alternate().  We do that with
qapi_free_FOO(), which uses the dealloc visitor.

Trouble is that object is in a bad state: its ->type is invalid.  So
the dealloc visitor will run into the same error again, and the error
recovery skips deallocating the alternate's (invalid) alternative.
Works, because qapi_free_FOO() ignores the error.

Avoid it instead: free the messed up object with by g_free().

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200424084338.26803-11-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent faad584a

scripts/qapi/visit.py

+3 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error 
    default:

        error_setg(&err, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",

                   "%(name)s");

        /* Avoid passing invalid *obj to qapi_free_%(c_name)s() */

        g_free(*obj);

        *obj = NULL;

    }

out_obj:

    visit_end_alternate(v, (void **)obj);