| Message ID | 20120629144001.0b388b49@doriath.home |
|---|---|
| State | New |
| Headers | show |
On 06/30/2012 01:40 AM, Luiz Capitulino wrote: > The enum string is pointed to by 'enum_str' not 'name'. This bug > causes the error message to be: > > { "error": { "class": "InvalidParameter", > "desc": "Invalid parameter 'null'", > "data": { "name": "null" } } } > > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Looks good. Reviewed-by: Amos Kong <akong@redhat.com> > --- > > I've caught this while reviewing the sendkey conversion series. Not sure if > any in tree code can trigger this. > > qapi/qapi-visit-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c > index ffffbf7..705eca9 100644 > --- a/qapi/qapi-visit-core.c > +++ b/qapi/qapi-visit-core.c > @@ -298,7 +298,7 @@ void input_type_enum(Visitor *v, int *obj, const char *strings[], > } > > if (strings[value] == NULL) { > - error_set(errp, QERR_INVALID_PARAMETER, name ? name : "null"); > + error_set(errp, QERR_INVALID_PARAMETER, enum_str); > g_free(enum_str); > return; > }
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index ffffbf7..705eca9 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -298,7 +298,7 @@ void input_type_enum(Visitor *v, int *obj, const char *strings[], } if (strings[value] == NULL) { - error_set(errp, QERR_INVALID_PARAMETER, name ? name : "null"); + error_set(errp, QERR_INVALID_PARAMETER, enum_str); g_free(enum_str); return; }
The enum string is pointed to by 'enum_str' not 'name'. This bug causes the error message to be: { "error": { "class": "InvalidParameter", "desc": "Invalid parameter 'null'", "data": { "name": "null" } } } Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- I've caught this while reviewing the sendkey conversion series. Not sure if any in tree code can trigger this. qapi/qapi-visit-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)