Adjust capture config; refactor unix_build_dentry_tree()

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index c3ab4b737f08732adc534c2ee30f38da240720dd..58c969ebcaf722252f9b7979a021c430077f224a 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -378,12 +378,6 @@ T(
 "\\System Volume Information\n"
 "\\RECYCLER\n"
 "\\Windows\\CSC\n"
-"\n"
-"[CompressionExclusionList]\n"
-"*.mp3\n"
-"*.zip\n"
-"*.cab\n"
-"\\WINDOWS\\inf\\*.pnf\n"
 );
 
 enum {
@@ -551,7 +545,9 @@ parse_source_list(tchar **source_list_contents_p, size_t source_list_nchars,
                nlines++;
        }
 
-       sources = calloc(nlines, sizeof(*sources));
+       /* Always allocate at least 1 slot, just in case the implementation of
+        * calloc() returns NULL if 0 bytes are requested. */
+       sources = calloc(nlines ?: 1, sizeof(*sources));
        if (!sources)
                goto oom;
        p = source_list_contents;