From: Matthew Daley <mattjd@gmail.com>
To: xen-devel@lists.xen.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Matthew Daley <mattjd@gmail.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH] libxl: handle null lists in libxl_string_list_length
Date: Fri, 27 Sep 2013 23:29:10 +1200 [thread overview]
Message-ID: <1380281350-32115-1-git-send-email-mattjd@gmail.com> (raw)
After commit b0be2b12 ("libxl: fix libxl_string_list_length and its only
caller") libxl_string_list_length no longer handles null (empty) lists. Fix
so they are handled, returning length 0.
While at it, remove the unneccessary undereferenced null pointer check
and tidy the layout of the function.
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
I've verified that this fixes the no-bootloader-arguments case.
tools/libxl/libxl.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index eeaaee8..058bef2 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -200,9 +200,12 @@ void libxl_string_list_dispose(libxl_string_list *psl)
int libxl_string_list_length(const libxl_string_list *psl)
{
- if (!psl) return 0;
int i = 0;
- while ((*psl)[i]) i++;
+
+ if (*psl)
+ while ((*psl)[i])
+ i++;
+
return i;
}
--
1.7.10.4
next reply other threads:[~2013-09-27 11:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 11:29 Matthew Daley [this message]
2013-10-03 13:42 ` [PATCH] libxl: handle null lists in libxl_string_list_length Ian Campbell
-- strict thread matches above, loose matches on Subject: below --
2013-09-27 12:08 Boris Ostrovsky
2013-09-27 12:20 ` Matthew Daley
2013-09-27 12:23 ` Andrew Cooper
2013-09-27 12:28 ` Ian Campbell
2013-09-27 13:14 ` Matthew Daley
2013-09-27 13:28 ` Boris Ostrovsky
2013-09-27 14:15 ` Ian Campbell
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=1380281350-32115-1-git-send-email-mattjd@gmail.com \
--to=mattjd@gmail.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xen.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).