[PHP-CVS] cvs: php-src /ext/standard file.c

[Ilia Alshanetsky]

iliaa           Mon Mar 27 23:41:05 2006 UTC

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  MFB51: Check 2nd parameter of tempnam() against path components.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.429&r2=1.430&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.429 php-src/ext/standard/file.c:1.430
--- php-src/ext/standard/file.c:1.429   Fri Mar 24 21:32:39 2006
+++ php-src/ext/standard/file.c Mon Mar 27 23:41:05 2006
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.429 2006/03/24 21:32:39 pollita Exp $ */
+/* $Id: file.c,v 1.430 2006/03/27 23:41:05 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -800,8 +800,9 @@
        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;
@@ -814,7 +815,11 @@
        }
        
        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);
@@ -825,6 +830,7 @@
        } else {
                RETVAL_FALSE;
        }
+       efree(p);
        efree(d);
 }
 /* }}} */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php