archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Implemented request #26158/bug #53465 (open arbitrary file descriptor with fopen)

Browse source
This commit is contained in:
Gustavo André dos Santos Lopes 2010-12-11 01:52:13 +00:00
parent 13c99651fc
commit f73258223d
2 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/info.c
View file

@ -68,7 +68,7 @@ static int php_info_print_html_esc(const char *str, int len) /* {{{ */
char *new_str;
TSRMLS_FETCH();
new_str = php_escape_html_entities((char *) str, len, &new_len, 0, ENT_QUOTES, "utf-8" TSRMLS_CC);
new_str = php_escape_html_entities((unsigned char *) str, len, &new_len, 0, ENT_QUOTES, "utf-8" TSRMLS_CC);
written = php_output_write(new_str, new_len TSRMLS_CC);
efree(new_str);
return written;

33
ext/standard/php_fopen_wrapper.c
View file

@ -257,6 +257,39 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, ch
} else {
fd = dup(STDERR_FILENO);
}
} else if (!strncasecmp(path, "fd/", 3)) {
char *start,
*end;
long fildes_ori;
int dtablesize;
start = &path[3];
fildes_ori = strtol(start, &end, 10);
if (end == start || (*end != '\0' && *end != '/')) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
"php://fd/ stream must be specified in the form php://fd/<orig fd>");
return NULL;
}
#if HAVE_UNISTD_H
dtablesize = getdtablesize();
#else
dtablesize = INT_MAX;
#endif
if (fildes_ori < 0 || fildes_ori >= dtablesize) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
"The file descriptors must be non-negative numbers smaller than %d", dtablesize);
return NULL;
}
fd = dup(fildes_ori);
if (fd == -1) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
"Error duping file descriptor %d; possibly it doesn't exist: "
"[%d]: %s", fildes_ori, errno, strerror(errno));
return NULL;
}
} else if (!strncasecmp(path, "filter/", 7)) {
/* Save time/memory when chain isn't specified */
if (strchr(mode, 'r') || strchr(mode, '+')) {