cvs: php4 /ext/gd gd.c

sniper Mon Jun 3 22:33:10 2002 EDT Modified files: /php4/ext/gd gd.c Log: Fixed bug: #17535 Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.185 php4/ext/gd/gd.c:1.186 --- php4/ext/gd/gd.c:1.185 Thu Apr 11 16:32:03 2002 +++ php4/ext/gd/gd.c Mon Jun 3 22:33:10 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.185 2002/04/11 20:32:03 phanto Exp $ */ +/* $Id: gd.c,v 1.186 2002/06/04 02:33:10 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1137,8 +1137,9 @@ FILE * fp = NULL; 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(); }