iliaa Wed Nov 19 10:50:06 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/gd gd.c
Log:
MFH: Fixed bug #26309 (Fixed argument parsing for imageftbbox()).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.473 php-src/NEWS:1.1247.2.474
--- php-src/NEWS:1.1247.2.473 Wed Nov 19 10:34:35 2003
+++ php-src/NEWS Wed Nov 19 10:50:03 2003
@@ -3,6 +3,7 @@
?? ??? 2003, Version 4.3.5
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26309 (Fixed argument parsing for imageftbbox()). (Ilia)
- Fixed bug #26285 (escapeshellarg() uses wrong quotes on windows). (Ilia)
- Fixed bug #26267 (gmp_random() leaks memory and does not produce random
numbers). (Jani)
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.31 php-src/ext/gd/gd.c:1.221.2.32
--- php-src/ext/gd/gd.c:1.221.2.31 Thu Aug 28 16:25:31 2003
+++ php-src/ext/gd/gd.c Wed Nov 19 10:50:05 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.221.2.31 2003/08/28 20:25:31 andrey Exp $ */
+/* $Id: gd.c,v 1.221.2.32 2003/11/19 15:50:05 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2970,13 +2970,11 @@
argc = ZEND_NUM_ARGS();
if (mode == TTFTEXT_BBOX) {
- if ((extended && argc != 5) || (!extended && argc != 4) ||
- zend_get_parameters_ex(argc, &PTSIZE, &ANGLE,
&FONTNAME, &C, &EXT) == FAILURE) {
+ if (argc < 4 || argc > 5 || zend_get_parameters_ex(argc, &PTSIZE,
&ANGLE, &FONTNAME, &C, &EXT) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
}
} else {
- if ((extended && argc != 9) || (!extended && argc != 8) ||
- zend_get_parameters_ex(argc, &IM, &PTSIZE, &ANGLE, &X,
&Y, &COL, &FONTNAME, &C, &EXT) == FAILURE) {
+ if (argc < 8 || argc > 9 || zend_get_parameters_ex(argc, &IM, &PTSIZE,
&ANGLE, &X, &Y, &COL, &FONTNAME, &C, &EXT) == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
}
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, "Image", le_gd);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
