From 14b6160099f0caf5dc9d62e637b007bc5d719a96 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 15 Oct 2015 16:15:33 +0200 Subject: qbool: Make conversion from QObject * accept null qobject_to_qbool() crashes 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-3-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- qobject/qbool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qobject/qbool.c') diff --git a/qobject/qbool.c b/qobject/qbool.c index 5ff69f0b2d..bc6535fa49 100644 --- a/qobject/qbool.c +++ b/qobject/qbool.c @@ -51,9 +51,9 @@ bool qbool_get_bool(const QBool *qb) */ QBool *qobject_to_qbool(const QObject *obj) { - if (qobject_type(obj) != QTYPE_QBOOL) + if (!obj || qobject_type(obj) != QTYPE_QBOOL) { return NULL; - + } return container_of(obj, QBool, base); } -- cgit v1.2.1