From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsOvR-0006AK-BA for qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsOvO-0006Wv-5h for qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsOvN-0006Vy-Vp for qemu-devel@nongnu.org; Thu, 14 Sep 2017 03:51:02 -0400 From: Peter Xu Date: Thu, 14 Sep 2017 15:50:23 +0800 Message-Id: <1505375436-28439-3-git-send-email-peterx@redhat.com> In-Reply-To: <1505375436-28439-1-git-send-email-peterx@redhat.com> References: <1505375436-28439-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [RFC 02/15] qobject: allow NULL for qstring_get_str() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "Daniel P . Berrange" , Stefan Hajnoczi , Fam Zheng , Juan Quintela , mdroth@linux.vnet.ibm.com, peterx@redhat.com, Eric Blake , Laurent Vivier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , "Dr . David Alan Gilbert" Then I can get NULL rather than crash when calling things like: qstring_get_str(qobject_to_qstring(object)); when key does not exist. CC: Markus Armbruster Signed-off-by: Peter Xu --- qobject/qstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qobject/qstring.c b/qobject/qstring.c index 5da7b5f..c499fec 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -125,7 +125,7 @@ QString *qobject_to_qstring(const QObject *obj) */ const char *qstring_get_str(const QString *qstring) { - return qstring->string; + return qstring ? qstring->string : NULL; } /** -- 2.7.4