Merge from 3.0:

       Revision 1.209.2.44:

		Fix crash bug in smbclient completion.  Closes bug #659.
(This used to be commit decc5d9a2525176c70a17d8928587889f5f6e6af)

diff --git a/source3/client/client.c b/source3/client/client.c
index ecece8942ec74e5ff9cac2ce8ee62cf8c09e5226..5ee6913374a529a9320bdd182a7a59e167e103a8 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2403,10 +2403,9 @@ static char **completion_fn(const char *text, int start, int end)
                return matches;
 
 cleanup:
-               while (i >= 0) {
+               for (i = 0; i < count; i++)
                        free(matches[i]);
-                       i--;
-               }
+
                free(matches);
                return NULL;
        }