From: Matthew Daley <mattjd@gmail.com>
Date: Fri, 27 Sep 2013 11:29:10 +0000 (+1200)
Subject: libxl: handle null lists in libxl_string_list_length
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6227
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7fa7a4fd6b94c2ace19774ba4ba9f0185c2f2c1;p=xen.git

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 <boris.ostrovsky@oracle.com>
Signed-off-by: Matthew Daley <mattjd@gmail.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

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;
 }