qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2003-02-05  Jim Meyering  <jim@meyering.net>

	Fix a heap-corrupting bug.
	* io/ftw.c: Include <limits.h>.
	(PATH_MAX) [!defined PATH_MAX]: Define to 1024.
	(process_entry): Allocate enough space to hold the resulting
	file name.  Don't presume that 2*dirbufsize is enough.
	(ftw_startup): Always use PATH_MAX to compute buffer size, now that
	it is guaranteed to be defined.
This commit is contained in:
Ulrich Drepper 2003-02-05 17:47:50 +00:00
parent a88c926368
commit 5049f1971e
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2003-02-05 Jim Meyering <jim@meyering.net>
Fix a heap-corrupting bug.
* io/ftw.c: Include <limits.h>.
(PATH_MAX) [!defined PATH_MAX]: Define to 1024.
(process_entry): Allocate enough space to hold the resulting
file name. Don't presume that 2*dirbufsize is enough.
(ftw_startup): Always use PATH_MAX to compute buffer size, now that
it is guaranteed to be defined.
2003-02-04 Ulrich Drepper <drepper@redhat.com> 2003-02-04 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile: Add rules to build and run bug-iconv3. * iconvdata/Makefile: Add rules to build and run bug-iconv3.

20
io/ftw.c
View File

@ -25,6 +25,7 @@
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <ftw.h> #include <ftw.h>
#include <limits.h>
#include <search.h> #include <search.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -84,6 +85,14 @@
# define NFTW_FUNC_T __nftw_func_t # define NFTW_FUNC_T __nftw_func_t
#endif #endif
/* We define PATH_MAX if the system does not provide a definition.
This does not artificially limit any operation. PATH_MAX is simply
used as a guesstimate for the expected maximal path length.
Buffers will be enlarged if necessary. */
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
struct dir_data struct dir_data
{ {
DIR *stream; DIR *stream;
@ -282,18 +291,20 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
struct STAT st; struct STAT st;
int result = 0; int result = 0;
int flag = 0; int flag = 0;
size_t new_buflen;
if (name[0] == '.' && (name[1] == '\0' if (name[0] == '.' && (name[1] == '\0'
|| (name[1] == '.' && name[2] == '\0'))) || (name[1] == '.' && name[2] == '\0')))
/* Don't process the "." and ".." entries. */ /* Don't process the "." and ".." entries. */
return 0; return 0;
if (data->dirbufsize < data->ftw.base + namlen + 2) new_buflen = data->ftw.base + namlen + 2;
if (data->dirbufsize < new_buflen)
{ {
/* Enlarge the buffer. */ /* Enlarge the buffer. */
char *newp; char *newp;
data->dirbufsize *= 2; data->dirbufsize = 2 * new_buflen;
newp = (char *) realloc (data->dirbuf, data->dirbufsize); newp = (char *) realloc (data->dirbuf, data->dirbufsize);
if (newp == NULL) if (newp == NULL)
return -1; return -1;
@ -518,11 +529,8 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
* sizeof (struct dir_data *)); * sizeof (struct dir_data *));
memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *)); memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *));
#ifdef PATH_MAX /* PATH_MAX is always defined when we get here. */
data.dirbufsize = MAX (2 * strlen (dir), PATH_MAX); data.dirbufsize = MAX (2 * strlen (dir), PATH_MAX);
#else
data.dirbufsize = 2 * strlen (dir);
#endif
data.dirbuf = (char *) malloc (data.dirbufsize); data.dirbuf = (char *) malloc (data.dirbufsize);
if (data.dirbuf == NULL) if (data.dirbuf == NULL)
return -1; return -1;