2002-05-13 Marcus Brinkmann <marcus@gnu.org>

        * hurd/hurdchdir.c (_hurd_change_directory_port_from_name):
        Allocate three, not two, more than LEN when appending '/.'.
        * sysdeps/mach/hurd/chroot.c (chroot): Likewise.  Don't check
        if NAME ends with '/.' if it is shorter than 2 chars.

diff --git a/hurd/hurdchdir.c b/hurd/hurdchdir.c
index 0c10a37d1b7f9ab120929298a66996abc0034cd8..5115e4d460d935958ee28ba229031a54ba4b7412 100644 (file)
--- a/hurd/hurdchdir.c
+++ b/hurd/hurdchdir.c
@@ -40,7 +40,7 @@ _hurd_change_directory_port_from_name (struct hurd_port *portcell,
     lookup = name;
   else
     {
-      char *n = alloca (len + 2);
+      char *n = alloca (len + 3);
       memcpy (n, name, len);
       n[len] = '/';
       n[len + 1] = '.';

diff --git a/sysdeps/mach/hurd/chroot.c b/sysdeps/mach/hurd/chroot.c
index 83f11bd17ee39a40f35fe435a1752ddbe7584b4c..fde01647137e7ddbe44bdbc6f1a48c60a693e8fd 100644 (file)
--- a/sysdeps/mach/hurd/chroot.c
+++ b/sysdeps/mach/hurd/chroot.c
@@ -36,11 +36,11 @@ chroot (const char *path)
   /* Append trailing "/." to directory name to force ENOTDIR if it's not a
      directory and EACCES if we don't have search permission.  */
   len = strlen (path);
-  if (path[len - 2] == '/' && path[len - 1] == '.')
+  if (len >= 2 && path[len - 2] == '/' && path[len - 1] == '.')
     lookup = path;
   else
     {
-      char *n = alloca (len + 2);
+      char *n = alloca (len + 3);
       memcpy (n, path, len);
       n[len] = '/';
       n[len + 1] = '.';