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

qfloat qint: Make conversion from QObject * accept null 



qobject_to_qfloat() and qobject_to_qint() crash on null, which is a
trap for the unwary.  Return null instead, and simplify a few callers.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1444918537-18107-5-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 89cad9f3

qapi/qmp-input-visitor.c

+14 −10
Original line number Diff line number Diff line
@@ -225,15 +225,15 @@ static void qmp_input_type_int(Visitor *v, int64_t *obj, const char *name, 
                               Error **errp)

{

    QmpInputVisitor *qiv = to_qiv(v);

    QObject *qobj = qmp_input_get_object(qiv, name, true);

    QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));



    if (!qobj || qobject_type(qobj) != QTYPE_QINT) {

    if (!qint) {

        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",

                   "integer");

        return;

    }



    *obj = qint_get_int(qobject_to_qint(qobj));

    *obj = qint_get_int(qint);

}



static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name,
@@ -271,19 +271,23 @@ static void qmp_input_type_number(Visitor *v, double *obj, const char *name, 
{

    QmpInputVisitor *qiv = to_qiv(v);

    QObject *qobj = qmp_input_get_object(qiv, name, true);

    QInt *qint;

    QFloat *qfloat;



    if (!qobj || (qobject_type(qobj) != QTYPE_QFLOAT &&

        qobject_type(qobj) != QTYPE_QINT)) {

        error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",

                   "number");

    qint = qobject_to_qint(qobj);

    if (qint) {

        *obj = qint_get_int(qobject_to_qint(qobj));

        return;

    }



    if (qobject_type(qobj) == QTYPE_QINT) {

        *obj = qint_get_int(qobject_to_qint(qobj));

    } else {

    qfloat = qobject_to_qfloat(qobj);

    if (qfloat) {

        *obj = qfloat_get_double(qobject_to_qfloat(qobj));

        return;

    }



    error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",

               "number");

}



static void qmp_input_type_any(Visitor *v, QObject **obj, const char *name,

qobject/qdict.c

+3 −8
Original line number Diff line number Diff line
@@ -229,8 +229,7 @@ double qdict_get_double(const QDict *qdict, const char *key) 
 */

int64_t qdict_get_int(const QDict *qdict, const char *key)

{

    QObject *obj = qdict_get_obj(qdict, key, QTYPE_QINT);

    return qint_get_int(qobject_to_qint(obj));

    return qint_get_int(qobject_to_qint(qdict_get(qdict, key)));

}



/**
@@ -297,13 +296,9 @@ const char *qdict_get_str(const QDict *qdict, const char *key) 
int64_t qdict_get_try_int(const QDict *qdict, const char *key,

                          int64_t def_value)

{

    QObject *obj;

    QInt *qint = qobject_to_qint(qdict_get(qdict, key));



    obj = qdict_get(qdict, key);

    if (!obj || qobject_type(obj) != QTYPE_QINT)

        return def_value;



    return qint_get_int(qobject_to_qint(obj));

    return qint ? qint_get_int(qint) : def_value;

}



/**

qobject/qfloat.c

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ double qfloat_get_double(const QFloat *qf) 
 */

QFloat *qobject_to_qfloat(const QObject *obj)

{

    if (qobject_type(obj) != QTYPE_QFLOAT)

    if (!obj || qobject_type(obj) != QTYPE_QFLOAT) {

        return NULL;



    }

    return container_of(obj, QFloat, base);

}

qobject/qint.c

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ int64_t qint_get_int(const QInt *qi) 
 */

QInt *qobject_to_qint(const QObject *obj)

{

    if (qobject_type(obj) != QTYPE_QINT)

    if (!obj || qobject_type(obj) != QTYPE_QINT) {

        return NULL;



    }

    return container_of(obj, QInt, base);

}