From fcf73f66a67f5e58c18216f8c8651e38cf4d90af Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 15 Oct 2015 16:15:35 +0200 Subject: 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: Markus Armbruster Message-Id: <1444918537-18107-5-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- qobject/qfloat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qobject/qfloat.c') diff --git a/qobject/qfloat.c b/qobject/qfloat.c index 7de0992..c865163 100644 --- a/qobject/qfloat.c +++ b/qobject/qfloat.c @@ -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); } -- cgit v1.1