fchdir: fix off-by-one bug in previous patch

* lib/fchdir.c (rpl_fstat): Use correct bounds.
(_gl_unregister_fd): Delete useless if.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 223a0c65f3bd12f086296a4b6e48de9f1219080d..b04c7a9f2827487dc1db24e1bb9ba2af2ec946c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-01  Eric Blake  <ebb9@byu.net>
+
+       fchdir: fix off-by-one bug in previous patch
+       * lib/fchdir.c (rpl_fstat): Use correct bounds.
+       (_gl_unregister_fd): Delete useless if.
+
 2009-09-01  Daniel P. Berrange  <berrange@redhat.com>
 
        maint.mk: sort the list of syntax-check rules

diff --git a/lib/fchdir.c b/lib/fchdir.c
index cedbcde7fe31b3ad218b1cb926c3d0649334d9fe..170505f15743cf7c5fe2008112df8fdfc5fa76b0 100644 (file)
--- a/lib/fchdir.c
+++ b/lib/fchdir.c
@@ -93,8 +93,7 @@ _gl_unregister_fd (int fd)
 {
   if (fd >= 0 && fd < dirs_allocated)
     {
-      if (dirs[fd].name != NULL)
-       free (dirs[fd].name);
+      free (dirs[fd].name);
       dirs[fd].name = NULL;
       dirs[fd].saved_errno = ENOTDIR;
     }
@@ -126,7 +125,7 @@ _gl_register_fd (int fd, const char *filename)
 int
 rpl_fstat (int fd, struct stat *statbuf)
 {
-  if (0 <= fd && fd <= dirs_allocated && dirs[fd].name != NULL)
+  if (0 <= fd && fd < dirs_allocated && dirs[fd].name != NULL)
     return stat (dirs[fd].name, statbuf);
   return fstat (fd, statbuf);
 }