clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  Revert "refix #69111 and one related test"
  Revert "fix yet another leak"
  add XFAIL
  Revert "refix #69111 and one related test"
  Revert "fix tests"
  Revert "fix leak in 7.0"
  add XFAIL
  Revert "fix leak in 5.6"

Conflicts:
	ext/session/tests/rfc1867_sid_invalid.phpt
This commit is contained in:
Anatol Belski 2016-01-29 21:07:19 +01:00
commit 58b2344759
6 changed files with 26 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ext/session/mod_files.c
View File

@ -113,13 +113,9 @@ static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, cons
int i;
size_t n;
if (!data) {
return NULL;
}
key_len = strlen(key);
if (key_len <= data->dirdepth ||
buflen < (data->basedir_len + 2 * data->dirdepth + key_len + 5 + sizeof(FILE_PREFIX))) {
buflen < (strlen(data->basedir) + 2 * data->dirdepth + key_len + 5 + sizeof(FILE_PREFIX))) {
return NULL;
}
@ -157,7 +153,7 @@ static void ps_files_close(ps_files *data)
}
}
static int ps_files_open(ps_files *data, const char *key)
static void ps_files_open(ps_files *data, const char *key)
{
char buf[MAXPATHLEN];
#if !defined(O_NOFOLLOW) || !defined(PHP_WIN32)
@ -175,11 +171,11 @@ static int ps_files_open(ps_files *data, const char *key)
if (php_session_valid_key(key) == FAILURE) {
php_error_docref(NULL, E_WARNING, "The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,'");
return FAILURE;
return;
}
if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
return FAILURE;
return;
}
data->lastkey = estrdup(key);
@ -191,7 +187,7 @@ static int ps_files_open(ps_files *data, const char *key)
/* Check to make sure that the opened file is not outside of allowable dirs.
This is not 100% safe but it's hard to do something better without O_NOFOLLOW */
if(PG(open_basedir) && lstat(buf, &sbuf) == 0 && S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf)) {
return FAILURE;
return;
}
data->fd = VCWD_OPEN_MODE(buf, O_CREAT | O_RDWR | O_BINARY, data->filemode);
#endif
@ -203,7 +199,7 @@ static int ps_files_open(ps_files *data, const char *key)
if (fstat(data->fd, &sbuf) || (sbuf.st_uid != 0 && sbuf.st_uid != getuid() && sbuf.st_uid != geteuid())) {
close(data->fd);
data->fd = -1;
return FAILURE;
return;
}
#endif
do {
@ -220,11 +216,8 @@ static int ps_files_open(ps_files *data, const char *key)
#endif
} else {
php_error_docref(NULL, E_WARNING, "open(%s, O_RDWR) failed: %s (%d)", buf, strerror(errno), errno);
return FAILURE;
}
}
return SUCCESS;
}
static int ps_files_write(ps_files *data, zend_string *key, zend_string *val)
@ -234,9 +227,7 @@ static int ps_files_write(ps_files *data, zend_string *key, zend_string *val)
/* PS(id) may be changed by calling session_regenerate_id().
Re-initialization should be tried here. ps_files_open() checks
data->lastkey and reopen when it is needed. */
if (FAILURE == ps_files_open(data, ZSTR_VAL(key))) {
return FAILURE;
}
ps_files_open(data, ZSTR_VAL(key));
if (data->fd < 0) {
return FAILURE;
}
@ -474,18 +465,7 @@ PS_READ_FUNC(files)
zend_stat_t sbuf;
PS_FILES_DATA;
if (FAILURE == ps_files_open(data, ZSTR_VAL(key))) {
if (data->basedir) {
efree(data->basedir);
data->basedir = NULL;
data->basedir_len = 0;
}
efree(data);
PS_SET_MOD_DATA(NULL);
return FAILURE;
}
ps_files_open(data, ZSTR_VAL(key));
if (data->fd < 0) {
return FAILURE;
}
@ -556,18 +536,7 @@ PS_WRITE_FUNC(files)
{
PS_FILES_DATA;
if (FAILURE == ps_files_write(data, key, val)) {
if (data->basedir) {
efree(data->basedir);
data->basedir = NULL;
data->basedir_len = 0;
}
efree(data);
PS_SET_MOD_DATA(NULL);
return FAILURE;
}
return SUCCESS;
return ps_files_write(data, key, val);
}
@ -606,16 +575,7 @@ PS_UPDATE_TIMESTAMP_FUNC(files)
ret = VCWD_UTIME(buf, newtime);
if (ret == -1) {
/* New session ID, create data file */
if (FAILURE == ps_files_write(data, key, val)) {
if (data->basedir) {
efree(data->basedir);
data->basedir = NULL;
data->basedir_len = 0;
}
efree(data);
PS_SET_MOD_DATA(NULL);
return FAILURE;
}
return ps_files_write(data, key, val);
}
return SUCCESS;
@ -637,11 +597,11 @@ PS_DESTROY_FUNC(files)
char buf[MAXPATHLEN];
PS_FILES_DATA;
if (data && !ps_files_path_create(buf, sizeof(buf), data, ZSTR_VAL(key))) {
if (!ps_files_path_create(buf, sizeof(buf), data, ZSTR_VAL(key))) {
return FAILURE;
}
if (data && data->fd != -1) {
if (data->fd != -1) {
ps_files_close(data);
if (VCWD_UNLINK(buf) == -1) {

6
ext/session/tests/bug32330.phpt
View File

@ -69,17 +69,17 @@ $_SESSION['E'] = 'F';
?>
--EXPECTF--
open: path = /tmp, name = sid
read: id = %s
gc: maxlifetime = %d
read: id = %s
write: id = %s, data = A|s:1:"B";
close
open: path = /tmp, name = sid
read: id = %s
gc: maxlifetime = %d
read: id = %s
destroy: id = %s
close
open: path = /tmp, name = sid
read: id = %s
gc: maxlifetime = %d
read: id = %s
write: id = %s, data = E|s:1:"F";
close

4
ext/session/tests/bug69111.phpt
View File

@ -5,6 +5,8 @@ session.save_path=
session.save_handler=files
session.name=PHPSESSID
--SKIPIF--
--XFAIL--
It is still a leak
<?php include('skipif.inc'); ?>
--FILE--
<?php
@ -33,4 +35,4 @@ Warning: SessionHandler::read(): Session is not active in %s on line 12
Warning: SessionHandler::gc(): Session is not active in %s on line 13
Warning: SessionHandler::close(): Session is not active in %s on line 14
Warning: SessionHandler::close(): Session is not active in %s on line 14

4
ext/session/tests/rfc1867_sid_invalid.phpt
View File

@ -47,13 +47,13 @@ session_destroy();
--EXPECTF--
Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
Warning: Unknown: Failed to read session data: files (path: ) in Unknown on line 0
Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
Warning: Unknown: Failed to write session data (files). Please verify that the current setting of session.save_path is correct () in Unknown on line 0
Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
Warning: Unknown: Failed to read session data: files (path: ) in Unknown on line 0
Warning: Unknown: The session id is too long or contains illegal characters, valid characters are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
Warning: Unknown: Failed to write session data (files). Please verify that the current setting of session.save_path is correct () in Unknown on line 0
string(%d) "%s"

14
ext/session/tests/session_set_save_handler_variation4.phpt
View File

@ -52,9 +52,9 @@ ob_end_flush();
*** Testing session_set_save_handler() : variation ***
Open [%s,PHPSESSID]
Read [%s,%s]
GC [0]
1 deleted
Read [%s,%s]
array(3) {
["Blah"]=>
string(12) "Hello World!"
@ -67,20 +67,12 @@ Write [%s,%s,Blah|s:12:"Hello World!";Foo|b:0;Guff|i:1234567890;]
Close [%s,PHPSESSID]
NULL
Open [%s,PHPSESSID]
Read [%s,%s]
GC [0]
1 deleted
array(3) {
["Blah"]=>
string(12) "Hello World!"
["Foo"]=>
bool(false)
["Guff"]=>
int(1234567890)
Read [%s,%s]
array(0) {
}
Destroy [%s,%s]
Warning: unlink(%s): No such file or directory in %s on line %s
Close [%s,PHPSESSID]
bool(true)

8
ext/session/tests/session_set_save_handler_variation5.phpt
View File

@ -62,9 +62,9 @@ string(0) ""
bool(true)
Open [%s,PHPSESSID]
CreateID [PHPT-%d]
Read [%s,PHPT-%d]
GC [0]
1 deleted
Read [%s,PHPT-%d]
bool(true)
string(%d) "PHPT-%d"
Write [%s,PHPT-%d,]
@ -76,9 +76,9 @@ string(%d) "PHPT-%d"
bool(true)
Open [%s,PHPSESSID]
ValidateID [%s,PHPT-%d]
Read [%s,PHPT-%d]
GC [0]
1 deleted
Read [%s,PHPT-%d]
bool(true)
Write [%s,PHPT-%d,]
Close [%s,PHPSESSID]
@ -88,12 +88,10 @@ string(%d) "PHPT-%d"
string(%d) "PHPT-%d"
Open [%s,PHPSESSID]
ValidateID [%s,PHPT-%d]
Read [%s,PHPT-%d]
GC [0]
1 deleted
Read [%s,PHPT-%d]
bool(true)
Destroy [%s,PHPT-%d]
Warning: unlink(%s): No such file or directory in %s on line %d
Close [%s,PHPSESSID]
bool(true)