From: Eric Blake <ebb9@byu.net>
Date: Tue, 1 Sep 2009 16:06:44 +0000 (-0600)
Subject: fchdir: fix off-by-one bug in previous patch
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9873c53517b88fe01a2678002b95574e433a03;p=pspp

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 223a0c65f3..b04c7a9f28 100644
--- 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 cedbcde7fe..170505f157 100644
--- 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);
 }