php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-11 01:53:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes bug 7055 & 7235

Browse Source
This commit is contained in:
Daniel Beulshausen
2000-10-16 10:35:43 +00:00
parent 9c1097c4db
commit 4086197d95
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ext/session/mod_files.c
View File

@@ -107,6 +107,14 @@ static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, cons
#define O_BINARY 0
#endif
static void ps_files_close(ps_files *data)
{
if (data->fd != -1) {
close(data->fd);
data->fd = -1;
}
}
static void ps_files_open(ps_files *data, const char *key)
{
char buf[MAXPATHLEN];
@@ -116,10 +124,8 @@ static void ps_files_open(ps_files *data, const char *key)
efree(data->lastkey);
data->lastkey = NULL;
}
if (data->fd != -1) {
close(data->fd);
data->fd = -1;
}
ps_files_close(data);
if (!ps_files_valid_key(key) ||
!ps_files_path_create(buf, sizeof(buf), data, key))
@@ -209,8 +215,8 @@ PS_CLOSE_FUNC(files)
{
PS_FILES_DATA;
if (data->fd > -1)
close(data->fd);
ps_files_close(data);
if (data->lastkey)
efree(data->lastkey);
efree(data->basedir);
@@ -273,6 +279,8 @@ PS_DESTROY_FUNC(files)
if (!ps_files_path_create(buf, sizeof(buf), data, key))
return FAILURE;
ps_files_close(data);
if (V_UNLINK(buf) == -1) {
return FAILURE;
}