From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 11 Apr 2011 05:58:14 +0000 (-0400)
Subject: fix errno handling in scandir:
X-Git-Tag: v0.7.8~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dae17a1aaf25d8333e729173d86659066607d87d;p=oweals%2Fmusl.git

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...
---

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;