mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-23 08:15:37 +00:00
qapi: Guarantee NULL obj on input visitor callback error
Our existing input visitors were not very consistent on errors in a function taking 'TYPE **obj'. These are start_struct(), start_alternate(), type_str(), and type_any(). next_list() is similar, but can't fail (see commit 08f9541). While all of them set '*obj' to allocated storage on success, it was not obvious whether '*obj' was guaranteed safe on failure, or whether it was left uninitialized. But a future patch wants to guarantee that visit_type_FOO() does not leak a partially-constructed obj back to the caller; it is easier to implement this if we can reliably state that input visitors assign '*obj' regardless of success or failure, and that on failure *obj is NULL. Add assertions to enforce consistency in the final setting of err vs. *obj. The opts-visitor start_struct() doesn't set an error, but it also was doing a weird check for 0 size; all callers pass in non-zero size if obj is non-NULL. The testsuite has at least one spot where we no longer need to pre-initialize a variable prior to a visit; valgrind confirms that the test is still fine with the cleanup. A later patch will document the design constraint implemented here. Backports commit e58d695e6c3a5cfa0aa2fc91b87ade017ef28b05 from qemu
This commit is contained in:
parent
3cf7b6dd3b
commit
0ec9a5adaf
|
@ -24,7 +24,13 @@
|
|||
void visit_start_struct(Visitor *v, const char *name, void **obj,
|
||||
size_t size, Error **errp)
|
||||
{
|
||||
v->start_struct(v, name, obj, size, errp);
|
||||
Error *err = NULL;
|
||||
|
||||
v->start_struct(v, name, obj, size, &err);
|
||||
if (obj && v->type == VISITOR_INPUT) {
|
||||
assert(!err != !*obj);
|
||||
}
|
||||
error_propagate(errp, err);
|
||||
}
|
||||
|
||||
void visit_end_struct(Visitor *v, Error **errp)
|
||||
|
@ -192,7 +198,14 @@ void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
|
|||
|
||||
void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp)
|
||||
{
|
||||
v->type_str(v, name, obj, errp);
|
||||
Error *err = NULL;
|
||||
|
||||
assert(obj);
|
||||
v->type_str(v, name, obj, &err);
|
||||
if (v->type == VISITOR_INPUT) {
|
||||
assert(!err != !*obj);
|
||||
}
|
||||
error_propagate(errp, err);
|
||||
}
|
||||
|
||||
void visit_type_number(Visitor *v, const char *name, double *obj,
|
||||
|
@ -203,7 +216,14 @@ void visit_type_number(Visitor *v, const char *name, double *obj,
|
|||
|
||||
void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp)
|
||||
{
|
||||
v->type_any(v, name, obj, errp);
|
||||
Error *err = NULL;
|
||||
|
||||
assert(obj);
|
||||
v->type_any(v, name, obj, &err);
|
||||
if (v->type == VISITOR_INPUT) {
|
||||
assert(!err != !*obj);
|
||||
}
|
||||
error_propagate(errp, err);
|
||||
}
|
||||
|
||||
static void output_type_enum(Visitor *v, const char *name, int *obj,
|
||||
|
|
|
@ -123,6 +123,9 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
|
|||
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
||||
Error *err = NULL;
|
||||
|
||||
if (obj) {
|
||||
*obj = NULL;
|
||||
}
|
||||
if (!qobj || qobject_type(qobj) != QTYPE_QDICT) {
|
||||
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
||||
"QDict");
|
||||
|
@ -279,6 +282,7 @@ static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
|
|||
QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
|
||||
|
||||
if (!qstr) {
|
||||
*obj = NULL;
|
||||
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
||||
"string");
|
||||
return;
|
||||
|
|
|
@ -272,6 +272,7 @@ static void parse_type_str(Visitor *v, const char *name, char **obj,
|
|||
if (siv->string) {
|
||||
*obj = g_strdup(siv->string);
|
||||
} else {
|
||||
*obj = NULL;
|
||||
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
||||
"string");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue