stat: be robust to PATH_MAX definition

Make this stack-allocation of PATH_MAX bytes more robust.

* lib/stat.c (rpl_stat): Require reasonable PATH_MAX.
* modules/stat (Depends-on): Add verify.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 440a244abd613c54c2e967d9f5c2ca4bce0649b9..b4b82faa8a70ad7b2595e2300896fc9997de57e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-22  Eric Blake  <eblake@redhat.com>
 
+       stat: be robust to PATH_MAX definition
+       * lib/stat.c (rpl_stat): Require reasonable PATH_MAX.
+       * modules/stat (Depends-on): Add verify.
+
        link: work around IRIX bug
        * m4/link.m4 (gl_FUNC_LINK): Expose the bug.
        * lib/link.c (rpl_link): Work around it.

diff --git a/lib/stat.c b/lib/stat.c
index cbc9100fd4d6b7d47809c78a3b91f34179bc88fe..f07370dd06b921d4fcf7d44337edf1dbd32b9670 100644 (file)
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -38,6 +38,7 @@ orig_stat (const char *filename, struct stat *buf)
 #include <stdbool.h>
 #include <string.h>
 #include "dosname.h"
+#include "verify.h"
 
 /* Store information about NAME into ST.  Work around bugs with
    trailing slashes.  Mingw has other bugs (such as st_ino always
@@ -63,6 +64,12 @@ rpl_stat (char const *name, struct stat *st)
     }
 #endif /* REPLACE_FUNC_STAT_FILE */
 #if REPLACE_FUNC_STAT_DIR
+  /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
+     have a constant PATH_MAX.  */
+# ifndef PATH_MAX
+#  error "Please port this replacement to your platform"
+# endif
+
   if (result == -1 && errno == ENOENT)
     {
       /* Due to mingw's oddities, there are some directories (like
@@ -77,6 +84,7 @@ rpl_stat (char const *name, struct stat *st)
       char fixed_name[PATH_MAX + 1] = {0};
       size_t len = strlen (name);
       bool check_dir = false;
+      verify (PATH_MAX <= 4096);
       if (PATH_MAX <= len)
         errno = ENAMETOOLONG;
       else if (len)

diff --git a/modules/stat b/modules/stat
index 6bc27ce3d29f45e3c061b8d7e698bed85b5d9aed..8a349a73ee0ab470b020c74e3247ed9b548b34d9 100644 (file)
--- a/modules/stat
+++ b/modules/stat
@@ -9,6 +9,7 @@ Depends-on:
 sys_stat
 dosname         [test $REPLACE_STAT = 1]
 stdbool         [test $REPLACE_STAT = 1]
+verify          [test $REPLACE_STAT = 1]
 
 configure.ac:
 gl_FUNC_STAT