cvs: php4 /ext/gd gd.c gd_ctx.c
| From: | Jani Taskinen | Date: | Wed, 12 Mar 2003 04:15:29 +0000 |
| Subject: | cvs: php4 /ext/gd gd.c gd_ctx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19539@lists.php.net to get a copy of this message | ||
sniper Tue Mar 11 23:15:29 2003 EDT
Modified files:
/php4/ext/gd gd.c gd_ctx.c
Log:
Fix bug #22646
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.252 php4/ext/gd/gd.c:1.253
--- php4/ext/gd/gd.c:1.252 Wed Mar 5 11:08:01 2003
+++ php4/ext/gd/gd.c Tue Mar 11 23:15:26 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.252 2003/03/05 16:08:01 iliaa Exp $ */
+/* $Id: gd.c,v 1.253 2003/03/12 04:15:26 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1639,7 +1639,7 @@
}
}
- if ((argc == 2) || (argc == 3 && Z_STRLEN_PP(file))) {
+ if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filename '%s'", fn);
RETURN_FALSE;
Index: php4/ext/gd/gd_ctx.c
diff -u php4/ext/gd/gd_ctx.c:1.15 php4/ext/gd/gd_ctx.c:1.16
--- php4/ext/gd/gd_ctx.c:1.15 Tue Oct 29 20:05:16 2002
+++ php4/ext/gd/gd_ctx.c Tue Mar 11 23:15:28 2003
@@ -50,7 +50,7 @@
}
}
- if ((argc == 2) || (argc == 3 && Z_STRLEN_PP(file))) {
+ if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filename '%s'", fn);
RETURN_FALSE;