From ff125797e38c9628ae1308973231660a22563309 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 19 Nov 2013 11:48:02 +0000 Subject: * libc/posix/closedir.c: Fix use after free. Remove useless test dd_fd != -1 * libc/posix/readdir.c: Remove useless test dd_fd == -1 * libc/posix/readdir_r.c: Ditto. --- newlib/libc/posix/closedir.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'newlib/libc/posix/closedir.c') diff --git a/newlib/libc/posix/closedir.c b/newlib/libc/posix/closedir.c index 634f5ad12..7801da043 100644 --- a/newlib/libc/posix/closedir.c +++ b/newlib/libc/posix/closedir.c @@ -52,25 +52,19 @@ int _DEFUN(closedir, (dirp), register DIR *dirp) { - int fd, rc; + int rc; #ifdef HAVE_DD_LOCK __lock_acquire_recursive(dirp->dd_lock); #endif - rc = 0; - fd = dirp->dd_fd; - if (fd != -1) { - dirp->dd_fd = -1; - dirp->dd_loc = 0; - (void)free((void *)dirp->dd_buf); - (void)free((void *)dirp); - rc = close(fd); - _cleanupdir(dirp); - } + rc = close(dirp->dd_fd); + _cleanupdir(dirp); + free((void *)dirp->dd_buf); #ifdef HAVE_DD_LOCK __lock_release_recursive(dirp->dd_lock); __lock_close_recursive(dirp->dd_lock); #endif + free((void *)dirp); return rc; } -- cgit v1.2.3