From 3d9cd0d5f993e3a26767d60ce4691bd7fd328e55 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 14 Apr 2009 18:52:39 -0700 Subject: fix infinite loop in Readdirnames: bufp > nbuf can happen after EOF has been hit, because nbuf is now 0 or -1. discard old comment. R=r DELTA=3 (0 added, 0 deleted, 3 changed) OCL=27463 CL=27465 --- src/lib/os/dir_amd64_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/os/dir_amd64_linux.go') diff --git a/src/lib/os/dir_amd64_linux.go b/src/lib/os/dir_amd64_linux.go index db42cfbab..7ce5f13ad 100644 --- a/src/lib/os/dir_amd64_linux.go +++ b/src/lib/os/dir_amd64_linux.go @@ -40,7 +40,7 @@ func readdirnames(file *File, count int) (names []string, err *os.Error) { names = make([]string, 0, size); // Empty with room to grow. for count != 0 { // Refill the buffer if necessary - if d.bufp == d.nbuf { + if d.bufp >= d.nbuf { var errno int64; dbuf := (*syscall.Dirent)(unsafe.Pointer(&d.buf[0])); d.nbuf, errno = syscall.Getdents(file.fd, dbuf, int64(len(d.buf))); -- cgit v1.2.3