From a7fa7a4fd6b94c2ace19774ba4ba9f0185c2f2c1 Mon Sep 17 00:00:00 2001 From: Matthew Daley Date: Fri, 27 Sep 2013 23:29:10 +1200 Subject: libxl: handle null lists in libxl_string_list_length 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 Signed-off-by: Matthew Daley Acked-by: Ian Campbell --- tools/libxl/libxl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ca24ca37cd..b6daceaf9b 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; } -- cgit v1.2.3