From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 3/9] libxl: json string object can be NULL Date: Fri, 10 Jul 2015 19:00:51 +0100 Message-ID: <1436551257-28887-4-git-send-email-wei.liu2@citrix.com> References: <1436551257-28887-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZDcbf-0002FM-W3 for xen-devel@lists.xenproject.org; Fri, 10 Jul 2015 18:01:04 +0000 In-Reply-To: <1436551257-28887-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell , Wei Liu List-Id: xen-devel@lists.xenproject.org Signed-off-by: Wei Liu --- tools/libxl/libxl_json.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 346929a..652b3f4 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -433,8 +433,13 @@ int libxl__string_parse_json(libxl__gc *gc, const libxl__json_object *o, if (libxl__json_object_is_null(o)) *p = NULL; - else - *p = libxl__strdup(NOGC, libxl__json_object_get_string(o)); + else { + const char *s = libxl__json_object_get_string(o); + if (!s) + *p = NULL; + else + *p = libxl__strdup(NOGC, s); + } return 0; } -- 1.9.1