OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2000-07-13  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Correctly handle
	getcwd (NULL, size) with size > 0.
	Fixes PR libc/1788, reported by John Buddery
	<jvb@cyberscience.com>.

2000-07-13  Andreas Jaeger  <aj@suse.de>

	* posix/Makefile: Remove build rules for libposix.
This commit is contained in:
Ulrich Drepper 2000-07-13 17:37:44 +00:00
parent 964b082efd
commit 9cd865e0ce
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-07-13 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Correctly handle
getcwd (NULL, size) with size > 0.
Fixes PR libc/1788, reported by John Buddery
<jvb@cyberscience.com>.
2000-07-13 Andreas Jaeger <aj@suse.de>
* posix/Makefile: Remove build rules for libposix.
2000-07-13 Andreas Schwab <schwab@suse.de>
* sysdeps/generic/glob.c (glob): Fix memory leak.

10
sysdeps/unix/sysv/linux/getcwd.c
View File

@ -103,7 +103,7 @@ __getcwd (char *buf, size_t size)
retval = INLINE_SYSCALL (getcwd, 2, CHECK_STRING (path), alloc_size);
if (retval >= 0)
{
if (buf == NULL)
if (buf == NULL && size == 0)
{
buf = realloc (path, (size_t) retval);
if (buf == NULL)
@ -115,8 +115,9 @@ __getcwd (char *buf, size_t size)
# if __ASSUME_GETCWD_SYSCALL
/* It should never happen that the `getcwd' syscall failed because
the buffer is too small if we allocated the buffer outself. */
assert (errno != ERANGE || buf != NULL);
the buffer is too small if we allocated the buffer outselves
large enough. */
assert (errno != ERANGE || buf != NULL || size != 0);
if (buf == NULL)
free (path);
@ -153,8 +154,9 @@ __getcwd (char *buf, size_t size)
}
path[n] = '\0';
if (buf == NULL)
if (buf == NULL && size == 0)
{
/* Ensure that the buffer is only as large as necessary. */
buf = realloc (path, (size_t) n + 1);
if (buf == NULL)
/* `relloc' failed but we still have the original string. */