- Fix crash bug on NetBSD and OpenBSD. MAXPATHLEN didn't get defined

  correctly and caused a stack overrun. This was *hard* to debug.

diff --git a/TSRM/configure.in b/TSRM/configure.in
index 2b4f81908baf86fa8f6eb7e6b0c21999c9b5e01f..da5cb2953ccd00fb6eb4cd8457f1d99d402d5b9d 100644 (file)
--- a/TSRM/configure.in
+++ b/TSRM/configure.in
@@ -22,7 +22,10 @@ dnl TSRM_PTHREAD
 AC_CHECK_HEADERS(
 utime.h \
 dirent.h \
-stdarg.h
+stdarg.h \
+alloca.h \
+unistd.h \
+limits.h
 )
 
 AC_DEFINE(ZTS,1,[ ])

diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h
index f54911779270985643e65af16cac5cbd64dd6547..8b80f801212bca32310645351fca3bcfd460bbe4 100644 (file)
--- a/TSRM/tsrm_config_common.h
+++ b/TSRM/tsrm_config_common.h
@@ -7,6 +7,7 @@
 
 #ifndef TSRM_WIN32
 # include "tsrm_config.h"
+# include <sys/param.h>
 #else
 # include "tsrm_config.w32.h"
 #endif
@@ -15,6 +16,26 @@
 #include <malloc.h>
 #endif
 
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef MAXPATHLEN
+# ifdef PATH_MAX
+#  define MAXPATHLEN PATH_MAX
+# else
+#  define MAXPATHLEN 256
+# endif
+#endif
+
 #if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
 # define tsrm_do_alloca(p) alloca(p)
 # define tsrm_free_alloca(p)

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index e19a8b2513db7bbd9acdce563e8a63ad5d6dc950..facfdfce0414ca3510398f4752e8d942fe0454da 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -31,12 +31,6 @@
 #include "tsrm_virtual_cwd.h"
 #include "tsrm_strtok_r.h"
 
-
-/* Are we doing enough to detect this? */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
-
 #ifdef TSRM_WIN32
 #include <io.h>
 #endif