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

MFB: fix 017.phpt in streams.c, and very dangerous intercepting of file functions in all cases introduced in multi-threaded fix

Browse Source
This commit is contained in:
Greg Beaver
2008-09-26 23:35:11 +00:00
parent 08139f40b3
commit ae98beaf02
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ext/phar/phar.c
View File

@@ -3561,7 +3561,6 @@ void phar_request_initialize(TSRMLS_D) /* {{{ */
PHAR_G(cwd) = NULL;
PHAR_G(cwd_len) = 0;
PHAR_G(cwd_init) = 0;
phar_intercept_functions(TSRMLS_C);
}
}
/* }}} */

9
ext/phar/stream.c
View File

@@ -258,7 +258,7 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, char *pat
entry = (phar_entry_info *) ecalloc(1, sizeof(phar_entry_info));
entry->is_temp_dir = 1;
entry->filename = "";
entry->filename = estrndup("", 0);
entry->filename_len = 0;
entry->phar = phar;
entry->offset = entry->offset_abs = 0;
@@ -346,15 +346,8 @@ phar_stub:
*/
static int phar_stream_close(php_stream *stream, int close_handle TSRMLS_DC) /* {{{ */
{
phar_entry_info *entry = ((phar_entry_data *)stream->abstract)->internal_file;
int is_temp_dir = entry->is_temp_dir;
phar_entry_delref((phar_entry_data *)stream->abstract TSRMLS_CC);
if (is_temp_dir) {
/* phar archive stub, free it */
efree(entry);
}
return 0;
}
/* }}} */