cvs: php4(PHP_4_2_0) /ext/gd gd.c
| From: | Jani Taskinen | Date: | Tue, 04 Jun 2002 02:35:00 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12218@lists.php.net to get a copy of this message | ||
sniper Mon Jun 3 22:35:00 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/gd gd.c
Log:
MFH: fix bug #17535
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.179.2.1 php4/ext/gd/gd.c:1.179.2.2
--- php4/ext/gd/gd.c:1.179.2.1 Thu Apr 11 16:35:49 2002
+++ php4/ext/gd/gd.c Mon Jun 3 22:35:00 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.179.2.1 2002/04/11 20:35:49 phanto Exp $ */
+/* $Id: gd.c,v 1.179.2.2 2002/06/04 02:35:00 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1145,8 +1145,9 @@
int issock=0, socketd=0;
int argc=ZEND_NUM_ARGS();
- if ((image_type == PHP_GDIMG_TYPE_GD2PART && argc != 4) ||
- argc != 1 || zend_get_parameters_ex(argc, &file, &srcx, &srcy, &width,
&height) == FAILURE) {
+ if ((image_type == PHP_GDIMG_TYPE_GD2PART && argc != 5) ||
+ (image_type != PHP_GDIMG_TYPE_GD2PART && argc != 1) ||
+ zend_get_parameters_ex(argc, &file, &srcx, &srcy, &width, &height) ==
FAILURE) {
ZEND_WRONG_PARAM_COUNT();
}