Fixed crash (bus error) in readdir() and session cleanup when compiled

with Sun CC.

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 8abc31721ddbbdee5a4bfa2c1686cdea6b240199..3083bdea6643762f9ff0789ace7e8e7468dd3d9a 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -156,7 +156,7 @@ static void ps_files_open(ps_files *data, const char *key)
 static int ps_files_cleanup_dir(const char *dirname, int maxlifetime)
 {
        DIR *dir;
-       char dentry[sizeof(struct dirent) + MAXPATHLEN + 1];
+       char dentry[sizeof(struct dirent) + MAXPATHLEN];
        struct dirent *entry = (struct dirent *) &dentry;
        struct stat sbuf;
        char buf[MAXPATHLEN];

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index eeebfa5c008464d638c935b130e7865e01957793..ca5694e44ae725b9640024057761673a530f93f8 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -289,7 +289,7 @@ PHP_FUNCTION(readdir)
 {
        pval **id, **tmp, *myself;
        php_dir *dirp;
-       char entry[sizeof(struct dirent)+MAXPATHLEN+1];
+       char entry[sizeof(struct dirent)+MAXPATHLEN];
        struct dirent *result = (struct dirent *)&entry; /* patch for libc5 readdir problems */
        DIRLS_FETCH();