Check 2nd parameter of tempnam() against path components.

diff --git a/NEWS b/NEWS
index 6e9932c7d8902eaf2b1666733bc81297eea22068..1be81d49cf28645ca95dca2b87baaa0002eaa696 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Mar 2006, PHP 5.1.3RC2
+- Check 2nd parameter of tempnam() against path components. (Ilia)
 - Fixed Apache2 SAPIs header handler modifying header strings. (Mike)
 - Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry)
 - Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index cd8f666335ec0f8bd5a51830a9c53b63faa2a998..12816c75c5ffe79a808b8ba686f5861d217637ce 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -773,8 +773,9 @@ PHP_FUNCTION(tempnam)
        zval **arg1, **arg2;
        char *d;
        char *opened_path;
-       char p[64];
+       char *p;
        int fd;
+       size_t p_len;
 
        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -787,7 +788,11 @@ PHP_FUNCTION(tempnam)
        }
        
        d = estrndup(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1));
-       strlcpy(p, Z_STRVAL_PP(arg2), sizeof(p));
+
+       php_basename(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2), NULL, 0, &p, &p_len TSRMLS_CC);
+       if (p_len > 64) {
+               p[63] = '\0';
+       }
 
        if ((fd = php_open_temporary_fd(d, p, &opened_path TSRMLS_CC)) >= 0) {
                close(fd);
@@ -795,6 +800,7 @@ PHP_FUNCTION(tempnam)
        } else {
                RETVAL_FALSE;
        }
+       efree(p);
        efree(d);
 }
 /* }}} */