cvs: php-src(PHP_5_1) /ext/gd php_gd.h
| From: | Jani Taskinen | Date: | Wed, 02 Nov 2005 21:26:25 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/gd php_gd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34970@lists.php.net to get a copy of this message | ||
sniper Wed Nov 2 16:26:25 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/gd php_gd.h
Log:
MFH: Fixed bad usage of php_checkuid()
http://cvs.php.net/diff.php/php-src/ext/gd/php_gd.h?r1=1.59.2.1&r2=1.59.2.2&ty=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.59.2.1 php-src/ext/gd/php_gd.h:1.59.2.2
--- php-src/ext/gd/php_gd.h:1.59.2.1 Tue Nov 1 12:05:09 2005
+++ php-src/ext/gd/php_gd.h Wed Nov 2 16:26:25 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.59.2.1 2005/11/01 17:05:09 sniper Exp $ */
+/* $Id: php_gd.h,v 1.59.2.2 2005/11/02 21:26:25 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; \