[COVERITY] Fix segfault bug if the profile directory is empty

Coverity ID: 5: Forward NULL

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 5abc2e6cbeb3ad8e9295e848f10e273c455cb514..dd0524d4900d46a8a60669ad83f550e6109ca907 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-19  Theodore Tso  <tytso@mit.edu>
+
+       * profile.c (profile_init, get_dirlist): Fix bug where if a
+               profile directory is completely empty, the profile library
+               would segfault.
+
 2006-12-22  Theodore Tso  <tytso@mit.edu>
 
        * unix.c (PRS, main): Use the new {add,remove}_error_table comerr

diff --git a/e2fsck/profile.c b/e2fsck/profile.c
index e7768a2231e526c1540eae1112bc4fd000c9719c..8030680bf031f421cf4de8ef812da49dbb3bcfe4 100644 (file)
--- a/e2fsck/profile.c
+++ b/e2fsck/profile.c
@@ -279,8 +279,10 @@ static errcode_t get_dirlist(const char *dirname, char***ret_array)
                }
                array[num++] = fn;
        }
-       qsort(array, num, sizeof(char *), compstr);
-       array[num++] = 0;
+       if (array) {
+               qsort(array, num, sizeof(char *), compstr);
+               array[num++] = 0;
+       }
        *ret_array = array;
        closedir(dir);
        return 0;
@@ -311,6 +313,8 @@ profile_init(const char **files, profile_t *ret_profile)
            for (fs = files; !PROFILE_LAST_FILESPEC(*fs); fs++) {
                retval = get_dirlist(*fs, &array);
                if (retval == 0) {
+                       if (!array)
+                               continue;
                        for (cpp = array; (cp = *cpp); cpp++) {
                                retval = profile_open_file(cp, &new_file);
                                if (retval == EACCES)