libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* libc/unix/getcwd.c (getcwd): Close directory also in case of an error.

This commit is contained in:
Corinna Vinschen 2014-10-16 15:00:59 +00:00
parent b23449bce1
commit ec2a57f476
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/ChangeLog
View File

@ -1,3 +1,7 @@
2014-10-16 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libc/unix/getcwd.c (getcwd): Close directory also in case of an error.
2014-10-10 Thomas Uhle <thomas.uhle@eas.iis.fraunhofer.de> 2014-10-10 Thomas Uhle <thomas.uhle@eas.iis.fraunhofer.de>
* libc/include/_ansi.h: _LONG_LONG_TYPE definition removed. * libc/include/_ansi.h: _LONG_LONG_TYPE definition removed.

5
newlib/libc/unix/getcwd.c
View File

@ -57,7 +57,7 @@ getcwd (pt, size)
size_t size; size_t size;
{ {
register struct dirent *dp; register struct dirent *dp;
register DIR *dir; register DIR *dir = NULL;
register dev_t dev; register dev_t dev;
register ino_t ino; register ino_t ino;
register int first; register int first;
@ -237,6 +237,7 @@ getcwd (pt, size)
bpt -= strlen (dp->d_name); bpt -= strlen (dp->d_name);
bcopy (dp->d_name, bpt, strlen (dp->d_name)); bcopy (dp->d_name, bpt, strlen (dp->d_name));
(void) closedir (dir); (void) closedir (dir);
dir = NULL;
/* Truncate any file name. */ /* Truncate any file name. */
*bup = '\0'; *bup = '\0';
@ -256,6 +257,8 @@ notfound:
err: err:
if (ptsize) if (ptsize)
free (pt); free (pt);
if (dir)
(void) closedir (dir);
free (up); free (up);
return (char *) NULL; return (char *) NULL;
} }