cvs: php-src /ext/gd php_gd.h
| From: | Jani Taskinen | Date: | Wed, 02 Nov 2005 21:26:10 +0000 |
| Subject: | cvs: php-src /ext/gd php_gd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34969@lists.php.net to get a copy of this message | ||
sniper Wed Nov 2 16:26:10 2005 EDT
Modified files:
/php-src/ext/gd php_gd.h
Log:
- Fix bad usage of php_checkuid()
http://cvs.php.net/diff.php/php-src/ext/gd/php_gd.h?r1=1.61&r2=1.62&ty=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.61 php-src/ext/gd/php_gd.h:1.62
--- php-src/ext/gd/php_gd.h:1.61 Tue Nov 1 12:04:29 2005
+++ php-src/ext/gd/php_gd.h Wed Nov 2 16:26:08 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.61 2005/11/01 17:04:29 sniper Exp $ */
+/* $Id: php_gd.h,v 1.62 2005/11/02 21:26:08 sniper Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -33,7 +33,7 @@
/* open_basedir and safe_mode checks */
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \
if (!filename || php_check_open_basedir(filename TSRMLS_CC) || \
- (PG(safe_mode) && !php_checkuid(filename, "rb+", CHECKUID_CHECK_FILE_AND_DIR))
\
+ (PG(safe_mode) && !php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR)) \
) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \
RETURN_FALSE; \