From 44e180b286c211e53e0fb17162664f86372cc247 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 19 Nov 2003 15:49:55 +0000 Subject: [PATCH] Fixed bug #26309 (Fixed argument parsing for imageftbbox()). --- ext/gd/gd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 69b53c595b..3b70ad3be2 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3086,13 +3086,11 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int 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); -- 2.40.0