From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 3/9] libxl: json string object can be NULL
Date: Fri, 10 Jul 2015 19:00:51 +0100 [thread overview]
Message-ID: <1436551257-28887-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1436551257-28887-1-git-send-email-wei.liu2@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
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
next prev parent reply other threads:[~2015-07-10 18:01 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 18:00 [PATCH 0/9] xl/libxl: fix issues discovered by Coverity scan Wei Liu
2015-07-10 18:00 ` [PATCH 1/9] libxl: fix libxl__abs_path Wei Liu
2015-07-13 9:57 ` Ian Campbell
2015-07-13 10:00 ` Wei Liu
2015-07-13 17:12 ` Ian Jackson
2015-07-14 7:23 ` Ian Campbell
2015-07-14 10:23 ` Ian Jackson
2015-07-14 13:32 ` Ian Campbell
2015-07-14 13:58 ` Ian Jackson
2015-07-14 14:10 ` Ian Campbell
2015-07-14 15:50 ` Wei Liu
2015-07-10 18:00 ` [PATCH 2/9] libxl: turn two malloc's to libxl__malloc Wei Liu
2015-07-13 10:00 ` Ian Campbell
2015-07-13 15:29 ` Wei Liu
2015-07-10 18:00 ` Wei Liu [this message]
2015-07-13 10:02 ` [PATCH 3/9] libxl: json string object can be NULL Ian Campbell
2015-07-13 17:16 ` Ian Jackson
2015-07-10 18:00 ` [PATCH 4/9] libxl: dispose dominfo to avoid leaking resource Wei Liu
2015-07-13 10:05 ` Ian Campbell
2015-07-13 17:18 ` Ian Jackson
2015-07-10 18:00 ` [PATCH 5/9] libxl: avoid leaking string in cpupool_info Wei Liu
2015-07-13 10:07 ` Ian Campbell
2015-07-13 16:10 ` Wei Liu
2015-07-13 16:23 ` Ian Campbell
2015-07-13 16:24 ` Wei Liu
2015-07-10 18:00 ` [PATCH 6/9] libxl: localtime(3) can return NULL Wei Liu
2015-07-13 10:09 ` Ian Campbell
2015-07-10 18:00 ` [PATCH 7/9] libxl: qmp_init_handler " Wei Liu
2015-07-13 10:10 ` Ian Campbell
2015-07-10 18:00 ` [PATCH 8/9] xl: fix main_cpupoolcreate Wei Liu
2015-07-13 10:11 ` Ian Campbell
2015-07-10 18:00 ` [PATCH 9/9] xl: fix main_config_update Wei Liu
2015-07-13 10:12 ` Ian Campbell
2015-07-10 18:21 ` [PATCH 0/9] xl/libxl: fix issues discovered by Coverity scan Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436551257-28887-4-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).