lib/strutils: move array bounds check in string_to_idarray() to appropriate place.

string_to_idarray() will incorrectly exit with an error when the last element
of the passed in array gets filled. However it should only exit with an error
if there is more input. To fix this move the array bounds check.

Signed-off-by: Chandan B Rajenda <chandan@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/lib/strutils.c b/lib/strutils.c
index 75861607e594f774479f80d64e81278c65fbc3c0..c40daf2000c474d99078dc7ed283443c16583f43 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -393,6 +393,8 @@ int string_to_idarray(const char *list, int ary[], size_t arysz,
                const char *end = NULL;
                int id;
 
+               if (n >= arysz)
+                       return -2;
                if (!begin)
                        begin = p;              /* begin of the column name */
                if (*p == ',')
@@ -408,8 +410,6 @@ int string_to_idarray(const char *list, int ary[], size_t arysz,
                if (id == -1)
                        return -1;
                ary[ n++ ] = id;
-               if (n >= arysz)
-                       return -2;
                begin = NULL;
                if (end && !*end)
                        break;