diff options
| author | foobar <sniper@php.net> | 2005-01-14 22:43:15 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-01-14 22:43:15 +0000 |
| commit | 68ca0ed6d879468113749dec8d991ca7ee3943e1 (patch) | |
| tree | 6c5c44dc8ab2df5aefe291421b6d96b54a6a47ae | |
| parent | 14058c83e6a9332a4ae393c030d3198d02b35d51 (diff) | |
| download | php-git-68ca0ed6d879468113749dec8d991ca7ee3943e1.tar.gz | |
- Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many parameters)
| -rw-r--r-- | ext/gd/gd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index bf44f8b35b..dd9e6c5db7 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3125,11 +3125,11 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int argc = ZEND_NUM_ARGS(); if (mode == TTFTEXT_BBOX) { - if (argc < 4 || argc > 5 || zend_get_parameters_ex(argc, &PTSIZE, &ANGLE, &FONTNAME, &C, &EXT) == FAILURE) { + if (argc < 4 || argc > ((extended) ? 5 : 4) || zend_get_parameters_ex(argc, &PTSIZE, &ANGLE, &FONTNAME, &C, &EXT) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); } } else { - if (argc < 8 || argc > 9 || zend_get_parameters_ex(argc, &IM, &PTSIZE, &ANGLE, &X, &Y, &COL, &FONTNAME, &C, &EXT) == FAILURE) { + if (argc < 8 || argc > ((extended) ? 9 : 8) || 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); |