diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io/fts.c | 25 |
2 files changed, 24 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index cd0d6628f1..d61b5caf2d 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 da337456ce..35374a094a 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; } /* |