aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-12-29 21:07:46 +0000
committerUlrich Drepper <drepper@redhat.com>2001-12-29 21:07:46 +0000
commit2903810a7ab7a1a07af9b61debbed326fed5550e (patch)
treefb8dc41e2fa5ef3f65decc04efd0d3d13938543b
parentc2f5916e8cf5a40db50bfb2377e56875ae96eea2 (diff)
downloadglibc-2903810a7ab7a1a07af9b61debbed326fed5550e.zip
glibc-2903810a7ab7a1a07af9b61debbed326fed5550e.tar.gz
glibc-2903810a7ab7a1a07af9b61debbed326fed5550e.tar.bz2
Update.
* io/fts.c: Update from BSD to fix memory leaks. 2001-12-25 Dmitry V. Levin <ldv@alt-linux.org>
-rw-r--r--ChangeLog4
-rw-r--r--io/fts.c25
2 files changed, 24 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cd0d662..d61b5ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2001-12-25 Dmitry V. Levin <ldv@alt-linux.org>
+ * io/fts.c: Update from BSD to fix memory leaks.
+
+2001-12-25 Dmitry V. Levin <ldv@alt-linux.org>
+
* crypt/md5-crypt.c: Realloc error handling memory leak fix.
* elf/chroot_canon.c: Likewise.
* elf/dl-object.c: Likewise.
diff --git a/io/fts.c b/io/fts.c
index da33745..35374a0 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -934,12 +934,17 @@ fts_sort(sp, head, nitems)
* 40 so don't realloc one entry at a time.
*/
if (nitems > sp->fts_nitems) {
+ struct _ftsent **a;
+
sp->fts_nitems = nitems + 40;
- if ((sp->fts_array = realloc(sp->fts_array,
- (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) {
+ if ((a = realloc(sp->fts_array,
+ (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) {
+ free(sp->fts_array);
+ sp->fts_array = NULL;
sp->fts_nitems = 0;
return (head);
}
+ sp->fts_array = a;
}
for (ap = sp->fts_array, p = head; p; p = p->fts_link)
*ap++ = p;
@@ -1016,6 +1021,8 @@ fts_palloc(sp, more)
FTS *sp;
size_t more;
{
+ char *p;
+
sp->fts_pathlen += more + 256;
/*
* Check for possible wraparound. In an FTS, fts_pathlen is
@@ -1023,14 +1030,22 @@ fts_palloc(sp, more)
* We limit fts_pathlen to USHRT_MAX to be safe in both cases.
*/
if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
- if (sp->fts_path)
+ if (sp->fts_path) {
free(sp->fts_path);
+ sp->fts_path = NULL;
+ }
sp->fts_path = NULL;
__set_errno (ENAMETOOLONG);
return (1);
}
- sp->fts_path = realloc(sp->fts_path, sp->fts_pathlen);
- return (sp->fts_path == NULL);
+ p = realloc(sp->fts_path, sp->fts_pathlen);
+ if (p == NULL) {
+ free(sp->fts_path);
+ sp->fts_path = NULL;
+ return 1;
+ }
+ sp->fts_path = p;
+ return 0;
}
/*