diff options
-rw-r--r-- | newlib/ChangeLog | 4 | ||||
-rw-r--r-- | newlib/libc/posix/telldir.c | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 5136fa41f..1afbaf69f 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2010-01-11 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * libc/posix/telldir.c (_cleanupdir): Fixed usage of freed memory. + 2010-01-11 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> * libc/include/math.h (log2, log2f): Disable macro versions for C++, diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c index ad654b148..51784674a 100644 --- a/newlib/libc/posix/telldir.c +++ b/newlib/libc/posix/telldir.c @@ -169,26 +169,26 @@ _DEFUN(_cleanupdir, (dirp), __lock_acquire(dd_hash_lock); #endif for (i = 0; i < NDIRHASH; ++i) { + struct ddloc head; register struct ddloc *lp; register struct ddloc *prevlp; + lp = dd_hash[i]; - while (lp != NULL && lp->loc_dirp == dirp) { - dd_hash[i] = lp->loc_next; - prevlp = lp; - free((caddr_t)lp); - lp = prevlp->loc_next; - } - prevlp = lp; + head.loc_next = lp; + prevlp = &head; while (lp != NULL) { - lp = lp->loc_next; - if (lp != NULL && lp->loc_dirp == dirp) { - prevlp->loc_next = lp->loc_next; + struct ddloc *nextlp; + + nextlp = lp->loc_next; + if (lp->loc_dirp == dirp) { + prevlp->loc_next = nextlp; free((caddr_t)lp); - lp = prevlp; } else prevlp = lp; + lp = nextlp; } + dd_hash[i] = head.loc_next; } #ifdef HAVE_DD_LOCK __lock_release(dd_hash_lock); |