| 123456789101112131415161718192021222324252627 |
- Subject: Portability fix, don't call qsort with NULL/0. Found by coverity
- Origin: FILE5_34-22-g7b807237 <https://github.com/file/file/commit/FILE5_34-22-g7b807237>
- Upstream-Author: Christos Zoulas <christos@zoulas.com>
- Date: Wed Aug 1 10:18:02 2018 +0000
- --- a/src/apprentice.c
- +++ b/src/apprentice.c
- @@ -1347,12 +1347,14 @@
- filearr[files++] = mfn;
- }
- closedir(dir);
- - qsort(filearr, files, sizeof(*filearr), cmpstrp);
- - for (i = 0; i < files; i++) {
- - load_1(ms, action, filearr[i], &errs, mset);
- - free(filearr[i]);
- + if (filearr) {
- + qsort(filearr, files, sizeof(*filearr), cmpstrp);
- + for (i = 0; i < files; i++) {
- + load_1(ms, action, filearr[i], &errs, mset);
- + free(filearr[i]);
- + }
- + free(filearr);
- }
- - free(filearr);
- } else
- load_1(ms, action, fn, &errs, mset);
- if (errs)
|
