diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-10-15 16:15:37 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-10-29 14:34:45 +0100 |
| commit | 7f0278435df1fa845b3bd9556942f89296d4246b (patch) | |
| tree | ad364ba05fbd93e34fff0e52ac3ae35c351ea4bb /qobject/qstring.c | |
| parent | 2d6421a90047a83f6722832405fe09571040ea5b (diff) | |
| download | qemu-7f0278435df1fa845b3bd9556942f89296d4246b.zip qemu-7f0278435df1fa845b3bd9556942f89296d4246b.tar.gz qemu-7f0278435df1fa845b3bd9556942f89296d4246b.tar.bz2 | |
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>
Diffstat (limited to 'qobject/qstring.c')
| -rw-r--r-- | qobject/qstring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qobject/qstring.c b/qobject/qstring.c index 607b7a1..cb72dfb 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -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); } |