cvs: php-src /ext/standard ftok.c
| From: | Ilia Alshanetsky | Date: | Thu, 24 Jun 2004 00:48:58 +0000 |
| Subject: | cvs: php-src /ext/standard ftok.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27688@lists.php.net to get a copy of this message | ||
iliaa Wed Jun 23 20:48:58 2004 EDT
Modified files:
/php-src/ext/standard ftok.c
Log:
Added missing safe_mode & open_basedir checks.
http://cvs.php.net/diff.php/php-src/ext/standard/ftok.c?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/standard/ftok.c
diff -u php-src/ext/standard/ftok.c:1.12 php-src/ext/standard/ftok.c:1.13
--- php-src/ext/standard/ftok.c:1.12 Thu Jan 8 03:17:32 2004
+++ php-src/ext/standard/ftok.c Wed Jun 23 20:48:58 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftok.c,v 1.12 2004/01/08 08:17:32 andi Exp $ */
+/* $Id: ftok.c,v 1.13 2004/06/24 00:48:58 iliaa Exp $ */
#include "php.h"
@@ -51,6 +51,10 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument invalid");
RETURN_LONG(-1);
}
+
+ if ((PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(pathname), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(Z_STRVAL_PP(pathname) TSRMLS_CC)) {
+ RETURN_LONG(-1);
+ }
k = ftok(Z_STRVAL_PP(pathname),Z_STRVAL_PP(proj)[0]);