AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

* hurd/get-host.c (_hurd_get_host_config): Fix possible buffer underrun and make sure the result is null terminated even if there is no trailing newline.

Browse Source 
2000-11-13  Marcus Brinkmann <marcus@gnu.org>

	* hurd/get-host.c (_hurd_get_host_config): Fix possible buffer
	underrun and make sure the result is null terminated even if there
	is no trailing newline.
This commit is contained in:
Mark Kettenis 2000-11-13 20:15:25 +00:00
parent 1ed9a93478
commit fbfdeab348
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-11-13 Marcus Brinkmann <marcus@gnu.org>
* hurd/get-host.c (_hurd_get_host_config): Fix possible buffer
underrun and make sure the result is null terminated even if there
is no trailing newline.
2000-11-13 Jakub Jelinek <jakub@redhat.com> 2000-11-13 Jakub Jelinek <jakub@redhat.com>
* sysdeps/alpha/fpu/libm-test-ulps: Update. * sysdeps/alpha/fpu/libm-test-ulps: Update.

11
hurd/get-host.c
View File

@ -1,5 +1,5 @@
/* Get a host configuration item kept as the whole contents of a file. /* Get a host configuration item kept as the whole contents of a file.
Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -72,9 +72,16 @@ _hurd_get_host_config (const char *item, char *buf, size_t buflen)
} }
/* Remove newlines in case someone wrote the file by hand. */ /* Remove newlines in case someone wrote the file by hand. */
while (buf[nread - 1] == '\n') while (buf[nread - 1] == '\n' && nread > 0)
buf[--nread] = '\0'; buf[--nread] = '\0';
/* Null-terminate the result if there is enough space. */
if (nread < buflen)
buf[nread] = '\0';
else
if (buf[nread - 1] != '\0')
more = 1;
if (more) if (more)
/* If we didn't read the whole file, tell the caller to use a bigger /* If we didn't read the whole file, tell the caller to use a bigger
buffer next time. */ buffer next time. */