From dae17a1aaf25d8333e729173d86659066607d87d Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 11 Apr 2011 01:58:14 -0400 Subject: [PATCH] fix errno handling in scandir: 1. saved errno was not being restored, illegally clearing errno to 0. 2. no need to backup and save errno around free; it will not touch except perhaps when the program has already invoked UB... --- src/dirent/scandir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dirent/scandir.c b/src/dirent/scandir.c index 6a0a9993..aad813ac 100644 --- a/src/dirent/scandir.c +++ b/src/dirent/scandir.c @@ -35,12 +35,11 @@ int scandir(const char *path, struct dirent ***res, closedir(d); if (errno) { - old_errno = errno; if (names) while (cnt-->0) free(names[cnt]); free(names); - errno = old_errno; return -1; } + errno = old_errno; if (cmp) qsort(names, cnt, sizeof *names, (int (*)(const void *, const void *))cmp); *res = names; -- 2.25.1