Browse Source

Fixed bug #38963 (Fixed a possible open_basedir bypass in tempnam()).

PECL_OPENSSL
Ilia Alshanetsky 20 years ago
parent
commit
5860f47122
  1. 1
      NEWS
  2. 11
      main/php_open_temporary_file.c

1
NEWS

@ -8,6 +8,7 @@ PHP NEWS
(Dmitry)
- Fixed bug #38961 (metaphone() results in segmentation fault on NetBSD).
(Tony)
- Fixed bug #38963 (Fixed a possible open_basedir bypass in tempnam()). (Ilia)
- Fixed bug #38949 (Cannot get xmlns value attribute). (Rob)
- Fixed bug #38942 (Double old-style-ctor inheritance). (Dmitry)
- Fixed bug #38941 (imap extension does not compile against new version of

11
main/php_open_temporary_file.c

@ -206,6 +206,7 @@ PHPAPI const char* php_get_temporary_directory(void)
PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC)
{
int fd;
char *temp_dir = php_get_temporary_directory();
if (!pfx) {
pfx = "tmp.";
@ -214,11 +215,19 @@ PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened
*opened_path_p = NULL;
}
if (!dir || *dir == '\0') {
if (temp_dir && *temp_dir != '\0' && !php_check_open_basedir(temp_dir TSRMLS_CC)) {
return php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
} else {
return -1;
}
}
/* Try the directory given as parameter. */
fd = php_do_open_temporary_file(dir, pfx, opened_path_p TSRMLS_CC);
if (fd == -1) {
/* Use default temporary directory. */
fd = php_do_open_temporary_file(php_get_temporary_directory(), pfx, opened_path_p TSRMLS_CC);
fd = php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
}
return fd;
}

Loading…
Cancel
Save