[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd gd.c gd_ctx.c

[Jani Taskinen]

sniper          Tue Mar 11 23:16:32 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/gd        gd.c gd_ctx.c 
  Log:
  MFH
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.221.2.15 php4/ext/gd/gd.c:1.221.2.16
--- php4/ext/gd/gd.c:1.221.2.15 Wed Mar  5 11:08:21 2003
+++ php4/ext/gd/gd.c    Tue Mar 11 23:16:30 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.221.2.15 2003/03/05 16:08:21 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.16 2003/03/12 04:16:30 sniper Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
    Cold Spring Harbor Labs. */
@@ -1578,7 +1578,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.15.2.1
--- 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:16:31 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;



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