jani Thu Aug 23 12:23:59 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/session mod_files.c
Log:
MFH: ws + cs changes (sync to ease merging patches around!)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.100.2.3.2.8&r2=1.100.2.3.2.9&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.100.2.3.2.8
php-src/ext/session/mod_files.c:1.100.2.3.2.9
--- php-src/ext/session/mod_files.c:1.100.2.3.2.8 Thu Aug 23 02:04:39 2007
+++ php-src/ext/session/mod_files.c Thu Aug 23 12:23:59 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.100.2.3.2.8 2007/08/23 02:04:39 iliaa Exp $ */
+/* $Id: mod_files.c,v 1.100.2.3.2.9 2007/08/23 12:23:59 jani Exp $ */
#include "php.h"
@@ -87,9 +87,10 @@
len = p - key;
- if (len == 0)
+ if (len == 0) {
ret = 0;
-
+ }
+
return ret;
}
@@ -101,9 +102,11 @@
int n;
key_len = strlen(key);
- if (key_len <= data->dirdepth || buflen <
- (strlen(data->basedir) + 2 * data->dirdepth + key_len +
5 + sizeof(FILE_PREFIX)))
+ if (key_len <= data->dirdepth ||
+ buflen < (strlen(data->basedir) + 2 * data->dirdepth + key_len
+ 5 + sizeof(FILE_PREFIX))) {
return NULL;
+ }
+
p = key;
memcpy(buf, data->basedir, data->basedir_len);
n = data->basedir_len;
@@ -149,20 +152,20 @@
}
ps_files_close(data);
-
+
if (!ps_files_valid_key(key)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "The
session id contains illegal characters, valid characters are a-z, A-Z, 0-9 and
'-,'");
PS(invalid_session_id) = 1;
return;
}
- if (!ps_files_path_create(buf, sizeof(buf), data, key))
+ if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
return;
-
+ }
+
data->lastkey = estrdup(key);
-
- data->fd = VCWD_OPEN_MODE(buf, O_CREAT | O_RDWR | O_BINARY,
- data->filemode);
-
+
+ data->fd = VCWD_OPEN_MODE(buf, O_CREAT | O_RDWR | O_BINARY,
data->filemode);
+
if (data->fd != -1) {
#ifndef PHP_WIN32
/* check to make sure that the opened file is not a
symlink, linking to data outside of allowable dirs */
@@ -189,9 +192,9 @@
flock(data->fd, LOCK_EX);
#ifdef F_SETFD
-#ifndef FD_CLOEXEC
-#define FD_CLOEXEC 1
-#endif
+# ifndef FD_CLOEXEC
+# define FD_CLOEXEC 1
+# endif
if (fcntl(data->fd, F_SETFD, FD_CLOEXEC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"fcntl(%d, F_SETFD, FD_CLOEXEC) failed: %s (%d)", data->fd, strerror(errno),
errno);
}
@@ -231,15 +234,16 @@
while (php_readdir_r(dir, (struct dirent *) dentry, &entry) == 0 &&
entry) {
/* does the file start with our prefix? */
if (!strncmp(entry->d_name, FILE_PREFIX, sizeof(FILE_PREFIX) -
1)) {
- size_t entry_len;
+ size_t entry_len = strlen(entry->d_name);
- entry_len = strlen(entry->d_name);
/* does it fit into our buffer? */
if (entry_len + dirname_len + 2 < MAXPATHLEN) {
/* create the full path.. */
memcpy(buf + dirname_len + 1, entry->d_name,
entry_len);
+
/* NUL terminate it and */
buf[dirname_len + entry_len + 1] = '\0';
+
/* check whether its last access was more than
maxlifet ago */
if (VCWD_STAT(buf, &sbuf) == 0 &&
#ifdef NETWARE
@@ -299,8 +303,7 @@
errno = 0;
dirdepth = (size_t) strtol(argv[0], NULL, 10);
if (errno == ERANGE) {
- php_error(E_WARNING,
- "The first parameter in
session.save_path is invalid");
+ php_error(E_WARNING, "The first parameter in
session.save_path is invalid");
return FAILURE;
}
}
@@ -309,8 +312,7 @@
errno = 0;
filemode = strtol(argv[1], NULL, 8);
if (errno == ERANGE || filemode < 0 || filemode > 07777) {
- php_error(E_WARNING,
- "The second parameter in
session.save_path is invalid");
+ php_error(E_WARNING, "The second parameter in
session.save_path is invalid");
return FAILURE;
}
}
@@ -326,7 +328,7 @@
data->basedir = estrndup(save_path, data->basedir_len);
PS_SET_MOD_DATA(data);
-
+
return SUCCESS;
}
@@ -336,8 +338,10 @@
ps_files_close(data);
- if (data->lastkey)
+ if (data->lastkey) {
efree(data->lastkey);
+ }
+
efree(data->basedir);
efree(data);
*mod_data = NULL;
@@ -352,19 +356,21 @@
PS_FILES_DATA;
ps_files_open(data, key TSRMLS_CC);
- if (data->fd < 0)
+ if (data->fd < 0) {
return FAILURE;
-
- if (fstat(data->fd, &sbuf))
+ }
+
+ if (fstat(data->fd, &sbuf)) {
return FAILURE;
-
+ }
+
data->st_size = *vallen = sbuf.st_size;
-
+
if (sbuf.st_size == 0) {
*val = STR_EMPTY_ALLOC();
return SUCCESS;
}
-
+
*val = emalloc(sbuf.st_size);
#if defined(HAVE_PREAD)
@@ -375,10 +381,11 @@
#endif
if (n != sbuf.st_size) {
- if (n == -1)
+ if (n == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "read
failed: %s (%d)", strerror(errno), errno);
- else
+ } else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "read
returned less bytes than requested");
+ }
efree(*val);
return FAILURE;
}
@@ -392,16 +399,18 @@
PS_FILES_DATA;
ps_files_open(data, key TSRMLS_CC);
- if (data->fd < 0)
+ if (data->fd < 0) {
return FAILURE;
+ }
/*
* truncate file, if the amount of new data is smaller than
* the existing data set.
*/
- if (vallen < (int)data->st_size)
+ if (vallen < (int)data->st_size) {
ftruncate(data->fd, 0);
+ }
#if defined(HAVE_PWRITE)
n = pwrite(data->fd, val, vallen, 0);
@@ -411,10 +420,11 @@
#endif
if (n != vallen) {
- if (n == -1)
+ if (n == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "write
failed: %s (%d)", strerror(errno), errno);
- else
+ } else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "write
wrote less bytes than requested");
+ }
return FAILURE;
}
@@ -426,9 +436,10 @@
char buf[MAXPATHLEN];
PS_FILES_DATA;
- if (!ps_files_path_create(buf, sizeof(buf), data, key))
+ if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
return FAILURE;
-
+ }
+
if (data->fd != -1) {
ps_files_close(data);
@@ -453,9 +464,10 @@
we return SUCCESS, since all cleanup should be handled by
an external entity (i.e. find -ctime x | xargs rm) */
- if (data->dirdepth == 0)
+ if (data->dirdepth == 0) {
*nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime
TSRMLS_CC);
-
+ }
+
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
