mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
qstring: Make conversion from QObject * accept null
qobject_to_qstring() crashes on null, which is a trap for the unwary. Return null instead, and simplify a few callers. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1444918537-18107-7-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
2d6421a900
commit
7f0278435d
3 changed files with 8 additions and 13 deletions
|
@ -117,9 +117,9 @@ void qstring_append_chr(QString *qstring, int c)
|
|||
*/
|
||||
QString *qobject_to_qstring(const QObject *obj)
|
||||
{
|
||||
if (qobject_type(obj) != QTYPE_QSTRING)
|
||||
if (!obj || qobject_type(obj) != QTYPE_QSTRING) {
|
||||
return NULL;
|
||||
|
||||
}
|
||||
return container_of(obj, QString, base);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue