[Xen-changelog] [xen master] libxl: handle null lists in libxl_string_list_length

[patchbot@xxxxxxx]

commit a7fa7a4fd6b94c2ace19774ba4ba9f0185c2f2c1
Author:     Matthew Daley <mattjd@xxxxxxxxx>
AuthorDate: Fri Sep 27 23:29:10 2013 +1200
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Oct 3 13:37:17 2013 +0100

    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@xxxxxxxxxx>
    Signed-off-by: Matthew Daley <mattjd@xxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 tools/libxl/libxl.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index ca24ca3..b6dacea 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;
 }
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog